rengb 5 лет назад
Родитель
Сommit
cfef992e28

+ 6 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java

@@ -35,8 +35,12 @@ public class BEH0058 extends QCCatalogue {
         Pattern p = Pattern.compile("[儿子女]");
         long count = familyList
                 .stream()
-                .map(i -> i.getName())
-                .filter(i -> StringUtil.isNotBlank(i) && StringUtil.isContainNumber(i) && p.matcher(i).find())
+                .filter(
+                        i -> i != null
+                                && StringUtil.isNotBlank(i.getName())
+                                && StringUtil.isContainNumber(i.getName())
+                                && p.matcher(i.getName()).find()
+                )
                 .count();
         if (count > 0) {
             status = "0";

+ 49 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -0,0 +1,49 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.google.common.collect.Lists;
+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.Family;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 配偶健康状况未描述
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0375 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Family> familyList = Lists.newArrayList();
+        List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
+        List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
+        if (ListUtil.isNotEmpty(familiesFl)) {
+            familyList.addAll(familiesFl);
+        }
+        if (ListUtil.isNotEmpty(familiesMl)) {
+            familyList.addAll(familiesMl);
+        }
+
+        long count = familyList
+                .stream()
+                .filter(
+                        i -> i != null
+                                && StringUtil.isNotBlank(i.getName())
+                                && i.getName().indexOf("配偶") != -1
+                                && i.getHealthCondition() != null
+                                && StringUtil.isNotBlank(i.getHealthCondition().getName())
+                )
+                .count();
+        if (count > 0) {
+            status = "0";
+        }
+    }
+
+}

+ 51 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java

@@ -0,0 +1,51 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.google.common.collect.Lists;
+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.Family;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * @Description: 子女健康状况未描述
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0376 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Family> familyList = Lists.newArrayList();
+        List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
+        List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
+        if (ListUtil.isNotEmpty(familiesFl)) {
+            familyList.addAll(familiesFl);
+        }
+        if (ListUtil.isNotEmpty(familiesMl)) {
+            familyList.addAll(familiesMl);
+        }
+
+        Pattern p = Pattern.compile("[儿子女]");
+        long count = familyList
+                .stream()
+                .filter(
+                        i -> i != null
+                                && StringUtil.isNotBlank(i.getName())
+                                && p.matcher(i.getName()).find()
+                                && i.getHealthCondition() != null
+                                && StringUtil.isNotBlank(i.getHealthCondition().getName())
+                )
+                .count();
+        if (count > 0) {
+            status = "0";
+        }
+    }
+
+}

+ 10 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0377.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * @Description: 子女数量情况未描述
+ * @Description: 配偶死亡时间未描述
  * @author: rengb
  * @time: 2020/3/10 14:02
  */
@@ -33,9 +33,15 @@ public class BEH0377 extends QCCatalogue {
 
         long count = familyList
                 .stream()
-                .filter(i -> i != null && StringUtil.isNotBlank(i.getName()) && i.getName().indexOf("配偶") != -1 && i.getDead() != null)
-                .map(i -> i.getDead().getPd())
-                .filter(i -> i != null)
+                .filter(
+                        i -> i != null
+                                && StringUtil.isNotBlank(i.getName())
+                                && i.getName().indexOf("配偶") != -1
+                                && i.getDead() != null
+                                && StringUtil.isNotBlank(i.getDead().getName())
+                                && i.getDead().getPd() != null
+                                && StringUtil.isNotBlank(i.getDead().getPd().getName())
+                )
                 .count();
         if (count > 0) {
             status = "0";

+ 51 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0378.java

@@ -0,0 +1,51 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.google.common.collect.Lists;
+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.Family;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 配偶死亡原因未描述
+ * @author: rengb
+ * @time: 2020/3/10 14:02
+ */
+@Component
+public class BEH0378 extends QCCatalogue {
+
+    @Override
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        List<Family> familyList = Lists.newArrayList();
+        List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
+        List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
+        if (ListUtil.isNotEmpty(familiesFl)) {
+            familyList.addAll(familiesFl);
+        }
+        if (ListUtil.isNotEmpty(familiesMl)) {
+            familyList.addAll(familiesMl);
+        }
+
+        long count = familyList
+                .stream()
+                .filter(
+                        i -> i != null
+                                && StringUtil.isNotBlank(i.getName())
+                                && i.getName().indexOf("配偶") != -1
+                                && i.getDead() != null
+                                && StringUtil.isNotBlank(i.getDead().getName())
+                                && i.getDead().getDeadReason() != null
+                                && StringUtil.isNotBlank(i.getDead().getDeadReason().getName())
+                )
+                .count();
+        if (count > 0) {
+            status = "0";
+        }
+    }
+
+}