Merge branch 'dev-template' into debug

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/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);