Merge branch 'master' of huangrui/CostAccount into dev

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

@@ -136,13 +136,15 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
                 throw new CostException("reportForm名称为" + i.getReportName() + "计算公式不正确");
             }
             String replace = calcFormula.replace("[", "").replace("]", "").replace("-", ",").replace("+", ",");
-//            ArrayList<String> strings = CollUtil.newArrayList(replace.split(StrUtil.COMMA));
             ArrayList<String> strings = CollUtil.newArrayList(replace.split(","));
             Map<Integer, Object> map = new ConcurrentHashMap<>();
             for (int j = 0; j < strings.size(); j++) {
                 map.put(j, strings.get(j));
             }
-//            ReUtil.contains(, "+" + calcFormula);
+            String s = "+" + calcFormula.replace("[", "").replace("]", "").replace("\\d+", ",");
+
+
+
         });
         // 处理小计
         this.saveBatch(list);

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

@@ -359,14 +359,21 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
 
         return centerDepartmentVOS.stream().filter(i -> i.getParentId() == 0)
                 .peek(i -> {
-                    i.setChild(this.getResponsibilityChildrenForRelation(i, centerDepartmentVOS));
+                    List<CenterDepartmentVO> responsibilityChildrenForRelation = this.getResponsibilityChildrenForRelation(i, centerDepartmentVOS);
+                    if (CollUtil.isEmpty(responsibilityChildrenForRelation)) {
+                        i.setDepartments(responsibilityDepartMapper.getDepartByCenterId(i.getResponsibilityId()));
+                        i.setIsParent(false);
+                        i.setDepartments(responsibilityDepartMapper.getDepartByCenterId(i.getResponsibilityId()));
+                    }
+                    i.setChild(responsibilityChildrenForRelation);
                     i.setIsParent(true);
                 })
                 .collect(Collectors.toList());
 
     }
 
-    private List<CenterDepartmentVO> getResponsibilityChildrenForRelation(CenterDepartmentVO parent, List<CenterDepartmentVO> costResponsibilityVOS) {
+    private List<CenterDepartmentVO> getResponsibilityChildrenForRelation(CenterDepartmentVO
+                                                                                  parent, List<CenterDepartmentVO> costResponsibilityVOS) {
         return costResponsibilityVOS.stream().filter(o -> o.getParentId().equals(parent.getId()))
                 .peek(o -> {
                     o.setIsParent(true);