慢病治疗方案二

algorithm/src/main/resources/algorithm.properties

@@ -1,8 +1,8 @@
 ################################ model basic url ###################################
 
 #basicPath=E:/project/push/algorithm/src/main/models/model_version_replacement/model
-basicPath=/opt/models/dev/models/model_version_replacement/model
-#basicPath=E:/models_2019_9_24_16_21_29/model_version_replacement/model
+#basicPath=/opt/models/dev/models/model_version_replacement/model
+basicPath=E:/models_2019_9_24_16_21_29/model_version_replacement/model
 
 ############################### current model version ################################
 diagnosisPredict.version=outpatient_556_IOE_1

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

@@ -184,6 +184,7 @@ public class PushTreat {
     }
     private List<TreatDetail> processMedication(Map<String,Map<String,Object>> disDrugs,Map<String,Integer> conditionDesign,List<String> allFilds,Driver driver){
         List<TreatDetail> treatDetailList = new ArrayList<>();
+
         if(disDrugs != null && disDrugs.size()>0){
             for (Map.Entry<String,Map<String,Object>> ds:disDrugs.entrySet()) {
                 String key = ds.getKey();
@@ -191,9 +192,31 @@ public class PushTreat {
                 List<String> cateList = (List<String>) values.get("cate");
                 List<String> disList = (List<String>)values.get("dis");
                 List<Object> collList = (List<Object>)values.get("coll");
-                TreatDetail treatDetail = new TreatDetail();
-                List<MeditionDetail> meditionDetails = new ArrayList<>();
+
+                if(cateList.contains("合并症")){
+                    TreatDetail treatDetail = new TreatDetail();
+                    int main = cateList.indexOf("主症");
+                    String mainDis = disList.get(main);
+                    List<String> o = (List<String>)collList.get(main);
+                    List<String> yinhao = yinhao(o);
+                    //根据类找药
+                    List<Drugs> drugs = searchMedication(yinhao,allFilds,driver);
+                    List<MeditionDetail> meditionDetails = new ArrayList<>();
+                    MeditionDetail meditionDetail = new MeditionDetail();
+                    meditionDetail.setDescription("");
+                    meditionDetail.setTreatment(drugs);
+                    meditionDetails.add(meditionDetail);
+
+                    treatDetail.setTitle(mainDis);
+                    treatDetail.setMeditionDetails(meditionDetails);
+
+                    treatDetailList.add(treatDetail);
+
+
+                }
                 if(cateList.contains("主症") && cateList.contains("并发症")){
+                    TreatDetail treatDetail = new TreatDetail();
+                    List<MeditionDetail> meditionDetails = new ArrayList<>();
                     int main = cateList.indexOf("主症");
                     String mainDis = disList.get(main);
                     List<String> dds= new ArrayList<>();