把指标推送参与治疗的禁用和慎用

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

@@ -990,14 +990,14 @@ public class Neo4jAPI {
      * @param filds   //     * @param sign 标志,2是平常诊断的治疗,0是复诊诊断的治疗,1是急诊
      * @return
      */
-    public Map<String, Filnlly> getMulDiseaseTreat_2(String disName, String disease, Integer diseaseType, Set<String> disSet, Map<String, List<String>> disUE, Map<String,String> ueSet, String filds) {
+    public Map<String, Filnlly> getMulDiseaseTreat_2(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> diagTreat = new HashMap<>();
         Session session = null;
         NumberFormat nf = NumberFormat.getPercentInstance();
         nf.setMinimumFractionDigits(0);//设置该百分比数字，保留2位小数;
         nf.setRoundingMode(RoundingMode.HALF_UP); //设置满5向上进位，即四舍五入;
         Map<String, String> resultMap = new HashMap<>();
-        Map<String, ArrayList> diseFilds = getdisFilds(disName, disease, disSet, ueSet, filds);
+        Map<String, ArrayList> diseFilds = getdisFilds(disName, disease, disSet, ueSet, filds,crisisDetails);
 //        }
         try {
             session = driver.session(AccessMode.WRITE);
@@ -1196,7 +1196,7 @@ public class Neo4jAPI {
     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;
-        Map<String, ArrayList> diseFilds = getdisFilds(disName, disease, disSet, ueSet, filds);
+        Map<String, ArrayList> diseFilds = getdisFilds(disName, disease, disSet, ueSet, filds,crisisDetails);
         try {
             session = driver.session(AccessMode.WRITE);
             Integer integer = session.writeTransaction(new TransactionWork<Integer>() {
@@ -1427,7 +1427,9 @@ public class Neo4jAPI {
      * @param filds
      * @return
      */
-    private Map<String, ArrayList> getdisFilds(String disName, String disease, Set<String> disSet, Map<String,String> ueSet, String filds) {
+    private Map<String, ArrayList> getdisFilds(String disName, String disease, Set<String> disSet, Map<String,String> ueSet, String filds,Map<String, List<CrisisDetail>> crisisDetails) {
+        Map<String, String> details = this.processCrisisDetails(crisisDetails, "6");
+
         String[] diseaseArray = disease.split(",|，|、|;|:|；");
         List<String> diseaseList = new ArrayList<>();//诊断数组
         for (int i = 0; i < diseaseArray.length; i++) {
@@ -1448,14 +1450,19 @@ public class Neo4jAPI {
             for(Map.Entry<String,String> d:ueSet.entrySet()){
                 String ue = d.getKey();
                 String value = d.getValue();
-                if(StringUtils.isNotEmpty(value) && !"".equals("可能有")){
-                    fildsList.add("\'" +value+ ue + "\'");
+                if(StringUtils.isNotEmpty(value) && !value.equals("可能有")){
+                    fildsList.add("\'"+value+ue + "\'");
                 }
-                if(StringUtils.isNotEmpty(value) && "".equals("可能有")){
+                if(StringUtils.isNotEmpty(value) && value.equals("可能有")){
                     fildsList.add("\'" + ue + "\'");
                 }
             }
         }
+        if(details != null && details.size() >0){
+            for (Map.Entry<String,String> de:details.entrySet()) {
+                fildsList.add("\'"+de.getValue()+de.getKey()+"\'");
+            }
+        }
         diseFilds.put(disName, fildsList);
         return diseFilds;
     }