rengb 5 سال پیش
والد
کامیت
abf18bba78

+ 0 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0024.java

@@ -24,13 +24,8 @@ 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);
-
     }
 
 }

+ 15 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0042.java

@@ -3,10 +3,15 @@ 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.Address;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
- * @Description:
+ * @Description: 出生地未描述
  * @author: rengb
  * @time: 2020/3/10 14:02
  */
@@ -15,6 +20,13 @@ public class BEH0042 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        List<Address> addresses = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getAddresses();
+        if (ListUtil.isNotEmpty(addresses)) {
+            long count = addresses.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i) && i.indexOf("出生") != -1).count();
+            if (count > 0) {
+                status = "0";
+            }
+        }
     }
-}
+
+}

+ 15 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0043.java

@@ -3,10 +3,15 @@ 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.Address;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
- * @Description:
+ * @Description: 居住地未描述
  * @author: rengb
  * @time: 2020/3/10 14:02
  */
@@ -15,6 +20,13 @@ public class BEH0043 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        List<Address> addresses = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getAddresses();
+        if (ListUtil.isNotEmpty(addresses)) {
+            long count = addresses.stream().map(i -> i.getName()).filter(i -> StringUtil.isNotBlank(i) && i.indexOf("居住") != -1).count();
+            if (count > 0) {
+                status = "0";
+            }
+        }
     }
-}
+
+}

+ 9 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0044.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.EpidemicArea;
+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 BEH0044 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        EpidemicArea epidemicArea = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getEpidemicArea();
+        if (epidemicArea != null && StringUtil.isNotBlank(epidemicArea.getName())) {
+            status = "0";
+        }
     }
-}
+
+}

+ 9 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0048.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.Contact;
+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 BEH0048 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        Contact contact = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getContact();
+        if (contact != null && StringUtil.isNotBlank(contact.getName())) {
+            status = "0";
+        }
     }
-}
+
+}

+ 9 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.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.Marryiage;
+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 BEH0053 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        Marryiage marryiage = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getMarryiage();
+        if (marryiage != null && StringUtil.isNotBlank(marryiage.getName())) {
+            status = "0";
+        }
     }
-}
+
+}

+ 9 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0054.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.Consanguineous;
+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 BEH0054 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        
+        Consanguineous consanguineous = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConsanguineous();
+        if (consanguineous != null && StringUtil.isNotBlank(consanguineous.getName())) {
+            status = "0";
+        }
     }
-}
+
+}