修改费用清单上传，出院时间位数处理

src/main/java/com/emr/service/CommomService.java

@@ -707,23 +707,23 @@ public class CommomService {
                         outSrc = EMRRECORDJSP + File.separator + root + "/jiashi/tifToJpgLoad/" + format1 + ".jpg";
                     } else {
                         String driveLetterPath = srcPath.replaceAll("\\\\", "/");
-                        if(driveLetterPath.startsWith("/")){
+                        if (driveLetterPath.startsWith("/")) {
                             //截取字符串为磁盘路径
                             int thirdBackslashIndex = driveLetterPath.indexOf('/', driveLetterPath.indexOf('/', driveLetterPath.indexOf('/') + 1) + 1);
                             if (thirdBackslashIndex != -1) {
-                                driveLetterPath = driveLetterPath.substring(thirdBackslashIndex+1);
+                                driveLetterPath = driveLetterPath.substring(thirdBackslashIndex + 1);
                             }
                             //将原图片地址转换成映射地址
                             //获取盘符并转换映射地址的头部地址
                             root = selectRootByNotWater(driveLetterPath);
-                            if(root == null){
+                            if (root == null) {
                                 outSrc = srcPath;
-                            }else{
+                            } else {
                                 //获取盘符后面的地址
                                 picPath = driveLetterPath.substring(driveLetterPath.indexOf('/'));
                                 outSrc = EMRRECORDJSP + File.separator + root + picPath;
                             }
-                        }else{
+                        } else {
                             root = selectRootByNotWater(driveLetterPath);
                             //获取盘符后面的地址
                             String str1 = driveLetterPath.substring(0, driveLetterPath.indexOf("/"));
@@ -1072,24 +1072,23 @@ public class CommomService {
                     }
                     //病案号转为数值型
                     //inpatientNo =String.valueOf(Long.parseLong(inpatientNo));
+                    String disDateStr = "";
+                    CommomVo commomVo = null;
+                    if (disDate.length() >= 8) {
+                        //格式化日期
+                        disDateStr = disDate.substring(0, 4) + "-" + disDate.substring(4, 6) + "-" + disDate.substring(6, 8);
+                        commomVo = commomMapper.getCommomTableList(inpatientNo, disDateStr);
+                    }
 
-                    //格式化日期
+                    //病案信息不存在或者pdf名称出院日期位数不对
-                    String disDateStr = disDate.substring(0, 4) + "-" + disDate.substring(4, 6) + "-" + disDate.substring(6, 8);
+                    if (ObjectUtils.isEmpty(commomVo) || disDate.length() < 8) {
-
-                    CommomVo commomVo = commomMapper.getCommomTableList(inpatientNo, disDateStr);
-
-
-                    if (ObjectUtils.isEmpty(commomVo)) {
-
                         exportInpVo = new ExportInpVo();
                         exportInpVo.setInpatientNo(inpatientNo);
                         exportInpVo.setDisDate(disDateStr);
                         exportInpVoList.add(exportInpVo);
                         continue;
-
                     }
 
-
                     if (commomVo != null && StringUtils.isNotBlank(commomVo.getFilePath())) {
                         /*File filePath = new File(commomVo.getFilePath());
                         if (!filePath.exists()) {