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/TaiZhouDifficultCaseDiscussDocTrans.java

@@ -42,7 +42,8 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
             "医生=记录者",
             "讨论小结=结 论",
             "讨论意见=讨论内容",
-            "事件日期=讨论时间"
+            "事件日期=讨论时间",
+            "本人姓名=姓名"
     );
 
 }

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

@@ -28,7 +28,7 @@ public class TaiZhouDutyShiftSystemDocTrans extends ModelDocTrans {
     }
 
     private DutyShiftSystemDoc getDutyShiftSystemDoc(String content) {
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DutyShiftSystemDoc dutyShiftSystemDoc = new DutyShiftSystemDoc();

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

@@ -24,7 +24,7 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
-        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         // 病例特点=主诉+现病史-发病情况+专科检查+实验室检查+影像学检查+辅助检查结果+呼吸+脉搏+体温+血压
 //        structureMap.put("病例特点", MapUtil.getSelectString(structureMap, Arrays.asList(

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

@@ -138,7 +138,8 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
     // 手术记录
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
             "结束时间=手术结束时间",
-            "开始时间=手术开始时间"
+            "开始时间=手术开始时间",
+            "本人姓名=姓名"
     );
 
 

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

@@ -38,6 +38,9 @@ public class TaiZhouRescueDocTrans extends ModelDocTrans {
         return rescueDoc;
     }
 
-    private List<String> keyContrasts = Lists.newArrayList();
+    private List<String> keyContrasts = Lists.newArrayList(
+            "事件日期=抢救开始时间",
+            "本人姓名=姓名"
+    );
 
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/util/TzXmlUtil.java

@@ -47,7 +47,8 @@ public class TzXmlUtil {
 //                ename = StringUtil.removeBlank(ename);
                 setnomark = emrTermElement.attributeValue("setnomark");
                 setnomark = setnomark == null ? "" : setnomark;
-                text = emrTermElement.getStringValue().trim();
+                setnomark = setnomark.trim().replaceAll(" ","");
+                text = emrTermElement.getStringValue().trim().replaceAll(" ","");
                 if (StringUtil.isBlank(retMap.get(ename))) {
                     if (StringUtil.isBlank(text)) {
                         retMap.put(ename, setnomark);