北仑: 医嘱有抗生素使用病程无记录取值字段改变

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

@@ -107,10 +107,10 @@ public class THR02985 extends QCCatalogue {
         }*/
         //从首程治疗计划中获取信息
         if (firstCourseRecordDoc != null) {
-            getInfo(info, firstCourseRecordDoc.getStructureMap(), "首次病程录", "记录时间", "治疗计划");
+            getInfo(info, firstCourseRecordDoc.getStructureMap(), "首次病程录", "病历日期", "诊疗计划");
             if (firstCourseRecordDoc.getDrugLabel() != null) {
                 List<Drug> drugs = firstCourseRecordDoc.getDrugLabel().getDrugs();
-                dateStr = firstCourseRecordDoc.getStructureMap().get("记录时间");
+                dateStr = firstCourseRecordDoc.getStructureMap().get("病历日期");
                 if (StringUtil.isNotBlank(dateStr)) {
                     getInfo(infoModel, dateStr, drugs);
                 }
@@ -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()));
         }
 
         //从会诊记录中获取信息
@@ -161,12 +161,12 @@ public class THR02985 extends QCCatalogue {
 
         //从出院小结中获取信息
         if (leaveHospitalDoc != null) {
-            getInfo(info, leaveHospitalDoc.getStructureMap(), "出院小结", "出院时间", "诊治经过", "出院带药");
+            getInfo(info, leaveHospitalDoc.getStructureMap(), "出院小结", "出院日期", "诊治经过");
             if (leaveHospitalDoc.getLeaveHospitalLabel() != null) {
                 List<Drug> drugs = leaveHospitalDoc.getLeaveHospitalLabel().getDrugs();
-                dateStr = leaveHospitalDoc.getStructureMap().get("出院时间");
+                dateStr = leaveHospitalDoc.getStructureMap().get("出院日期");
                 if (StringUtil.isNotBlank(dateStr)) {
-                    getInfo(info, leaveHospitalDoc.getStructureMap(), "出院小结", "出院时间", "诊治经过", "出院带药");
+                    getInfo(info, leaveHospitalDoc.getStructureMap(), "出院小结", "出院日期", "诊治经过");
                     getInfo(infoModel, dateStr, drugs);
                 }
             }