Merge remote-tracking branch 'origin/push-dev-ruletype' into push-debug

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

@@ -15,9 +15,12 @@ import java.util.Map;
 
 public class PretreatmentRule {
     public void rule(SearchData searchData) throws java.io.IOException {
-        //患者基本信息 性别 年龄 婚姻
+        //患者基本信息 性别 年龄
         if (!StringUtils.isEmpty(searchData.getNormal())) {
             add2PreResultList(new PretreatmentNormal(), searchData.getNormal(), "normal", searchData);
+        }
+        //患者基本信息 婚姻
+        if (!StringUtils.isEmpty(searchData.getMarriage())) {
             add2PreResultList(new PretreatmentNormal(), searchData.getMarriage(), "normal", searchData);
         }
         //症状规则 主诉、现病史提取

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

@@ -1633,7 +1633,7 @@ public class Neo4jAPI {
                             results.add(name.replace("\"", ""));
                         }
                     } else if (3 == sort1) {
-                        if (medicalIndicationDetail3 == null) {
+                        /*if (medicalIndicationDetail3 == null) {
                             medicalIndicationDetail3 = new MedicalIndicationDetail();
                         }
                         medicalIndicationDetail3.setType(3);
@@ -1650,7 +1650,7 @@ public class Neo4jAPI {
                         shiJsonObject.put("state", Integer.parseInt(state1));
                         shiFouList.add(shiJsonObject);
                         shiFouJson.put("details", shiFouList);
-                        medicalIndicationDetail3.setContent(shiFouJson);
+                        medicalIndicationDetail3.setContent(shiFouJson);*/
                     }
                 }
                 for (String re : results) {