Merge branch 'master' into 'master'

全员医保收入分析优化

See merge request lighter/web-server!124

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/costcontrol/YbStatDao.java

@@ -270,7 +270,7 @@ public interface YbStatDao {
 
     @Select("<script> " +
             "select count(t.setl_id) value, 0 pid, rtrim(t.id) as id, rtrim(isnull(d.name, '其他')) name from " +
-            "(select a.setl_id, isnull(zy.small_dept, zya.small_dept) id " +
+            "(select a.setl_id, isnull(isnull( zy.small_dept, zya.small_dept ), 999) id " +
             "from t_si_setlinfo a " +
             "left join zy_inactpatient zy on (zy.inpatient_no = a.pat_no and zy.admiss_times = a.times) " +
             "left join zy_actpatient zya on (zya.inpatient_no = a.pat_no and zya.admiss_times = a.times) " +
@@ -284,7 +284,7 @@ public interface YbStatDao {
 
     @Select("<script> " +
             "select count(t.setl_id) as value, rtrim(t.pid) as pid, rtrim(t.id) as id, rtrim(isnull(e.name, '其他')) as name from " +
-            "(select a.setl_id, isnull(zy.small_dept, zya.small_dept) pid, isnull(isnull(zy.refer_physician, zya.refer_physician), 9999) id " +
+            "(select a.setl_id, isnull(isnull( zy.small_dept, zya.small_dept ), 999) pid, isnull(isnull(zy.refer_physician, zya.refer_physician), 9999) id " +
             "from t_si_setlinfo a " +
             "left join zy_inactpatient zy on (zy.inpatient_no = a.pat_no and zy.admiss_times = a.times) " +
             "left join zy_actpatient zya on (zya.inpatient_no = a.pat_no and zya.admiss_times = a.times) " +
@@ -312,7 +312,7 @@ public interface YbStatDao {
 
     @Select("<script> " +
             "select count(t.setl_id) as rs, rtrim(isnull(t.medins_type, '其他')) as insurName, rtrim(isnull(e.name, '其他')) as doctorName, rtrim(isnull(d.name, '其他')) as deptName  from " +
-            "(select a.setl_id, a.medins_type, isnull(zy.small_dept, zya.small_dept) pid, isnull(isnull(zy.refer_physician, zya.refer_physician), 9999) id " +
+            "(select a.setl_id, a.medins_type, isnull(isnull(zy.small_dept, zya.small_dept), 999) pid, isnull(isnull(zy.refer_physician, zya.refer_physician), 9999) id " +
             "from t_si_setlinfo a " +
             "left join zy_inactpatient zy on (zy.inpatient_no = a.pat_no and zy.admiss_times = a.times) " +
             "left join zy_actpatient zya on (zya.inpatient_no = a.pat_no and zya.admiss_times = a.times) " +

src/main/java/thyyxxk/webserver/service/medicalinsurance/costcontrol/YbStatService.java

@@ -1493,29 +1493,21 @@ public class YbStatService {
         // 查询第三子节点数据
         List<TreeNodesResult> fourthTreeList = dao.selectTreeFourthData(beginTime,endTime,setlType,insurType);
 
-        for (Integer i = 0; i < secondTreeList.size(); i++) {
-            if(StringUtil.notBlank(dept)){
-                if(secondTreeList.get(i).getName().contains(dept)){
-                    secondTreeList.get(i).setCollapsed(false);
-                } else {
-                    secondTreeList.get(i).setCollapsed(true);
-                }
+        for (TreeNodesResult treeNodesResult : secondTreeList) {
+            if (StringUtil.notBlank(dept)) {
+                treeNodesResult.setCollapsed(!treeNodesResult.getName().contains(dept));
             } else {
                 // 子节点默认关闭
-                secondTreeList.get(i).setCollapsed(true);
+                treeNodesResult.setCollapsed(true);
             }
         }
 
-        for (Integer i = 0; i < thirdTreeList.size(); i++) {
-            if(StringUtil.notBlank(doctor)){
-                if(thirdTreeList.get(i).getName().contains(doctor)){
-                    thirdTreeList.get(i).setCollapsed(false);
-                } else {
-                    thirdTreeList.get(i).setCollapsed(true);
-                }
+        for (TreeNodesResult treeNodesResult : thirdTreeList) {
+            if (StringUtil.notBlank(doctor)) {
+                treeNodesResult.setCollapsed(!treeNodesResult.getName().contains(doctor));
             } else {
                 // 子节点默认关闭
-                thirdTreeList.get(i).setCollapsed(true);
+                treeNodesResult.setCollapsed(true);
             }
         }
 
@@ -1526,7 +1518,7 @@ public class YbStatService {
             List<TreeNodesResult> l1 = m11.get(id+"_"+pid);
             result.setChildren(l1);
         }
-        Map<String, List<TreeNodesResult>> m2 = thirdTreeList.stream().collect(Collectors.groupingBy(item ->item.getPid()));
+        Map<String, List<TreeNodesResult>> m2 = thirdTreeList.stream().collect(Collectors.groupingBy(TreeNodesResult::getPid));
         for(TreeNodesResult result : secondTreeList){
             String id = result.getId();
             List<TreeNodesResult> l1 =  m2.get(id);