Merge remote-tracking branch 'origin/dev-1.2' into dev

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -93,10 +93,10 @@ public class OrdinaryAssistant {
     public static void removeBlank(Map<String, String> structureMap) {
         for (Map.Entry<String, String> map : structureMap.entrySet()) {
             String value = map.getValue();
-            if (StringUtil.isBlank(value) || !(value.contains("&amp;") || value.contains("amp;") || value.contains("nbsp;"))) {
+            if (StringUtil.isBlank(value) || !(value.contains("&amp;") || value.contains("amp;") || value.contains("nbsp;") || value.contains("gt;"))) {
                 continue;
             }
-            structureMap.put(map.getKey(), value.replaceAll("[&amp;|amp;|nbsp;]", ""));
+            structureMap.put(map.getKey(), value.replaceAll("[&amp;|amp;|nbsp;|gt;]", ""));
         }
     }
 

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

@@ -42,6 +42,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+        OrdinaryAssistant.removeBlank(structureMap);
         //如果有入院时间，优先使用
         if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {
             structureMap.put("入院时间", structureMap.get("入病房时间"));