zdm 5 anni fa
parent
commit
82c3c2a254

+ 3 - 3
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@ -75,7 +75,7 @@ public class EntranceService {
            InputStream is = resource.getInputStream();
            InputStream is = resource.getInputStream();
            contentStr = new BufferedReader(new InputStreamReader(is,"utf-8"))
            contentStr = new BufferedReader(new InputStreamReader(is,"utf-8"))
                    .lines().collect(Collectors.joining(System.lineSeparator()));
                    .lines().collect(Collectors.joining(System.lineSeparator()));
            contentStr =  replaceSpecialStr(contentStr);
//            contentStr =  replaceSpecialStr(contentStr);
        }else {
        }else {
            throw new Exception("文件不存在");
            throw new Exception("文件不存在");
        }
        }
@ -435,8 +435,8 @@ public class EntranceService {
                String[] icdcodeAndName = icds.split("&");
                String[] icdcodeAndName = icds.split("&");
                wlyyOutpatientVO.setIcd10(icdcodeAndName.length > 1 ? icdcodeAndName[1].toString() : "");
                wlyyOutpatientVO.setIcd10(icdcodeAndName.length > 1 ? icdcodeAndName[1].toString() : "");
                wlyyOutpatientVO.setIcd10Name(icdcodeAndName.length > 0 ? icdcodeAndName[0].toString() : "");
                wlyyOutpatientVO.setIcd10Name(icdcodeAndName.length > 0 ? icdcodeAndName[0].toString() : "");
                String admDate = null == jsonObjectMgsInfo.get("ADM_NO") ? "" : jsonObjectMgsInfo.get("ADM_NO") + "";
                String conDate = null == jsonObjectMgsInfo.get("ADM_NO") ? "" : jsonObjectMgsInfo.get("ADM_NO") + "";
                String admDate = null == jsonObjectMgsInfo.get("ADM_DAT") ? "" : jsonObjectMgsInfo.get("ADM_DAT") + "";
                String conDate = null == jsonObjectMgsInfo.get("CON_DATE") ? "" : jsonObjectMgsInfo.get("CON_DATE") + "";
                wlyyOutpatientVO.setAdmDate(DateUtil.strToDate(admDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVO.setAdmDate(DateUtil.strToDate(admDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVO.setConDate(DateUtil.strToDate(conDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVO.setConDate(DateUtil.strToDate(conDate, DateUtil.YYYY_MM_DD_HH_MM_SS_));
                wlyyOutpatientVOS.add(wlyyOutpatientVO);
                wlyyOutpatientVOS.add(wlyyOutpatientVO);