婚育史规则更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0024.java

@@ -24,9 +24,13 @@ public class BEH0024 extends QCCatalogue {
         if (ListUtil.isNotEmpty(wounds)) {
             if (wounds.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i)).count() > 0) {
                 status = "0";
+                info = "zcvdv";
             }
+        }else{
+            info = "jkil";
         }
-        resultDetail.put("status", status);
+//        resultDetail.put("status", status);
+
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0025.java

@@ -26,7 +26,6 @@ public class BEH0025 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0026.java

@@ -26,7 +26,6 @@ public class BEH0026 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0027.java

@@ -26,7 +26,6 @@ public class BEH0027 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0028.java

@@ -26,7 +26,6 @@ public class BEH0028 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0029.java

@@ -26,7 +26,6 @@ public class BEH0029 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0030.java

@@ -26,7 +26,6 @@ public class BEH0030 extends QCCatalogue {
                 status = "0";
             }
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0041.java

@@ -19,7 +19,6 @@ public class BEH0041 extends QCCatalogue {
         if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText())) {
             status = "0";
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0045.java

@@ -21,7 +21,6 @@ public class BEH0045 extends QCCatalogue {
         if (maritalHistory == null || StringUtil.isBlank(maritalHistory.getName())) {
             status = "0";
         }
-        resultDetail.put("status", status);
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0046.java

@@ -3,10 +3,12 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.entity.Smoking;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 /**
- * @Description:
+ * @Description: 吸烟史未描述
  * @author: rengb
  * @time: 2020/3/10 14:02
  */
@@ -15,6 +17,10 @@ public class BEH0046 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        Smoking smoking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getSmoking();
+        if (smoking != null && StringUtil.isNotBlank(smoking.getName())) {
+            status = "0";
+        }
     }
-}
+
+}

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0047.java

@@ -3,10 +3,12 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.entity.Drinking;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 /**
- * @Description:
+ * @Description: 饮酒史未描述
  * @author: rengb
  * @time: 2020/3/10 14:02
  */
@@ -15,6 +17,9 @@ public class BEH0047 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        Drinking drinking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getDrinking();
+        if (drinking != null && StringUtil.isNotBlank(drinking.getName())) {
+            status = "0";
+        }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0052.java

@@ -19,7 +19,6 @@ public class BEH0052 extends QCCatalogue {
         if (StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText())) {
             status = "0";
         }
-        resultDetail.put("status", status);
     }
 
 }