治疗方案(treatCate)

common-push/src/main/java/org/diagbot/common/push/bean/neo4j/Filnlly.java

@@ -4,9 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Filnlly {
-    private List<Indicators> adverseEvent;
-    private List<Drugs> treatment;
-    private TreatCate treatCate;
+    private List<Indicators> adverseEvent;//不良反应
+    private List<Drugs> treatment;//具体用药
+    private TreatCate treatCate;//规则匹配用药情况（单药、双药、胰岛素药）
+    private List<TreatCate> compli_cate;
+
 
 
     public List<Indicators> getAdverseEvent() {

common-push/src/main/java/org/diagbot/common/push/bean/neo4j/TreatCate.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class TreatCate {
     private String type;//单药，双药，胰岛素用药
-    private List<String> name;
+    private List<String> name;//具体药类组合
 
     public String getType() {
         return type;

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -1192,7 +1192,7 @@ public class Neo4jAPI {
             return diagTreat;
         }
     }
-
+    //治疗方案
     public Map<String, Filnlly> getMulDiseaseTreat_new(String disName, String disease, Integer diseaseType, Set<String> disSet, Map<String, List<String>> disUE, Map<String,String> ueSet, String filds, Map<String, List<CrisisDetail>> crisisDetails) {
         Map<String, Filnlly> newTret = new HashMap<>();
         Session session = null;
@@ -1213,6 +1213,7 @@ public class Neo4jAPI {
                             Map<String, List<String>> medicatonMap = new LinkedHashMap<>();//全部的药集合
                             String diseaseName = df.getKey();//疾病
                             ArrayList value = df.getValue();//其他条件
+
                             // TODO: 2019/11/12 处理规则判断的用药情况
                             JSONObject jsonObject = medicationRule(tx, medicaton_ji, medicatonMap,diseaseName,value);
                             drugsList = (List<Drugs>)jsonObject.get("drugs");
@@ -1220,16 +1221,20 @@ public class Neo4jAPI {
                             if(treatCate.getType() == null){
                                 treatCate = null;
                             }
+
                             //规则不成立，返回全部用药
                             if(drugsList == null || drugsList.size() == 0){
                                 drugsList = allMedication(tx,medicaton_ji, medicatonMap, diseaseName, value,1,null);
                             }
+
                             Filnlly filnlly = new Filnlly();
+
                             //显示不良反应
                             if (diseaseType != null && 1 == diseaseType) {
                                 List<Indicators> indicators = sideEffect(diseaseName, disUE, ueSet, crisisDetails, disSet);
                                 filnlly.setAdverseEvent(indicators);
                             }
+
                             filnlly.setTreatCate(treatCate);
                             filnlly.setTreatment(drugsList);
                             newTret.put(diseaseName, filnlly);