台州运行质控修改bug

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

@@ -24,11 +24,10 @@ public class BEH02956 extends QCCatalogue {
         }
         Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         String marry = beHospitalStructureMap.get("婚姻");
-        if (StringUtil.isNotBlank(marry) && "未婚".equals(marry)){
-            return;
-        }
-        if (StringUtil.isBlank(beHospitalStructureMap.get("结婚年龄"))) {
-            status.set("-1");
+        if (StringUtil.isNotBlank(marry) && "已婚".equals(marry)) {
+            if (StringUtil.isBlank(beHospitalStructureMap.get("结婚年龄"))) {
+                status.set("-1");
+            }
         }
     }
 }

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

@@ -24,11 +24,10 @@ public class BEH02957 extends QCCatalogue {
         }
         Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         String marry = beHospitalStructureMap.get("婚姻");
-        if (StringUtil.isNotBlank(marry) && "未婚".equals(marry)){
-            return;
-        }
-        if (StringUtil.isBlank(beHospitalStructureMap.get("夫妻关系"))) {
-            status.set("-1");
+        if (StringUtil.isNotBlank(marry) && "已婚".equals(marry)) {
+            if (StringUtil.isBlank(beHospitalStructureMap.get("夫妻关系"))) {
+                status.set("-1");
+            }
         }
     }
 }

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

@@ -4,6 +4,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.util.StringUtil;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
@@ -13,6 +14,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-06-20 15:00
  */
+@Component
 public class BEH02978 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
@@ -24,12 +25,8 @@ public class BEH0440 extends QCCatalogue {
             return;
         }
         Map<String, String> bhMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-        if(bhMap != null){
-            if(bhMap.containsKey("户口地址")){
-                if(!CatalogueUtil.isEmpty(bhMap.get("户口地址"))){
-                    status.set("0");
-                }
-            }
+        if (StringUtil.isNotBlank(bhMap.get("户口地址"))) {
+            status.set("0");
         }
     }
 }

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

@@ -30,6 +30,9 @@ public class FIRP0185 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String drugAllergy = firstpageStructureMap.get(Content.drugAllergy);
             BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
+            if (beHospitalizedDoc.getPastLabel() == null) {
+                return;
+            }
             PastLabel pastLabel = beHospitalizedDoc.getPastLabel();
             List<AllergyMedicine> allergyMedicines = pastLabel.getAllergyMedicines();
             if (allergyMedicines.size() == 0 || CatalogueUtil.isEmpty(drugAllergy)) {

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

@@ -39,9 +39,7 @@ public class THR0127 extends QCCatalogue {
             }
         }
 
-        if (inputInfo.getLeaveHospitalDoc() != null
-                && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null
-                && inputInfo.getThreeLevelWardDocs().size() > 0) {
+        if (inputInfo.getBeHospitalizedDoc() != null && inputInfo.getThreeLevelWardDocs().size() > 0) {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String admisTime = beHospitalStructureMap.get("入院日期");
             if (CatalogueUtil.isEmpty(admisTime)) {
@@ -138,10 +136,10 @@ public class THR0127 extends QCCatalogue {
             /* 替换查房标题中主刀/一助的职称 */
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
             if (title.contains("主刀")) {
-                String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate,"主刀医师");
+                String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "主刀医师");
                 title = title.replace("主刀", doctorTitle);
-            } else if (title.contains("一助")){
-                String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate,"一助");
+            } else if (title.contains("一助")) {
+                String doctorTitle = CatalogueUtil.getDoctorTitle(operationDocs, recordDate, "一助");
                 title = title.replace("一助", doctorTitle);
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {

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

@@ -71,7 +71,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "出生时间=出生日期",
             "病人出生日期=出生日期",
             "新生儿出生日期=出生日期",
-            "出生地址=户口地址",
+//            "出生地址=户口地址",
             "本人电话=电话",
             "联系电话=联系人电话",
             "入院日期=入院日期",
@@ -88,7 +88,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "修正诊断=修正诊断",
             "医生=医师签名",
             "补充诊断=补充诊断",
-            "户口地址=联系地址",
+//            "户口地址=联系地址",
             "家属提供的信息可信吗=病史可靠性",
             "入院诊断(中医疾病)=中医诊断",
             "长期用药情况(包括可能成瘾的药物)=长期用药",