厦门：和质控科确认记录时间都按照病历日期来计算规则

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/clinicalblood/CLI0305.java

@@ -30,7 +30,7 @@ public class CLI0305 extends QCCatalogue {
             for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
                 String infusionEnd = cliBStructureMap.get("输注结束");
-                String recordDateStr = cliBStructureMap.get("记录时间");
+                String recordDateStr = cliBStructureMap.get("病历日期");
                 if(StringUtil.isNotEmpty(infusionEnd)){
                     if (!CatalogueUtil.compareTime(
                             StringUtil.parseDateTime(infusionEnd),

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/clinicalblood/CLI03063.java

@@ -35,7 +35,7 @@ public class CLI03063 extends QCCatalogue {
         Iterator<ClinicBloodEffectDoc> clinicBloodEffectDocIterator = clinicBloodEffectDocs.iterator();
         while (clinicalBloodDocIterator.hasNext()) {
             if (!CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(clinicalBloodDocIterator.next().getStructureMap().get("记录时间")),
+                    StringUtil.parseDateTime(clinicalBloodDocIterator.next().getStructureMap().get("病历日期")),
                     StringUtil.parseDateTime(DateUtil.nowString()),
                     Long.valueOf(24 * 60))) {//如果接收未超过24小时，规则不判断
                 clinicalBloodDocIterator.remove();
@@ -43,7 +43,7 @@ public class CLI03063 extends QCCatalogue {
         }
         while (clinicBloodEffectDocIterator.hasNext()) {
             if (!CatalogueUtil.compareTime(
-                    StringUtil.parseDateTime(clinicBloodEffectDocIterator.next().getStructureMap().get("记录时间")),
+                    StringUtil.parseDateTime(clinicBloodEffectDocIterator.next().getStructureMap().get("病历日期")),
                     StringUtil.parseDateTime(DateUtil.nowString()),
                     Long.valueOf(24 * 60))) {//如果接收未超过24小时，规则不判断
                 clinicBloodEffectDocIterator.remove();
@@ -51,14 +51,14 @@ public class CLI03063 extends QCCatalogue {
         }
         Collections.sort(clinicalBloodDocs, new Comparator<ClinicalBloodDoc>() {
             public int compare(ClinicalBloodDoc o1, ClinicalBloodDoc o2) {
-                return o1.getStructureMap().get("记录时间")
-                        .compareTo(o2.getStructureMap().get("记录时间"));
+                return o1.getStructureMap().get("病历日期")
+                        .compareTo(o2.getStructureMap().get("病历日期"));
             }
         });
         Collections.sort(clinicBloodEffectDocs, new Comparator<ClinicBloodEffectDoc>() {
             public int compare(ClinicBloodEffectDoc o1, ClinicBloodEffectDoc o2) {
-                return o1.getStructureMap().get("记录时间")
-                        .compareTo(o2.getStructureMap().get("记录时间"));
+                return o1.getStructureMap().get("病历日期")
+                        .compareTo(o2.getStructureMap().get("病历日期"));
             }
         });
         if (clinicalBloodDocs.size() != clinicBloodEffectDocs.size()) {
@@ -68,12 +68,12 @@ public class CLI03063 extends QCCatalogue {
         for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocs) {
             for (ClinicBloodEffectDoc clinicBloodEffectDoc : clinicBloodEffectDocs) {
                 if (CatalogueUtil.compareTime(
-                        StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("记录时间")),
-                        StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("记录时间")),
+                        StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("病历日期")),
+                        StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("病历日期")),
                         Long.valueOf(1))) {//结果单时间要比申请单大的
                     if (CatalogueUtil.compareTime(
-                            StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("记录时间")),
-                            StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("记录时间")),
+                            StringUtil.parseDateTime(clinicalBloodDoc.getStructureMap().get("病历日期")),
+                            StringUtil.parseDateTime(clinicBloodEffectDoc.getStructureMap().get("病历日期")),
                             Long.valueOf(24 * 60))) {//未超过24小时
                         status.set("-1");
                         return ;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/clinicalblood/CLI0309.java

@@ -33,8 +33,8 @@ public class CLI0309 extends QCCatalogue {
         List<Date> clinicalBloodDate = new ArrayList<>();
         for (ClinicalBloodDoc clinicalBloodDoc : clinicalBloodDocs) {
             Map<String, String> structureMap = clinicalBloodDoc.getStructureMap();
-            if (StringUtil.isNotBlank(structureMap.get("记录时间"))) {
-                Date date = DateUtil.dateZeroClear(StringUtil.parseDateTime(structureMap.get("记录时间")));
+            if (StringUtil.isNotBlank(structureMap.get("病历日期"))) {
+                Date date = DateUtil.dateZeroClear(StringUtil.parseDateTime(structureMap.get("病历日期")));
                 if (!clinicalBloodDate.contains(date)) {
                     clinicalBloodDate.add(date);
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/clinicalblood/CLI0568.java

@@ -24,8 +24,8 @@ public class CLI0568 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("记录时间")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("记录时间"))){
+                if(cliBStructureMap.containsKey("病历日期")){
+                    if(StringUtils.isEmpty(cliBStructureMap.get("病历日期"))){
                         status.set("-1");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/consultation/CON0382.java

@@ -29,7 +29,7 @@ public class CON0382 extends QCCatalogue {
         if (ListUtil.isNotEmpty(crisisValueReportDocs)) {
             crisisValueReportDocs.forEach(crisisValueReportDoc -> {
                 if (StringUtil.isBlank(crisisValueReportDoc.getStructureMap().get("危急值记录内容"))) {
-                    String record_time = crisisValueReportDoc.getStructureMap().get("记录时间");
+                    String record_time = crisisValueReportDoc.getStructureMap().get("病历日期");
                     String receive_time = crisisValueReportDoc.getStructureMap().get("接收时间");
                     if (!CatalogueUtil.compareTime(
                             StringUtil.parseDateTime(receive_time),

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/deathcasediscuss/DEAC0098.java

@@ -23,7 +23,7 @@ public class DEAC0098 extends QCCatalogue {
         if (inputInfo.getDeathRecordDoc() != null && inputInfo.getDeathRecordDoc().getStructureMap() != null) {
             Map<String, String> deathRecordStructureMap = inputInfo.getDeathRecordDoc().getStructureMap();
             String deceaseTime = deathRecordStructureMap.get("死亡时间");
-            String recordTime = deathRecordStructureMap.get("记录时间");
+            String recordTime = deathRecordStructureMap.get("病历日期");
             if (CatalogueUtil.isEmpty(deceaseTime) || CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/deathcasediscuss/DEAC0109.java

@@ -23,7 +23,7 @@ public class DEAC0109 extends QCCatalogue {
         if (inputInfo.getDeathCaseDiscussDoc() != null && inputInfo.getDeathCaseDiscussDoc().getStructureMap() != null) {
             Map<String, String> deathCaseDiscussStructureMap = inputInfo.getDeathCaseDiscussDoc().getStructureMap();
             String deceaseTime = deathCaseDiscussStructureMap.get("死亡时间");
-            String recordTime = deathCaseDiscussStructureMap.get("记录时间");
+            String recordTime = deathCaseDiscussStructureMap.get("病历日期");
             if (CatalogueUtil.isEmpty(deceaseTime) || CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/deathrecord/DEAR0337.java

@@ -22,7 +22,7 @@ public class DEAR0337 extends QCCatalogue {
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
             Map<String, String> deathRecordStructure = inputInfo.getDeathRecordDoc().getStructureMap();
             Map<String, String> leaveHospitalStructure = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String recordTime = deathRecordStructure.get("记录时间");
+            String recordTime = deathRecordStructure.get("病历日期");
             String signTime = leaveHospitalStructure.get("签名时间");
             //如果死亡记录时间比出院小结签名时间晚
             if(CatalogueUtil.compareDate(recordTime,signTime,-1)){

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/dutyshiftsystem/DUT0598.java

@@ -66,9 +66,9 @@ public class DUT0598 extends QCCatalogue {
                     if (maps.size() == 0) {
                         removeDate = date;
                         maps.put("转入时间", rollOutRecordDate);
-                        maps.put("记录时间", recordDate);
+                        maps.put("病历日期", recordDate);
                     } else {
-                        if (recordDate.getTime() - rollOutRecordDate.getTime() < maps.get("记录时间").getTime() - maps.get("转入时间").getTime()) {
+                        if (recordDate.getTime() - rollOutRecordDate.getTime() < maps.get("病历日期").getTime() - maps.get("转入时间").getTime()) {
                             removeDate = date;
                             maps.put("转入时间", rollOutRecordDate);
                         }
@@ -77,8 +77,8 @@ public class DUT0598 extends QCCatalogue {
             }
 
             if (maps.size() != 0) {
-                boolean compareTime = CatalogueUtil.compareTime(maps.get("转入时间"), maps.get("记录时间"), (long) 24 * 60);
-                boolean sameDay = DateUtils.isSameDay(maps.get("转入时间"), maps.get("记录时间"));
+                boolean compareTime = CatalogueUtil.compareTime(maps.get("转入时间"), maps.get("病历日期"), (long) 24 * 60);
+                boolean sameDay = DateUtils.isSameDay(maps.get("转入时间"), maps.get("病历日期"));
                 dateLists.remove(removeDate);
                 if (compareTime && !sameDay) {
                     status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/firstcourserecord/FIRC02910.java

@@ -28,7 +28,7 @@ public class FIRC02910 extends QCCatalogue {
         }
         Map<String, String> firstRecordMap = firstCourseRecordDoc.getStructureMap();
         Map<String, String> beHospitalizedMap = beHospitalizedDoc.getStructureMap();
-        String createDateStr = firstRecordMap.get("记录时间");
+        String createDateStr = firstRecordMap.get("病历日期");
         String beHospitalDateStr = beHospitalizedMap.get("入院日期");
         if (StringUtil.isNotBlank(createDateStr) && StringUtil.isNotBlank(beHospitalDateStr)) {
             Date createDate = StringUtil.parseDateTime(createDateStr);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/leavehospital/LEA0148.java

@@ -35,7 +35,7 @@ public class LEA0148 extends QCCatalogue {
             Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
             timeCy = medicalRecordInfoStructureMap.get("leaveHospitalDate");
         }
-        String timeQm = leaveHospitalDoc.getStructureMap().get("记录时间");
+        String timeQm = leaveHospitalDoc.getStructureMap().get("病历日期");
         if (StringUtil.isNotBlank(timeQm) && DateUtil.parseDate(timeQm) != null && StringUtil.isNotBlank(timeCy)) {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(timeCy),

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/operationdiscussion/OPE0647.java

@@ -37,7 +37,7 @@ public class OPE0647 extends QCCatalogue {
             }
             Map<String, String> operationRecordStructureMap = operationRecordDoc.getStructureMap();
             String operationEndDateStr = operationRecordStructureMap.get("手术结束时间");
-            String operationRecordDateStr = operationRecordStructureMap.get("记录时间");
+            String operationRecordDateStr = operationRecordStructureMap.get("病历日期");
             if (CatalogueUtil.isEmpty(operationEndDateStr) || CatalogueUtil.isEmpty(operationRecordDateStr)) {
                 continue;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0122.java

@@ -26,7 +26,7 @@ public class THR0122 extends QCCatalogue {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String admisDate = beHospitalStructureMap.get(Content.admisDate);
             Map<String, String> firstCourseRecordStructureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
-            String recordTime = firstCourseRecordStructureMap.get("记录时间");
+            String recordTime = firstCourseRecordStructureMap.get("病历日期");
             if (CatalogueUtil.isEmpty(admisDate) || CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }

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

@@ -84,7 +84,7 @@ public class THR0126 extends QCCatalogue {
                 String doctorSign = firstCourseRecordDoc.getStructureMap().get("记录医生");
                 String firstCourseProfessor = getFirstCourseProfessor(doctorSign);
                 if (StringUtil.isNotBlank(firstCourseProfessor) && firstCourseProfessor.contains("主治")) {
-                    String recordDateStr = firstCourseRecordDoc.getStructureMap().get("记录时间");
+                    String recordDateStr = firstCourseRecordDoc.getStructureMap().get("病历日期");
                     if (StringUtil.isNotBlank(recordDateStr)) {
                         if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(recordDateStr), 48 * 60L)) {
                             status.set("0");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR02985.java

@@ -132,19 +132,19 @@ public class THR02985 extends QCCatalogue {
                     .stream()
                     .map(OperationDoc::getOperationRecordDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationRecordDocs.forEach(x -> getInfo(info, x.getStructureMap(), "手术记录", "记录时间", "手术经过及处理"));
-            operationRecordDocs.forEach(x -> getInfo(infoModel, x.getStructureMap().get("记录时间"), x.getOperationRecordLabel().getDrugs()));
+            operationRecordDocs.forEach(x -> getInfo(info, x.getStructureMap(), "手术记录", "病历日期", "手术经过及处理"));
+            operationRecordDocs.forEach(x -> getInfo(infoModel, x.getStructureMap().get("病历日期"), x.getOperationRecordLabel().getDrugs()));
             //术后首程
             List<OperationDiscussionDoc> operationDiscussionDocs = operationDocs
                     .stream()
                     .map(OperationDoc::getOperationDiscussionDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationDiscussionLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationDiscussionLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationDiscussionDocs.forEach(x -> getInfo(info, x.getStructureMap(), "术后首程", "记录时间", "手术简要经过", "术后处理措施"));
-            operationDiscussionDocs.forEach(x -> getInfo(infoModel, x.getStructureMap().get("记录时间"), x.getOperationDiscussionLabel().getDrugs()));
+            operationDiscussionDocs.forEach(x -> getInfo(info, x.getStructureMap(), "术后首程", "病历日期", "手术简要经过", "术后处理措施"));
+            operationDiscussionDocs.forEach(x -> getInfo(infoModel, x.getStructureMap().get("病历日期"), x.getOperationDiscussionLabel().getDrugs()));
         }
 
         //从会诊记录中获取信息

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR03015.java

@@ -43,7 +43,7 @@ public class THR03015 extends QCCatalogue {
         List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
         String jlDateStr, shDateStr, professor;
         for (DirectorDoctorWardDoc directorDoctorWardDoc : directorDoctorWardDocs) {
-            jlDateStr = directorDoctorWardDoc.getStructureMap().get("记录时间");
+            jlDateStr = directorDoctorWardDoc.getStructureMap().get("病历日期");
             shDateStr = directorDoctorWardDoc.getStructureMap().get("审核日期");
             professor = getProfessor(directorDoctorWardDoc.getStructureMap().get("审核人"));
             if (StringUtil.isBlank(professor)

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR03017.java

@@ -40,7 +40,7 @@ public class THR03017 extends QCCatalogue {
         List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDoc.getAttendingDoctorWardDocs();
         String jlDateStr, shDateStr, professor;
         for (AttendingDoctorWardDoc attendingDoctorWardDoc : attendingDoctorWardDocs) {
-            jlDateStr = attendingDoctorWardDoc.getStructureMap().get("记录时间");
+            jlDateStr = attendingDoctorWardDoc.getStructureMap().get("病历日期");
             shDateStr = attendingDoctorWardDoc.getStructureMap().get("审核日期");
             if (!CatalogueUtil.isOccup(attendingDoctorWardDoc.getStructureMap().get("审核人"))
                     || CatalogueUtil.compareTime(StringUtil.parseDateTime(jlDateStr), StringUtil.parseDateTime(shDateStr), 48 * 60L)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR03076.java

@@ -123,16 +123,16 @@ public class THR03076 extends QCCatalogue {
                     .stream()
                     .map(OperationDoc::getOperationRecordDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationRecordDocs.forEach(x -> getCourseDrugInfo(antibioticWardInfo, x.getOperationRecordLabel().getDrugs(), x.getStructureMap().get("记录时间")));
+            operationRecordDocs.forEach(x -> getCourseDrugInfo(antibioticWardInfo, x.getOperationRecordLabel().getDrugs(), x.getStructureMap().get("病历日期")));
             List<OperationDiscussionDoc> operationDiscussionDocs = operationDocs
                     .stream()
                     .map(OperationDoc::getOperationDiscussionDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationDiscussionLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationDiscussionLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationDiscussionDocs.forEach(x -> getCourseDrugInfo(antibioticWardInfo, x.getOperationDiscussionLabel().getDrugs(), x.getStructureMap().get("记录时间")));
+            operationDiscussionDocs.forEach(x -> getCourseDrugInfo(antibioticWardInfo, x.getOperationDiscussionLabel().getDrugs(), x.getStructureMap().get("病历日期")));
         }
         /*********************************************会诊结果单********************************************************/
         /*if (consultationDocs.size() > 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR03077.java

@@ -162,18 +162,18 @@ public class THR03077 extends QCCatalogue {
                     .stream()
                     .map(OperationDoc::getOperationRecordDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationRecordLabel() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationRecordDocs.forEach(x -> getCourseDrugInfo(antibioticDateCourse, x.getStructureMap().get("记录时间"), x.getOperationRecordLabel().getDrugs()
+            operationRecordDocs.forEach(x -> getCourseDrugInfo(antibioticDateCourse, x.getStructureMap().get("病历日期"), x.getOperationRecordLabel().getDrugs()
                     , CatalogueUtil.structureMapJoin(x.getStructureMap(), Lists.newArrayList("手术经过及处理"))));
             //术后首程
             List<OperationDiscussionDoc> operationDiscussionDocs = operationDocs
                     .stream()
                     .map(OperationDoc::getOperationDiscussionDoc)
                     .filter(Objects::nonNull)
-                    .filter(x -> x.getOperationDiscussionLabel().getOperativeFindings() != null && StringUtil.isNotBlank(x.getStructureMap().get("记录时间")))
+                    .filter(x -> x.getOperationDiscussionLabel().getOperativeFindings() != null && StringUtil.isNotBlank(x.getStructureMap().get("病历日期")))
                     .collect(Collectors.toList());
-            operationDiscussionDocs.forEach(x -> getCourseDrugInfo(antibioticDateCourse, x.getStructureMap().get("记录时间"), x.getOperationDiscussionLabel().getDrugs()
+            operationDiscussionDocs.forEach(x -> getCourseDrugInfo(antibioticDateCourse, x.getStructureMap().get("病历日期"), x.getOperationDiscussionLabel().getDrugs()
                     , CatalogueUtil.structureMapJoin(x.getStructureMap(), Lists.newArrayList("手术简要经过", "术后处理措施"))));
         }
         /*********************************************会诊结果单********************************************************/

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/threelevelward/THR0698.java

@@ -31,7 +31,7 @@ public class THR0698 extends QCCatalogue {
         }
         List<ThreeLevelWardDoc> recordDoctorList = allDoctorWradDocs
                 .stream()
-                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("记录时间")))
+                .filter(doc -> StringUtil.isBlank(doc.getStructureMap().get("病历日期")))
                 .collect(Collectors.toList());
         if (recordDoctorList.size() == 0) {
             status.set("0");