Merge branch 'dev-template' of http://192.168.2.236:10080/louhr/qc into dev-template

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstCourseRecordDocTrans.java

@@ -27,35 +27,35 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         // 病例特点=主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
-//        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(
-//                "主诉",
-//                "现病史-发病情况",
-//                "专科检查",
-//                "实验室检查",
-//                "影像学检查",
-//                "辅助检查结果",
-//                "呼吸",
-//                "脉搏",
-//                "体温",
-//                "血压"
-//                ))
-//        );
+        //        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(
+        //                "主诉",
+        //                "现病史-发病情况",
+        //                "专科检查",
+        //                "实验室检查",
+        //                "影像学检查",
+        //                "辅助检查结果",
+        //                "呼吸",
+        //                "脉搏",
+        //                "体温",
+        //                "血压"
+        //                ))
+        //        );
         // 诊断依据=性别+年龄+主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
-//        structureMap.put("诊断依据", MapUtil.getSelectString(structureMap, Arrays.asList(
-//                "性别",
-//                "年龄",
-//                "主诉",
-//                "现病史-发病情况",
-//                "专科检查",
-//                "实验室检查",
-//                "影像学检查",
-//                "辅助检查结果",
-//                "呼吸",
-//                "脉搏",
-//                "体温",
-//                "血压"
-//                ))
-//        );
+        //        structureMap.put("诊断依据", MapUtil.getSelectString(structureMap, Arrays.asList(
+        //                "性别",
+        //                "年龄",
+        //                "主诉",
+        //                "现病史-发病情况",
+        //                "专科检查",
+        //                "实验室检查",
+        //                "影像学检查",
+        //                "辅助检查结果",
+        //                "呼吸",
+        //                "脉搏",
+        //                "体温",
+        //                "血压"
+        //                ))
+        //        );
         // 诊疗计划=检查计划+治疗计划和措施
         structureMap.put("诊疗计划-crf", MapUtil.getSelectString(structureMap, Arrays.asList(
                 "检查计划",
@@ -70,10 +70,12 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-//            "医生=记录医师",
+            //            "医生=记录医师",
             "现病史- 发病情况=发病经过",
             "治疗计划和措施=治疗计划",
-            "实验室检查=辅助检查"
+            "实验室检查=辅助检查",
+            "体温(耳)=体温耳",
+            "体温(口)=体温口"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -102,6 +102,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> operationDiscussion_keyContrasts = Lists.newArrayList(
+            "本人姓名=姓名",
             "开始时间=手术开始时间",
             "结束时间=手术结束时间"
     );