修改bug

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

@@ -1,10 +1,10 @@
 package com.lantone.qc.kernel.catalogue.firstpagerecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-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;
@@ -22,7 +22,8 @@ public class FIRP0215 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String dischargeTime = firstpageStructureMap.get(Content.contactName);
-            if(CatalogueUtil.isEmpty(dischargeTime)){
+            // 跟任燕青确认，“/”也算填写
+            if(StringUtil.isBlank(dischargeTime)){
                 status.set("-1");
             }
 

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

@@ -29,8 +29,13 @@ public class FIRP02859 extends QCCatalogue {
         }
         Map<String, String> firstStructureMap = firstPageRecordDoc.getStructureMap();
         String qcDateStr = firstStructureMap.get("质控日期");
-        Map<String, String> leaveStructureMap = leaveHospitalDoc.getStructureMap();
-        String leaveDateStr = leaveStructureMap.get("出院时间");
+
+        // 先从病案首页获取，如果为空，再从出院小结获取
+        String leaveDateStr = firstStructureMap.get("出院时间");
+        if (StringUtil.isBlank(leaveDateStr)) {
+            Map<String, String> leaveStructureMap = leaveHospitalDoc.getStructureMap();
+            leaveDateStr = leaveStructureMap.get("出院时间");
+        }
         if (StringUtil.isBlank(qcDateStr) || StringUtil.isBlank(leaveDateStr)) {
             status.set("0");
             return;