台州质控修改bug

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

@@ -23,7 +23,8 @@ public class BEH0409 extends QCCatalogue {
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
             String name = structureMap.get("关系");
-            if(CatalogueUtil.isEmpty(name)){
+            String historyPresenter = structureMap.get("病史陈述者");
+            if(CatalogueUtil.isEmpty(name) && CatalogueUtil.isEmpty(historyPresenter)){
                 status.set("-1");
             }
         }

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

@@ -23,7 +23,7 @@ public class FIRP0174 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
-            if (outpatientEmergencyDiag == null && outpatientEmergencyDiag.size() == 0) {
+            if (outpatientEmergencyDiag == null || outpatientEmergencyDiag.size() == 0) {
                 status.set("-1");
             }
         }

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

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 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;
@@ -23,8 +24,8 @@ public class FIRP0187 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String outWay = firstpageStructureMap.get(Content.outWay);
             String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy);
-            if (!CatalogueUtil.isEmpty(outWay) && !outWay.contains("死亡")
-                    && !CatalogueUtil.isEmpty(deadAutopsy) && !deadAutopsy.trim().equals("-")){
+            if (StringUtil.isNotEmpty(outWay) && !outWay.contains("死亡")
+                    && StringUtil.isNotEmpty(deadAutopsy)){
                 status.set("-1");
             }
         }

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

@@ -13,20 +13,22 @@ import java.util.Map;
 
 /**
  * @ClassName : FIRP0220
- * @Description : 入院时间与入院记录时间不一致,只判断到日期
+ * @Description : 入院时间与入院记录时间不一致
  * @Author : 胡敬
  * @Date: 2020-03-14 17:10
  */
 @Component
 public class FIRP0220 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String firstAdmissionDate = firstpageStructureMap.get(Content.admisTime);
             String admissionDate = beHospitalStructureMap.get(Content.admisDate);
+            if (StringUtil.isEmpty(firstAdmissionDate) || StringUtil.isEmpty(admissionDate)){
+                return;
+            }
             Date firstDate = StringUtil.parseDateTime(firstAdmissionDate);
             Date admisDate = StringUtil.parseDateTime(admissionDate);
             if(firstDate != null && admisDate != null){

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

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 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;
@@ -21,10 +22,10 @@ public class FIRP0275 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay).toString();//病案首页出院时间
-            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength).replace("天","");//出院小结出院时间
+            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay);//病案首页出院时间
+            String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
             if (!CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
                 status.set("-1");
             }