恩泽解析修改

kernel/src/main/java/com/lantone/qc/kernel/analysis/EZAnalysis.java

@@ -252,6 +252,7 @@ public class EZAnalysis {
         List<General> gens = presentLabel.getGens();
         List<GeneralDesc> generals = presentLabel.getGenerals();
         if (ListUtil.isNotEmpty(generals)) {
+            String preStr = map.get("现病史");
             int index = -1;
             for (GeneralDesc general : generals) {
                 index++;
@@ -268,13 +269,14 @@ public class EZAnalysis {
                     list.add(general.getName() + genstr);
                 }
             }
+            list.forEach(i -> {
+                sbf.append(i).append("，");
+            });
+            neList.forEach(i -> {
+                sbf.append(i).append("，");
+            });
+            preStr.replaceAll(sbf.toString(), "");
         }
-        list.forEach(i -> {
-            sbf.append(i).append(",");
-        });
-        neList.forEach(i -> {
-            sbf.append(i).append(",");
-        });
         map.put("一般健康状况标志", sbf.toString());
     }
 

trans/src/main/java/com/lantone/qc/trans/beilun/util/ez/EzXmlAnalysis.java

@@ -93,7 +93,7 @@ public class EzXmlAnalysis {
             }
             map.put(key, disMessage);
             if (StringUtil.isNotBlank(sign)) {
-                map.put(key + "签名", sign);
+                map.put(key + "签名", sign.replaceAll("日期", ""));
             }
             if (StringUtil.isNotBlank(signTime)) {
                 map.put(key + "签名日期", signTime);