主症+其他+其他 处理

graph/src/main/java/org/diagbot/graph/medicationProcess/PushTreat.java

@@ -160,7 +160,8 @@ public class PushTreat {
         session.writeTransaction(new TransactionWork<Integer>() {
             @Override
             public Integer execute(Transaction tx) {
-                String query = propertiesUtil_treat.getProperty("medicationRule").replace("filds",webDiagList.toString());
+//                String query = propertiesUtil_treat.getProperty("medicationRule").replace("filds",webDiagList.toString());
+                String query = propertiesUtil_treat.getProperty("medicationRule").replace("filds",allFilds.toString());
                 logger.info("规则用药,查询语句为:\n" + query);
                 StatementResult result = tx.run(query);
                 while (result.hasNext()) {
@@ -323,14 +324,32 @@ public class PushTreat {
                         meditionDetails.add(meditionDetail_bing);
                     }
 
-
-
                     treatDetail.setMeditionDetails(meditionDetails);
 
                     treatDetailList.add(treatDetail);
 
                 }
+                if(cateList.size()==1 && cateList.contains("主症")){
+
+                    TreatDetail treatDetail = new TreatDetail();
+                    List<MeditionDetail> meditionDetails = new ArrayList<>();
+                    int main = cateList.indexOf("主症");
+                    String mainDis = disList.get(main);
+                    treatDetail.setTitle(mainDis+"治疗方案");//糖尿病及其2型糖尿病治疗方案
+                    Integer da = conditionDesign.get(key);
+                    String s = switchType(da);
+                    MeditionDetail meditionDetail_main = new MeditionDetail();//主诊断的
+                    List<String> o = (List<String>)collList.get(main);
+                    List<String> yinhao = yinhao(o);
+                    //根据类找药
+                    List<Drugs> drugs = searchMedication(yinhao,allFilds,driver);
+                    meditionDetail_main.setDescription(s+":"+String.join("、",o));//单药治疗：双胍类
+                    meditionDetail_main.setTreatment(drugs);
+                    meditionDetails.add(meditionDetail_main);
+                    treatDetail.setMeditionDetails(meditionDetails);
 
+                    treatDetailList.add(treatDetail);
+                }
             }
         }
         return treatDetailList;