北仑:出院日期从MedicalRecordInfoDoc中取

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0125.java

@@ -30,11 +30,11 @@ public class THR0125 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null &&
-                medicalRecordInfoDoc != null) {
-            Map<String, String> getFirstPageRecordStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
+            //入院日期
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
-            String dischargeTime = getFirstPageRecordStructureMap.get("出院时间");
+            //出院日期
+            String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
                 status.set("0");
                 return;

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

@@ -31,11 +31,11 @@ public class THR0126 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null &&
-                medicalRecordInfoDoc != null) {
-            Map<String, String> getFirstPageRecordStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
+            //入院日期
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
-            String dischargeTime = getFirstPageRecordStructureMap.get("出院时间");
+            //出院日期
+            String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
                 status.set("0");
                 return;
@@ -84,7 +84,7 @@ public class THR0126 extends QCCatalogue {
             if (firstCourseRecordDoc != null) {
                 String doctorSign = firstCourseRecordDoc.getStructureMap().get("医生签名");
                 String firstCourseProfessor = getFirstCourseProfessor(doctorSign);
-                if (firstCourseProfessor.contains("主治")) {
+                if (StringUtil.isNotBlank(firstCourseProfessor) && firstCourseProfessor.contains("主治")) {
                     String recordDateStr = firstCourseRecordDoc.getStructureMap().get("记录时间");
                     if (StringUtil.isNotBlank(recordDateStr)) {
                         if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(recordDateStr), 48 * 60L)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0144.java

@@ -24,11 +24,11 @@ public class THR0144 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null &&
-                medicalRecordInfoDoc != null) {
-            Map<String, String> getFirstPageRecordStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
+            //入院日期
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
-            String dischargeTime = getFirstPageRecordStructureMap.get("出院时间");
+            //出院日期
+            String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
                 status.set("0");
                 return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0601.java

@@ -30,11 +30,11 @@ public class THR0601 extends QCCatalogue {
         status.set("0");
 
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null &&
-                medicalRecordInfoDoc != null) {
-            Map<String, String> getFirstPageRecordStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        if (medicalRecordInfoDoc != null && medicalRecordInfoDoc.getStructureMap() != null) {
+            //入院日期
             String admisTime = medicalRecordInfoDoc.getStructureMap().get("behospitalDate");
-            String dischargeTime = getFirstPageRecordStructureMap.get("出院时间");
+            //出院日期
+            String dischargeTime = medicalRecordInfoDoc.getStructureMap().get("leaveHospitalDate");
             if (CatalogueUtil.isEmpty(admisTime) || CatalogueUtil.isEmpty(dischargeTime)) {
                 return;
             }