恩泽解析修改

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

@@ -21,7 +21,6 @@ import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.model.vo.EzAnalysisVO;
 import com.lantone.qc.pub.res.EzAnalysisDTO;
-import com.lantone.qc.pub.util.FileUtil;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.beilun.util.ez.EzXmlAnalysis;
@@ -60,7 +59,7 @@ public class EZAnalysis {
 
     public List<EzAnalysisDTO> anlysis(EzAnalysisVO ezAnalysisVO) throws Exception {
         List<EzAnalysisDTO> details = Lists.newArrayList();
-//        ezAnalysisVO.setXml(bom(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\恩泽\\入院记录\\小儿外科入院记录(男)\\1677273_小儿外科入院记录(男).txt")));
+        //        ezAnalysisVO.setXml(bom(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\恩泽\\入院记录\\小儿外科入院记录(男)\\1677273_小儿外科入院记录(男).txt")));
         Map<String, String> sourceMap = EzXmlAnalysis.analysisEk(ezAnalysisVO.getDeptName(), ezAnalysisVO.getXml());
         InputInfo inputInfo = ai(sourceMap);
         structHandle(inputInfo, sourceMap);
@@ -70,12 +69,22 @@ public class EZAnalysis {
             EzAnalysisDTO ezAnalysisDTO = new EzAnalysisDTO();
             ezAnalysisDTO.setCode(keyMaps.get(ky));
             ezAnalysisDTO.setModelName(ky);
-            ezAnalysisDTO.setModelValue(structMap.get(ky) == null ? "" : structMap.get(ky));
+            ezAnalysisDTO.setModelValue(modelValueHandle(structMap.get(ky)));
             details.add(ezAnalysisDTO);
         });
         return details;
     }
 
+    private String modelValueHandle(String modelValue) {
+        if (modelValue == null) {
+            return "";
+        }
+        if ((modelValue.endsWith(",") || modelValue.endsWith("，"))) {
+            modelValue = modelValue.substring(0, modelValue.length() - 1) + "。";
+        }
+        return modelValue;
+    }
+
     private void structHandle(InputInfo inputInfo, Map<String, String> structMap) {
         diagsHandle(inputInfo, structMap);
         diagInfectiouseHandle(inputInfo, structMap);