Merge remote-tracking branch 'origin/push-dev-diagnose' into push-test

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -1515,30 +1515,30 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
                 type = rs.getString(1);
                 formula = rs.getString(2);
                 name = Type.getName(Integer.parseInt(type));
-                if("拟诊".equals(name)){
+                if ("拟诊".equals(name)) {
                     niList.add(formula);
-                }else if("确诊".equals(name)){
+                } else if ("确诊".equals(name)) {
                     queList.add(formula);
-                }else if("警惕".equals(name)){
+                } else if ("警惕".equals(name)) {
                     highList.add(formula);
                 }
-                if(queList != null){
-                    for (String que:queList) {
-                        if(que.contains("拟诊")){
-                            for (String ni:niList
-                                    ) {
-                                String newNi = que.replaceAll("拟诊", ni);
-                                queList.add(newNi);
-                            }
-                            queList.remove(que);
+            }
+            List<String> newQueList = new ArrayList<>();
+            if(queList.size()>0){
+                for (String que:queList) {
+                    if(que.contains("拟诊")){
+                        for (String ni:niList
+                             ) {
+                            newQueList.add(que.replaceAll("拟诊",ni));
                         }
+                    }else {
+                        newQueList.add(que);
                     }
                 }
-                queNiMap.put("拟诊",niList);
-                queNiMap.put("确诊",queList);
-                queNiMap.put("警惕",highList);
-
             }
+            queNiMap.put("拟诊",niList);
+            queNiMap.put("确诊",newQueList);
+            queNiMap.put("警惕",highList);
         }catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -1638,6 +1638,7 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
                         path = nisplits.length;
                         diseaseRepository.mergeCondition(disName+"-"+type+"组块"+(i+1),path);
                         diseaseRepository.mergeQueNiHigh(disName+"-"+type+"组块"+(i+1),disId);
+                        this.splitConditionContent(nisplits,disName,disName+"-"+type+"组块"+(i+1),allData);
                     }
                 }
             }else if("拟诊".equals(type)){