diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index 66f297b..ea8bc5d 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -1330,7 +1330,7 @@ public class CommomSearchController { * 上传费用清单压缩文件 */ @RequiresPermissions("/commom/uploadCostList") - @RequestMapping("/uploadCostList") + @PostMapping("/uploadCostList") @ResponseBody public ResultUtil uploadCost(HttpServletRequest request) { return commomService.uploadCost(request); diff --git a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java index b77161a..8e3307a 100644 --- a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java +++ b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java @@ -49,4 +49,13 @@ public interface T_Scan_AssortMapper { List getPathListByDisDate(@Param("startTime")String startTime,@Param("endTime")String endTime); List getPatAssortListByPatientId(@Param("patientId") String patientId); + + /** + * 根据患者id和assortId和scanPages查询 + * @param patientId + * @param assortId + * @param scanPage + * @return + */ + List getAssortListByPatientAssortPage(@Param("patientId") String patientId, @Param("assortId") String assortId, @Param("scanPage") String scanPage); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index c0c952a..abd8d7e 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -6,7 +6,6 @@ import com.emr.dao.Archive_DetailMapper; import com.emr.dao.CommomMapper; import com.emr.dao.Zd_AssortMapper; import com.emr.dao.emrPdfWaterSet.EmrPdfWaterSetMapper; -import com.emr.entity.EmrComomSet; import com.emr.entity.Power_User; import com.emr.entity.ResultUtil; import com.emr.entity.Zd_Assort; @@ -15,15 +14,12 @@ import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.service.ImportExcel.ImportExcelEntity; import com.emr.service.ImportExcel.ImportExcelUtil; import com.emr.service.tScanAssort.T_Scan_AssortService; -import com.emr.util.Jpg2PdfUtil; import com.emr.util.Pdf2ImgUtil; import com.emr.util.UploadUtil; import com.emr.util.img2PdfUtil; import com.emr.vo.ExportInpVo; import com.emr.vo.User; -import com.emr.vo.commomSearch.CommomTree; import com.emr.vo.commomSearch.CommomVo; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -35,7 +31,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.context.request.RequestContextHolder; @@ -43,7 +38,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; - import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -53,7 +47,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.List; import java.util.concurrent.ConcurrentHashMap; /** @@ -1036,10 +1029,10 @@ public class CommomService { } // 文件大小检查 - /*long fileSize = multipartFile.getSize(); - if (fileSize >= 419430400) { // 400MB + long fileSize = multipartFile.getSize(); + if (fileSize > 419430400) { // 400MB return ResultUtil.error("上传文件大小不能大于400M"); - }*/ + } try { @@ -1052,13 +1045,14 @@ public class CommomService { //定义导出异常病案号，出院日期实体对象 ExportInpVo exportInpVo = null; + Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName("费用"); + if (pdfNameList != null && pdfNameList.size() > 0) { //病案号 String inpatientNo = ""; //出院日期 String disDate = ""; - Zd_Assort zd_assort = zd_assortMapper.getZdAssortByName("费用"); for (int i = 0; i < pdfNameList.size(); i++) { String pdfName = pdfNameList.get(i); @@ -1108,6 +1102,12 @@ public class CommomService { t_scan_assort.setScanPage(picNameList.get(k)); t_scan_assort.setIsDel((short) 0); t_scan_assort.setSource((short) 1); + + //根据病人id，病案分段id，图片名称判断病案分段图片是否已存在 + List assorts = scanAssortService.getAssortListByPatientAssortPage(commomVo.getPatientId(), zd_assort.getAssortId(),picNameList.get(k)); + if (assorts != null && assorts.size() > 0) { + continue; + } insertList.add(t_scan_assort); } //批量新增图片记录 diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java index 981ca29..a32af2f 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java @@ -23,4 +23,13 @@ public interface T_Scan_AssortService { List getPathListByDisDate(String startTime,String endTime); List getPatAssortListByPatientId(String patientId); + + /** + * 根据患者id、assortId、scanPages查询 + * @param patientId + * @param assortId + * @param scanPage + * @return + */ + List getAssortListByPatientAssortPage(String patientId, String assortId, String scanPage); } diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java index 96641aa..efb5048 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java @@ -146,8 +146,8 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService { List indexFdsList = patientAssortVo.getIndexFds(); //编辑图片信息 for (IndexFds indexFds : indexFdsList) { - String srcPath =""; - if(indexFds.getScanFile().startsWith("\\\\")){ + String srcPath = ""; + if (indexFds.getScanFile().startsWith("\\\\")) { srcPath = indexFds.getScanFile().replaceAll("\\\\", "/"); } @@ -166,9 +166,14 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService { //将原图片地址转换成映射地址 //获取盘符并转换映射地址的头部地址 root = selectRootByNotWater(srcPath); - //获取盘符后面的地址 - picPath = srcPath.substring(srcPath.indexOf('/')+1); - fileUrl = NEW_EMR_RECORD_JSP + File.separator + root + picPath.replace("/",File.separator); + if (root == null) { + fileUrl = indexFds.getScanFile(); + } else { + //获取盘符后面的地址 + picPath = srcPath.substring(srcPath.indexOf('/') + 1); + fileUrl = NEW_EMR_RECORD_JSP + File.separator + root + picPath.replace("/", File.separator); + } + } else { //获取盘符并转换映射地址的头部地址 root = selectRootByNotWater(indexFds.getScanFile()); @@ -188,6 +193,11 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService { return list; } + @Override + public List getAssortListByPatientAssortPage(String patientId, String assortId, String scanPage) { + return scanAssortMapper.getAssortListByPatientAssortPage(patientId, assortId, scanPage); + } + private String selectRootByNotWater(String srcPath) { //获取盘符 String str = srcPath.substring(0, 1).toUpperCase(); diff --git a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml index f11a3d8..ad15ba5 100644 --- a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml +++ b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml @@ -284,8 +284,21 @@ and t.is_del = 0 ORDER BY c.admiss_times,t.assort_id - - + update t_scan_assort set is_del = 0 where patient_id = #{patientId} diff --git a/src/main/webapp/WEB-INF/jspf/importPackageJsp.jspf b/src/main/webapp/WEB-INF/jspf/importPackageJsp.jspf index c51ed5e..b8fb20c 100644 --- a/src/main/webapp/WEB-INF/jspf/importPackageJsp.jspf +++ b/src/main/webapp/WEB-INF/jspf/importPackageJsp.jspf @@ -73,7 +73,7 @@ window.location.href = path + "/exportWrongExcel1?fileName=" + exportFileName + "&workBookKey=" + dataExcel.workBookKey; } } else { - toastr.error("费用清单上传失败"); + toastr.warning(dataObj.msg); } $("#upfile").val("");