义乌妇保首程未在8小时内完成bug修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/yiwu/firstcourserecord/FIRC0093.java

@@ -4,9 +4,8 @@ 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.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
-import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -25,15 +24,16 @@ import java.util.Map;
 public class FIRC0093 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();//病案首页
+        MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc(); //入院登记
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-        if (firstCourseRecordDoc != null && firstPageRecordDoc != null) {
+        if (firstCourseRecordDoc != null && medicalRecordInfoDoc != null) {
             Map<String, String> courseRecordDocStructureMap = firstCourseRecordDoc.getStructureMap();
-            Map<String, String> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureMap();
-            if (courseRecordDocStructureMap != null && firstPageRecordDocStructureMap != null) {
+            Map<String, String> medicalRecordInfoDocStructureMap = medicalRecordInfoDoc.getStructureMap();
+            if (courseRecordDocStructureMap != null && medicalRecordInfoDocStructureMap != null) {
                 String couDate = courseRecordDocStructureMap.get("病历日期");
                 String couBeDate = courseRecordDocStructureMap.get("入院日期");
-                String beDate = firstPageRecordDocStructureMap.get("入院时间");
+                //入院日期
+                String admisTime = medicalRecordInfoDocStructureMap.get("behospitalDate");
                 if (StringUtils.isNotEmpty(couDate)) {
                     Date date_out = StringUtil.parseDateTime(couDate);
                     Date date_in = null;
@@ -42,8 +42,8 @@ public class FIRC0093 extends QCCatalogue {
                     }
                     if (StringUtils.isNotEmpty(couBeDate)) {
                         date_in = StringUtil.parseDateTime(couBeDate);
-                    } else if (StringUtils.isNotEmpty(beDate)) {
-                        date_in = StringUtil.parseDateTime(beDate);
+                    } else if (StringUtils.isNotEmpty(admisTime)) {
+                        date_in = StringUtil.parseDateTime(admisTime);
                     }
                     if (date_in == null) {
                         return;
@@ -55,12 +55,13 @@ public class FIRC0093 extends QCCatalogue {
                 }
             }
         } else {
-            if (firstPageRecordDoc != null) {
-                Map<String, String> firstPageRecordDocStructureMap = firstPageRecordDoc.getStructureMap();
-                if (firstPageRecordDocStructureMap != null) {
-                    String beDate = firstPageRecordDocStructureMap.get("入院时间");
-                    if (StringUtils.isNotEmpty(beDate)) {
-                        Date date_in = StringUtil.parseDateTime(beDate);
+            if (medicalRecordInfoDoc != null) {
+                Map<String, String> medicalRecordInfoDocStructureMap = medicalRecordInfoDoc.getStructureMap();
+                if (medicalRecordInfoDocStructureMap != null) {
+                    //入院日期
+                    String admisTime = medicalRecordInfoDocStructureMap.get("behospitalDate");
+                    if (StringUtils.isNotEmpty(admisTime)) {
+                        Date date_in = StringUtil.parseDateTime(admisTime);
                         Date date_out = new Date();
                         if (date_in == null) {
                             return;