处理文件类型

src/main/java/com/imed/costaccount/model/CostNumberBedSet.java

@@ -50,6 +50,10 @@ public class CostNumberBedSet implements Serializable {
 	 * 收入字段名称
 	 */
 	private String incomeFileName;
+	/**
+	 * 收入字段报表类型
+	 */
+	private Integer incomeFileType;
 	/**
 	 * 成本对应 对应的是报表项目的编号
 	 */
@@ -58,6 +62,10 @@ public class CostNumberBedSet implements Serializable {
 	 * 成本对应名称
 	 */
 	private String costCorrespondingName;
+	/**
+	 * 成本对应字段报表类型
+	 */
+	private Integer costFileType;
 	/**
 	 * 医院Id
 	 */

src/main/java/com/imed/costaccount/model/dto/CostNumberBedSetSaveDto.java

@@ -42,5 +42,15 @@ public class CostNumberBedSetSaveDto {
 
     @ApiModelProperty(name = "costCorrespondingName",value = "成本对应名称")
     private String costCorrespondingName;
+    /**
+     * 收入报表类型
+     */
+    @NotNull(message = "收入报表类型不能为空")
+    private Integer incomeFileType;
+    /**
+     * 成本对饮报表类型
+     */
+    @NotNull(message = "成本对应报表类型不能为空")
+    private Integer costFileType;
 
 }

src/main/java/com/imed/costaccount/model/vo/CostNumberBedSetVO.java

@@ -39,4 +39,12 @@ public class CostNumberBedSetVO {
 
     @ApiModelProperty(name = "costCorrespondingName",value = "成本对应名称")
     private String costCorrespondingName;
+    /**
+     * 收入报表类型
+     */
+    private Integer incomeFileType;
+    /**
+     * 成本对饮报表类型
+     */
+    private Integer costFileType;
 }

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -89,6 +89,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         List<CostIncomeGroup> records = pages.getRecords();
         List<CostIncomeGroupBeforeVO> costIncomeGroupBeforeVOList = BeanUtil.convertList(records, CostIncomeGroupBeforeVO.class);
         // 查询所有的责任中心 科室 会计科目  成本项目的数据  处理名字
+        // TODO 修改直接获取名字
         setCodeName(hospId, costIncomeGroupBeforeVOList);
         // 进行金额合并
         List<CostIncomeGroupAllAmountVO> costIncomeGroupAllAmountVoS = baseMapper.countMoney(costIncomeGroupBeforeVOList);
@@ -145,7 +146,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         Map<Long, Long> responsibilityDepMap = responsibilityDepartmentList.stream().collect(Collectors.toMap(ResponsibilityDepartment::getDepartmentId, ResponsibilityDepartment::getResponsibilityId));
         Map<Long, Long> accountProMap = accountingProductList.stream().collect(Collectors.toMap(AccountingProduct::getProductId, AccountingProduct::getAccountingId));
         List<CostIncomeGroup> costIncomeGroupArrayList = new ArrayList<>();
-        checkImportData(list, incomeErrorMessageList,costIncomeGroupArrayList, departmentMap, productMap, responsibilityMap, accountingMap, responsibilityDepMap, accountProMap);
+        // 检验数据
+        checkImportData(list, incomeErrorMessageList, costIncomeGroupArrayList, departmentMap, productMap, responsibilityMap, accountingMap, responsibilityDepMap, accountProMap);
 
         if (!CollectionUtils.isEmpty(incomeErrorMessageList)) {
             // 说明存在错误数据
@@ -161,11 +163,11 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                 // 开单科室 执行科室的代码和名称
                 String openDepartmentCode = data.get(3).toString();
                 String startDepartmentCode = data.get(5).toString();
-                String beforeMoney = data.get(6).toString();
+                BigDecimal beforeMoney = (BigDecimal) data.get(15);
             }
         }
         String uploadFile = uploadFile(file, UserContext.getCurrentUser());
-        if (StrUtil.isNotBlank(uploadFile)){
+        if (StrUtil.isNotBlank(uploadFile)) {
             // 文件上传成功  将文件记录保存
         }
         return Result.ok();
@@ -173,15 +175,16 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
 
     /**
      * 检验数据
-     *  @param list                   表单数据
-     * @param incomeErrorMessageList 存储错误信息的集合
+     *
+     * @param list                     表单数据
+     * @param incomeErrorMessageList   存储错误信息的集合
      * @param costIncomeGroupArrayList
-     * @param departmentMap          科室Map
-     * @param productMap             成本项目map
-     * @param responsibilityMap      责任中心Map
-     * @param accountingMap          会计科目Map
-     * @param responsibilityDepMap   责任中心科室对照Map
-     * @param accountProMap          责任中心Map
+     * @param departmentMap            科室Map
+     * @param productMap               成本项目map
+     * @param responsibilityMap        责任中心Map
+     * @param accountingMap            会计科目Map
+     * @param responsibilityDepMap     责任中心科室对照Map
+     * @param accountProMap            责任中心Map
      */
     private void checkImportData(List<List<Object>> list, List<IncomeErrorMessage> incomeErrorMessageList, List<CostIncomeGroup> costIncomeGroupArrayList, Map<String, Department> departmentMap, Map<String, Product> productMap, Map<Long, Responsibility> responsibilityMap, Map<Long, Accounting> accountingMap, Map<Long, Long> responsibilityDepMap, Map<Long, Long> accountProMap) {
         for (int i = 0; i < list.size(); i++) {
@@ -190,7 +193,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
             List<Object> data = list.get(i);
             log.info("用户输入的数据是{}", data);
-            Object money = data.get(data.size() - 1);
             // 成本项目的代码和名称
             String productCode = data.get(0).toString();
             String productName = data.get(1).toString();
@@ -199,10 +201,12 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             String openDepartmentCode = data.get(3).toString();
             String startDepartmentName = data.get(4).toString();
             String startDepartmentCode = data.get(5).toString();
-            BigDecimal beforeMoney = (BigDecimal)data.get(6);
-            if (!Objects.isNull(money) && !NumberConstant.ZERO.equals(Integer.parseInt(money.toString()))) {
+            BigDecimal beforeMoney = (BigDecimal) data.get(15);
+            boolean checkNull = Objects.isNull(beforeMoney);
+            boolean checkOne = NumberConstant.ZERO.equals(Integer.parseInt(beforeMoney.toString()));
+            if (!checkNull && !checkOne) {
                 // 要求这一行的数据必须全部填写
-                for (int j = 0; j < data.size(); j++) {
+                for (int j = 0; j < NumberConstant.FIVE; j++) {
                     if (Objects.isNull(data.get(j))) {
                         incomeErrorMessage.setTotal(i);
                         int row = i + 1;
@@ -211,70 +215,73 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         incomeErrorMessageList.add(incomeErrorMessage);
                     }
                 }
-                // TODO 暂时不走循环  直接获取数据的处理
-                // 检验数据是否存在
-                Product product = productMap.get(productCode + productName);
-                Department department = departmentMap.get(openDepartmentCode + openDepartmentName);
-                Department department1 = departmentMap.get(startDepartmentCode + startDepartmentName);
-                if (Objects.isNull(product)) {
+            }
+            // TODO 暂时不走循环  直接获取数据的处理
+            // 检验数据是否存在
+            Product product = productMap.get(productCode + productName);
+            Department department = departmentMap.get(openDepartmentCode + openDepartmentName);
+            Department department1 = departmentMap.get(startDepartmentCode + startDepartmentName);
+//            if (!checkNull && !checkOne ){
+//                if (StrUtil.isNotBlank(productCode) && StrUtil.isNotBlank(productName)){
+//                    if (Objects.isNull(product)) {
+//                        incomeErrorMessage.setTotal(i);
+//                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目不存在");
+//                        incomeErrorMessageList.add(incomeErrorMessage);
+//                    } else {
+//                        // 检验对应的会计科目是否存在
+//                        Long id = product.getId();
+//                        Long accountId = accountProMap.get(id);
+//                        if (Objects.isNull(accountingMap.get(accountId))) {
+//                            incomeErrorMessage.setTotal(i);
+//                            incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目对应的会计科目不存在");
+//                            incomeErrorMessageList.add(incomeErrorMessage);
+//                        } else {
+//                            costIncomeGroup.setProductCode(productCode);
+//                            costIncomeGroup.setProductName(productName);
+//                            costIncomeGroup.setAccountCode(accountingMap.get(accountId).getAccountingCode());
+//                            costIncomeGroup.setAccountName(accountingMap.get(accountId).getAccountingName());
+//                        }
+//                    }
+//                }
+//            }
+
+
+            // 开单科室
+            if (Objects.isNull(department)) {
+                incomeErrorMessage.setTotal(i);
+                incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "开单科室不存在");
+                incomeErrorMessageList.add(incomeErrorMessage);
+            } else {
+                Long id = department.getId();
+                Long responsibilityId = responsibilityDepMap.get(id);
+                if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
                     incomeErrorMessage.setTotal(i);
-                    incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目不存在");
+                    incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
                     incomeErrorMessageList.add(incomeErrorMessage);
                 } else {
-                    // 检验对应的会计科目是否存在
-                    Long id = product.getId();
-                    Long accountId = accountProMap.get(id);
-                    if (Objects.isNull(accountingMap.get(accountId))) {
-                        incomeErrorMessage.setTotal(i);
-                        incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "成本项目对应的会计科目不存在");
-                        incomeErrorMessageList.add(incomeErrorMessage);
-                    }else{
-                        costIncomeGroup.setProductCode(productCode);
-                        costIncomeGroup.setAccountCode(accountingMap.get(accountId).getAccountingCode());
-                    }
+                    costIncomeGroup.setOpenDepartmentCode(openDepartmentCode);
+                    costIncomeGroup.setOpenResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
                 }
-                // 开单科室
-                if (Objects.isNull(department)) {
-                    incomeErrorMessage.setTotal(i);
-                    incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "开单科室不存在");
-                    incomeErrorMessageList.add(incomeErrorMessage);
-                } else {
-                    Long id = department.getId();
-                    Long responsibilityId = responsibilityDepMap.get(id);
-                    if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
-                        incomeErrorMessage.setTotal(i);
-                        incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
-                        incomeErrorMessageList.add(incomeErrorMessage);
-                    }else {
-                        costIncomeGroup.setOpenDepartmentCode(openDepartmentCode);
-                        costIncomeGroup.setOpenResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
-                    }
-                }
-                //执行科室
-                if (Objects.isNull(department1)) {
+            }
+            //执行科室
+            if (Objects.isNull(department1)) {
+                incomeErrorMessage.setTotal(i);
+                incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "执行科室不存在");
+                incomeErrorMessageList.add(incomeErrorMessage);
+            } else {
+                Long id = department1.getId();
+                Long responsibilityId = responsibilityDepMap.get(id);
+                if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
                     incomeErrorMessage.setTotal(i);
-                    incomeErrorMessage.setErrMessage("代码:" + productCode + " 名称:" + productName + "执行科室不存在");
+                    incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
                     incomeErrorMessageList.add(incomeErrorMessage);
                 } else {
-                    Long id = department1.getId();
-                    Long responsibilityId = responsibilityDepMap.get(id);
-                    if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
-                        incomeErrorMessage.setTotal(i);
-                        incomeErrorMessage.setErrMessage("代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "科室对应的责任中心不存在");
-                        incomeErrorMessageList.add(incomeErrorMessage);
-                    }else {
-                        costIncomeGroup.setStartDepartmentCode(startDepartmentCode);
-                        costIncomeGroup.setStartResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
-                    }
-                }
-                costIncomeGroup.setAmount(beforeMoney);
-            }else {
-                // 最后一位是0 或者是null的情况
-                if (StrUtil.isNotBlank(productCode)){
-                    costIncomeGroup.setProductCode(productCode);
-//                    costIncomeGroup.setAccountCode(accountingMap.get(accountId))
+                    costIncomeGroup.setStartDepartmentCode(startDepartmentCode);
+                    costIncomeGroup.setStartResponsibilityCode(responsibilityMap.get(responsibilityId).getResponsibilityCode());
                 }
             }
+            costIncomeGroup.setAmount(beforeMoney);
+
         }
     }
 
@@ -304,6 +311,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             i.setAccountCodeName("[" + i.getAccountCode() + "]" + accountMap.get(i.getAccountCode()));
         });
     }
+
     /**
      * 文件上传
      */

src/main/java/com/imed/costaccount/service/impl/CostNumberBedSetServiceImpl.java

@@ -61,11 +61,9 @@ public class CostNumberBedSetServiceImpl extends ServiceImpl<CostNumberBedSetMap
         List<CostNumberBedSet> records = pages.getRecords();
         List<CostNumberBedSetVO> costNumberBedSetVOList = BeanUtil.convertList(records, CostNumberBedSetVO.class);
         // 具体的名称根据Code  Id 进行获取
-        Map<String, String> costShareParamMap = costShareParamService.list(new QueryWrapper<CostShareParam>().lambda()
-                .eq(CostShareParam::getHospId, hospId)).stream().collect(Collectors.toMap(CostShareParam::getShareParamCode, CostShareParam::getShareParamName));
         Map<Integer, ReportForm> reportFormMap = reportFormService.list(new QueryWrapper<ReportForm>().lambda().eq(ReportForm::getHospId, hospId)).stream().collect(Collectors.toMap(ReportForm::getNum, synOe -> synOe));
         costNumberBedSetVOList.forEach(i->{
-            setName(costShareParamMap, reportFormMap, i);
+            setName(reportFormMap, i);
         });
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(costNumberBedSetVOList);
@@ -74,16 +72,10 @@ public class CostNumberBedSetServiceImpl extends ServiceImpl<CostNumberBedSetMap
 
     /**
      * 设置成本分摊参数的名称  相关报表的名称
-     * @param costShareParamMap
      * @param reportFormMap
      * @param i
      */
-    private void setName(Map<String, String> costShareParamMap, Map<Integer, ReportForm> reportFormMap, CostNumberBedSetVO i) {
-        String shareParamCode = i.getShareParamCode();
-        String shareParamName = costShareParamMap.get(shareParamCode);
-        if (StrUtil.isNotBlank(shareParamName)){
-            i.setShareParamName(shareParamName);
-        }
+    private void setName( Map<Integer, ReportForm> reportFormMap, CostNumberBedSetVO i) {
         Integer incomeFieldNum = i.getIncomeFieldNum();
         Integer costCorresponding = i.getCostCorresponding();
         ReportForm reportForm = reportFormMap.get(incomeFieldNum);
@@ -112,16 +104,13 @@ public class CostNumberBedSetServiceImpl extends ServiceImpl<CostNumberBedSetMap
     public CostNumberBedSetVO getByNumberBedId(Long id) {
         Long hospId = UserContext.getHospId();
         CostNumberBedSet costNumberBedSet = this.getById(id);
-        // 具体的名称根据Code  Id 进行获取
-        Map<String, String> costShareParamMap = costShareParamService.list(new QueryWrapper<CostShareParam>().lambda()
-                .eq(CostShareParam::getHospId, hospId)).stream().collect(Collectors.toMap(CostShareParam::getShareParamCode, CostShareParam::getShareParamName));
+        if (Objects.isNull(costNumberBedSet)){
+            throw new CostException(500,"数据不存在");
+        }
         Map<Integer, ReportForm> reportFormMap = reportFormService.list(new QueryWrapper<ReportForm>().lambda().eq(ReportForm::getHospId, hospId)).stream().collect(Collectors.toMap(ReportForm::getNum, synOe -> synOe));
         CostNumberBedSetVO costNumberBedSetVO = BeanUtil.convertObj(costNumberBedSet, CostNumberBedSetVO.class);
-        if (Objects.nonNull(costNumberBedSet)){
-            setName(costShareParamMap,reportFormMap,costNumberBedSetVO);
-            return costNumberBedSetVO;
-        }
-        return null;
+        setName(reportFormMap,costNumberBedSetVO);
+        return costNumberBedSetVO;
     }
     private String getString(Integer reportType, String reportName) {
         switch (reportType) {
@@ -147,7 +136,7 @@ public class CostNumberBedSetServiceImpl extends ServiceImpl<CostNumberBedSetMap
     }
     /**
      * 添加诊次/床日设置的数据
-     *  后台要考虑支持多选
+     *  后期要考虑支持多选
      * @param costNumberBedSetSaveDto
      * @param hospId
      */

src/main/resources/mapper/CostNumberBedSetMapper.xml

@@ -11,8 +11,10 @@
         <result property="shareParamCode" column="share_param_code"/>
         <result property="incomeFieldNum" column="income_field_num"/>
         <result property="incomeFileName" column="income_file_name"/>
+        <result property="incomeFileType" column="income_file_type"/>
         <result property="costCorresponding" column="cost_corresponding"/>
         <result property="costCorrespondingName" column="cost_corresponding_name"/>
+        <result property="costFileType" column="cost_file_type"/>
         <result property="hospId" column="hosp_id"/>
         <result property="createTime" column="create_time"/>
         <result property="deleteTime" column="delete_time"/>