Merge remote-tracking branch 'origin/push-dev' into push-5.4.3security

common-push/src/main/java/org/diagbot/common/push/filter/rule/CalcFormula.java

@@ -1,5 +1,6 @@
 package org.diagbot.common.push.filter.rule;
 
+import org.apache.commons.lang3.StringUtils;
 import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.nlp.rule.module.PreResult;
 
@@ -18,7 +19,7 @@ public class CalcFormula {
         String units = "";
         boolean hasCr = false;
         for (PreResult preResult : lis) {
-            if ("肌酐(Cr)".equals(preResult.getDetailName())) {
+            if ("肌酐(Cr)".equals(preResult.getDetailName()) && StringUtils.isNotEmpty(preResult.getValue())) {
                 crValue = preResult.getValue();
                 units = preResult.getUnits();
                 hasCr = true;

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

@@ -129,11 +129,11 @@ public class PushTreat {
                 if(title.contains("及其")){
                     startTitle = title.substring(0,title.indexOf("及其"));
                     subTitle = title.substring(startTitle.length()+2,title.length());
-                    subTitle = subTitle.substring(0,subTitle.indexOf("治疗方案"));
+                    subTitle = subTitle.substring(0,subTitle.indexOf("建议用药"));
                     disList.add(startTitle);
                     disList.add(subTitle);
                 }else {
-                    startTitle = title.substring(0,title.indexOf("治疗方案"));
+                    startTitle = title.substring(0,title.indexOf("建议用药"));
                     disList.add(startTitle);
                 }
                 LinkedHashMap<String,List<Drugs>> kk = new LinkedHashMap<>();
@@ -285,7 +285,7 @@ public class PushTreat {
                 List<String> key = jfd.getKey();
                 LinkedHashMap<String, List<Drugs>> value = jfd.getValue();
                 String title="";
-                title =  key.toString().replace("[","").replace("]","")+"治疗方案";
+                title =  key.toString().replace("[","").replace("]","")+"建议用药";
                 List<MeditionDetail> dda = new ArrayList<>();
                 if(value.size()>0){
                     for (Map.Entry<String, List<Drugs>> ds:value.entrySet()) {
@@ -390,7 +390,7 @@ public class PushTreat {
         meditionDetail.setTreatment(dList);
         mList.add(meditionDetail);
 
-        treatDetail.setTitle(disName+"治疗方案");
+        treatDetail.setTitle(disName+"建议用药");
         treatDetail.setMeditionDetails(mList);
         disTreatDetailList.add(treatDetail);
         return disTreatDetailList;
@@ -601,7 +601,7 @@ public class PushTreat {
                         List<MeditionDetail> meditionDetails = new ArrayList<>();
                         int main = cateList.indexOf("主症");
                         String mainDis = disList.get(main);
-                        treatDetail.setTitle(mainDis+"治疗方案");//糖尿病及其2型糖尿病治疗方案
+                        treatDetail.setTitle(mainDis+"建议用药");//糖尿病及其2型糖尿病建议用药
                         Integer da = conditionDesign.get(key);
                         String s = switchType(da);
                         MeditionDetail meditionDetail_main = new MeditionDetail();//主诊断的
@@ -627,7 +627,7 @@ public class PushTreat {
                                 dds.add(s);
                             }
                         }
-                        treatDetail.setTitle(mainDis+"及其"+String.join("、",dds)+"治疗方案");//糖尿病及其2型糖尿病治疗方案
+                        treatDetail.setTitle(mainDis+"及其"+String.join("、",dds)+"建议用药");//糖尿病及其2型糖尿病建议用药
                         Integer da = conditionDesign.get(key);
                         String s = switchType(da);
                         MeditionDetail meditionDetail_main = new MeditionDetail();//主诊断的
@@ -684,7 +684,7 @@ public class PushTreat {
                                 dds.add(s);
                             }
                         }
-                        treatDetail.setTitle(mainDis+"及其"+String.join("、",dds)+"治疗方案");//糖尿病及其2型糖尿病治疗方案
+                        treatDetail.setTitle(mainDis+"及其"+String.join("、",dds)+"建议用药");//糖尿病及其2型糖尿病建议用药
                         Integer da = conditionDesign.get(key);
                         String s = switchType(da);
                         MeditionDetail meditionDetail_main = new MeditionDetail();//主诊断的
@@ -719,7 +719,7 @@ public class PushTreat {
                         List<MeditionDetail> meditionDetails = new ArrayList<>();
                         int main = cateList.indexOf("主症");
                         String mainDis = disList.get(main);
-                        treatDetail.setTitle(mainDis+"治疗方案");//糖尿病及其2型糖尿病治疗方案
+                        treatDetail.setTitle(mainDis+"建议用药");//糖尿病及其2型糖尿病建议用药
                         Integer da = conditionDesign.get(key);
                         String s = switchType(da);
                         MeditionDetail meditionDetail_main = new MeditionDetail();//主诊断的