Merge branch 'debug' of http://192.168.2.236:10080/louhr/qc into debug

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

@@ -3,10 +3,9 @@ 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.Diag;
 import com.lantone.qc.pub.model.entity.Family;
 import com.lantone.qc.pub.model.label.FamilyLabel;
-import com.lantone.qc.pub.util.StringUtil;
+import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -25,17 +24,19 @@ public class BEH0074 extends QCCatalogue {
             status.set("0");
             return;
         }
-        if (inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null) {
-            FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
-            if (familyLabel == null){
+        FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
+        if (familyLabel == null) {
+            status.set("0");
+            return;
+        }
+        List<Family> families = familyLabel.getFamilies();
+        if (ListUtil.isEmpty(families)) {
+            status.set("0");
+            return;
+        }
+        for (Family family : families) {
+            if (family.getTumour() != null) {
                 status.set("0");
-                return;
-            }
-            List<Family> families = familyLabel.getFamilies();
-            for (Family family : families) {
-                if (family.getTumour() != null) {
-                    status.set("0");
-                }
             }
         }
     }

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

@@ -5,6 +5,7 @@ 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.MaritalStatus;
+import com.lantone.qc.pub.model.label.MaritalLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,17 +26,15 @@ public class BEH0372 extends QCCatalogue {
             status.set("0");
             return;
         }
-        //无婚育史
-        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getText() == null) {
-            status.set("0");
-            return;
-        }
 
         String basicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻");
         String bhbasicInfoStatus = inputInfo.getBeHospitalizedDoc().getStructureMap().get("婚姻状况");
-        basicInfoStatus = StringUtil.isNotBlank(basicInfoStatus) ? basicInfoStatus : "";
+        if (StringUtil.isBlank(basicInfoStatus) || StringUtil.isBlank(bhbasicInfoStatus)) {
+            status.set("0");
+            return;
+        }
 
-        if (StringUtil.isNotBlank(bhbasicInfoStatus) && basicInfoStatus.equals(bhbasicInfoStatus)){
+        if (basicInfoStatus.equals(bhbasicInfoStatus)) {
             status.set("0");
             return;
         }
@@ -47,6 +46,13 @@ public class BEH0372 extends QCCatalogue {
 
         if (chcekMaritalStatus(basicInfoStatus, maritalStatus)) {
             status.set("0");
+            return;
+        }
+
+        //无婚育史
+        MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
+        if (maritalLabel == null || maritalLabel.getText() == null) {
+            status.set("0");
         }
     }
 

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0412 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("姓名");
             String contactAddress_first = firstStructMap.get(Content.name);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0413 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("性别");
             String contactAddress_first = firstStructMap.get(Content.gender);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0414 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
-            String contactAddress_bh = structureMap.get("年龄").replace("岁","");
+        if (structureMap != null && firstStructMap != null) {
+            String contactAddress_bh = structureMap.get("年龄").replace("岁", "");
             String contactAddress_first = firstStructMap.get(Content.age);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0415 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("民族");
             String contactAddress_first = firstStructMap.get(Content.nation);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0416 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("职业");
             String contactAddress_first = firstStructMap.get(Content.job);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0417 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("出生地");
             String contactAddress_first = firstStructMap.get(Content.birth_address);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -20,16 +20,16 @@ import java.util.Map;
 public class BEH0418 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String marry_bh = structureMap.get("婚姻");
             String marry_first = firstStructMap.get(Content.marry);
-            if(!CatalogueUtil.isEmpty(marry_bh) && !CatalogueUtil.isEmpty(marry_first)){
-                if(!marry_bh.equals(marry_first)){
+            if (!CatalogueUtil.isEmpty(marry_bh) && !CatalogueUtil.isEmpty(marry_first)) {
+                if (!marry_bh.equals(marry_first)) {
                     status.set("-1");
                 }
             }

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

@@ -19,16 +19,16 @@ import java.util.Map;
 public class BEH0419 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String contactAddress_bh = structureMap.get("联系地址");
             String contactAddress_first = firstStructMap.get(Content.contact_address);
-            if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
-                if(!contactAddress_first.equals(contactAddress_bh)){
+            if (!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)) {
+                if (!contactAddress_first.equals(contactAddress_bh)) {
                     status.set("-1");
                 }
             }

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

@@ -19,16 +19,16 @@ import java.util.Map;
 public class BEH0421 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(structureMap != null && firstStructMap != null){
+        if (structureMap != null && firstStructMap != null) {
             String admisDate_bh = structureMap.get("入院日期");
             String admisDate_first = firstStructMap.get(Content.admisDate);
-            if(!CatalogueUtil.isEmpty(admisDate_bh) && !CatalogueUtil.isEmpty(admisDate_first)){
-                if(!admisDate_bh.equals(admisDate_first)){
+            if (!CatalogueUtil.isEmpty(admisDate_bh) && !CatalogueUtil.isEmpty(admisDate_first)) {
+                if (!admisDate_bh.equals(admisDate_first)) {
                     status.set("-1");
                 }
             }

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

@@ -19,16 +19,16 @@ import java.util.Map;
 public class BEH0423 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> bhStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(bhStructureMap != null && firstStructMap != null){
+        if (bhStructureMap != null && firstStructMap != null) {
             String phone = bhStructureMap.get("电话");
             String contactPhone = firstStructMap.get(Content.contact_phone);
-            if(!CatalogueUtil.isEmpty(phone) && !CatalogueUtil.isEmpty(contactPhone)){
-                if(!phone.equals(contactPhone)){
+            if (!CatalogueUtil.isEmpty(phone) && !CatalogueUtil.isEmpty(contactPhone)) {
+                if (!phone.equals(contactPhone)) {
                     status.set("-1");
                 }
             }

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

@@ -20,17 +20,17 @@ import java.util.Map;
 public class BEH0439 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getBeHospitalizedDoc() == null) {
+        if (inputInfo.getBeHospitalizedDoc() == null || inputInfo.getFirstPageRecordDoc() == null) {
             return;
         }
         Map<String, String> bhMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> fprMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        if(bhMap != null && fprMap != null){
+        if (bhMap != null && fprMap != null) {
             String birthDate_bh = bhMap.get("出生日期");
             String birthDate_fpr = fprMap.get("出生日期");
-            if(birthDate_bh != null && birthDate_fpr != null){
-                if(!CatalogueUtil.isEmpty(birthDate_bh) && !CatalogueUtil.isEmpty(birthDate_fpr)){
-                    if(!DateUtil.format(DateUtil.parseDate(birthDate_bh),DateUtil.DATE_FORMAT).equals(DateUtil.format(DateUtil.parseDate(birthDate_fpr),DateUtil.DATE_FORMAT))){
+            if (birthDate_bh != null && birthDate_fpr != null) {
+                if (!CatalogueUtil.isEmpty(birthDate_bh) && !CatalogueUtil.isEmpty(birthDate_fpr)) {
+                    if (!DateUtil.format(DateUtil.parseDate(birthDate_bh), DateUtil.DATE_FORMAT).equals(DateUtil.format(DateUtil.parseDate(birthDate_fpr), DateUtil.DATE_FORMAT))) {
                         status.set("-1");
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0159.java

@@ -18,12 +18,14 @@ import java.util.Map;
 @Component
 public class FIRP0159 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String gender = firstpageStructureMap.get(Content.gender);
-            if (!CatalogueUtil.isEmpty(gender)) {
-                status.set("0");
-            }
+        if (inputInfo.getFirstPageRecordDoc() == null) {
+            status.set("0");
+            return;
+        }
+        Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        String gender = firstpageStructureMap.get(Content.gender);
+        if (!CatalogueUtil.isEmpty(gender)) {
+            status.set("0");
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0154.java

@@ -9,6 +9,8 @@ import com.lantone.qc.pub.model.label.DiagLabel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @Description: 出院记录内容缺出院(死亡)诊断
  * @author: rengb
@@ -26,6 +28,10 @@ public class LEA0154 extends QCCatalogue {
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
         if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+            Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
+            if(StringUtils.isNotEmpty(structureMap.get("出院诊断"))){
+                return;
+            }
             DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
             if (leaveDiagLabel != null) {
                 if (StringUtils.isBlank(leaveDiagLabel.getText())) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0126.java

@@ -22,6 +22,10 @@ import java.util.Map;
 @Component
 public class THR0126 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getThreeLevelWardDocs().size() == 0) {
+            return;
+        }
         if (inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null
                 && inputInfo.getThreeLevelWardDocs().size() > 0) {
             Map<String, String> getLeaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

@@ -58,7 +58,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "职业=职业",
             "出生地址=出生地",
             "出生、生长史=居住地",
-            "婚姻状况=婚姻",
+//            "婚姻状况=婚姻",
             "地址=联系地址",
             "信息来源=病史陈述者",
             "生日=出生日期",

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstPageRecordDocTrans.java

@@ -237,8 +237,8 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
             "实际住院天数=",
             "本人工作单位电话=",
             "工作单位邮政编码=",
-            "病理号=",
-            "病人出生日期=出生日期"
+            "病理号="
+//            "病人出生日期=出生日期"
 //            "门诊与出院符合 0.未做 1.符合 2.不符合 3.不确定=门诊与出院",
 //            "入院与出院符合 0.未做 1.符合 2.不符合 3.不确定=入院与出院",
 //            "术前与术后符合 0.未做 1.符合 2.不符合 3.不确定=术前与术后",