From 8d559dd7bdac975d2ab03016cfe36ca6fc067956 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Mon, 18 Dec 2023 14:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=A1=88=E5=9B=9E=E6=94=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BatchApplyDetailsController.java | 8 ++-- .../java/com/emr/dao/BatchApplyMapper.java | 6 +++ .../BatchApplyDetailsService.java | 2 +- .../BatchApplyDetailsServiceImpl.java | 39 +++++++++++++++---- .../java/com/emr/service/CommomService.java | 6 ++- .../tScanAssort/T_Scan_AssortServiceImpl.java | 10 +++++ src/main/java/com/emr/vo/PicListVo.java | 4 ++ src/main/java/com/emr/vo/ZhFyImageVo.java | 4 +- src/main/resources/config/config.properties | 4 +- .../mapper/BatchApplyDetailsMapper.xml | 9 ++--- .../resources/mapper/BatchApplyMapper.xml | 9 +++++ .../tScanAssort/T_Scan_AssortMapper.xml | 7 ++-- .../commomSearch/showRecordIframeBlood.jsp | 4 +- .../webapp/static/js/batchApply/batchApply.js | 4 +- .../static/js/batchApply/batchApplyDetails.js | 23 +++++++---- 15 files changed, 101 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/emr/controller/BatchApplyDetailsController.java b/src/main/java/com/emr/controller/BatchApplyDetailsController.java index 38f692d..aa0660c 100644 --- a/src/main/java/com/emr/controller/BatchApplyDetailsController.java +++ b/src/main/java/com/emr/controller/BatchApplyDetailsController.java @@ -132,14 +132,14 @@ public class BatchApplyDetailsController { /** * @description: 审批接口 - * @params: - * @return: + * @params: ids + * @return: int * @author linjj * @date: 2023/9/20 14:54 */ @RequestMapping("agreeById") @ResponseBody - public int agreeById(String ids) { - return batchApplyDetailsService.agreeById(ids); + public int agreeById(String ids,Integer batchId) { + return batchApplyDetailsService.agreeById(ids,batchId); } } diff --git a/src/main/java/com/emr/dao/BatchApplyMapper.java b/src/main/java/com/emr/dao/BatchApplyMapper.java index f1c8b8b..c072d30 100644 --- a/src/main/java/com/emr/dao/BatchApplyMapper.java +++ b/src/main/java/com/emr/dao/BatchApplyMapper.java @@ -29,8 +29,14 @@ public interface BatchApplyMapper { BatchApplyVo getBorrowingNum(int batchId); + BatchApplyVo getreadNum(int batchId); + int updateBorrowingNum(@Param("borrowingNum") int borrowingNum, @Param("batchId") int batchId); + int updateReadNumm(@Param("readNum") int readNum, @Param("batchId") int batchId); + + int updateStatc(@Param("statc") int statc, @Param("batchId") int batchId); + int deleteById(int id); } diff --git a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java index fc3d47c..462b41a 100644 --- a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java +++ b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java @@ -27,5 +27,5 @@ public interface BatchApplyDetailsService { int rejectById(int id); - int agreeById(String ids); + int agreeById(String ids,Integer batchId); } diff --git a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java index a171e24..47733c6 100644 --- a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java +++ b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java @@ -5,7 +5,6 @@ import com.emr.dao.BatchApplyMapper; import com.emr.dao.EmrComomSetMapper; import com.emr.dao.Emr_DictionaryMapper; import com.emr.entity.*; -import com.emr.util.ExceptionPrintUtil; import com.emr.util.ListUtils; import com.emr.util.Setters; import com.emr.vo.BatchApplyDetailsVo; @@ -13,11 +12,8 @@ import com.emr.vo.BatchApplyVo; import com.emr.vo.BatchBorrowingVo; import com.emr.vo.commomSearch.CommomVo; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -105,21 +101,21 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService { } @Override - public int agreeById(String ids) { + public int agreeById(String ids, Integer batchId) { + int i=0; //获取系统当前时间 SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); //获取登录用户信息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); // 从session获取用户名 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - //声明一个BatchApplyDetailsVo对象 - BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); //声明一个BatchApplyDetailsVo集合 List list = Collections.synchronizedList(new ArrayList<>()); //将字符串转为List在转成List List idsList = Arrays.asList(ids.split(",")).stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); //遍历审核信息 for (Integer id : idsList) { + BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); batchApplyDetailsVo.setExamineName(user.getUserPosition()); batchApplyDetailsVo.setExamineTime(fmt.format(new Date())); batchApplyDetailsVo.setApplyStatc(1); @@ -128,9 +124,36 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService { } //给有效时间赋值 upDateEffectiveTimeList(list); - return batchApplyDetailsMapper.upadteApplyDetailsList(list); + boolean b = upadteApplyDetais(list); + if (b){ + i=1; + } + //更新审批数量 + upDateAgreeNum(batchId,list.size()); + return i; } + private void upDateAgreeNum(int batchId,int readNum){ + BatchApplyVo batchApplyVo = batchApplyMapper.getreadNum(batchId); + int i = readNum + batchApplyVo.getReadNum(); + batchApplyMapper.updateReadNumm(i,batchId); +// //如果借阅数量跟审批数量一样则改为已审批 + if (batchApplyVo.getBorrowingNum()==i){ + batchApplyMapper.updateStatc(2,batchId); + }else { + batchApplyMapper.updateStatc(3,batchId); + } + + } + + private boolean upadteApplyDetais(List list){ + boolean flag=false; + for (BatchApplyDetailsVo batchApplyDetailsVo:list){ + batchApplyDetailsMapper.upadteApplyDetails(batchApplyDetailsVo); + flag=true; + } + return flag; + } private void upDateEffectiveTimeList(List batchApplyDetailsVolist) { for (BatchApplyDetailsVo list : batchApplyDetailsVolist) { diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index 1de712a..f111424 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -635,8 +635,8 @@ public class CommomService { //定义输出地址 String outSrc = ""; //获取项目上下文地址 - if ((printEffective != null && printEffective == 1 && roleId == 8) || - (printIsImg != null && printIsImg == 1) && roleId == 8) { + if ((printEffective != null && printEffective == 1 ) || + (printIsImg != null && printIsImg == 1) ) { if ("99".equals(sourceList[i])) { String rootSrcPath = selectRootByNotWater(srcPath); String str2 = srcPath.substring(0, srcPath.indexOf(File.separator)); @@ -937,6 +937,8 @@ public class CommomService { return "reloadJ\\"; case "K": return "reloadK\\"; + case "Z": + return "reloadZ\\"; default: ; } 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 d013fa1..e0f9893 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 @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.DigestUtils; import java.io.File; import java.net.MalformedURLException; @@ -96,6 +97,7 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ List list = scanAssortMapper.getPathListByInpatientNo(inpatientNo, admissTimes); for (ZhFyImageVo scanAssortList:list){ List picList = scanAssortList.getPicList(); + //编辑图片信息 for (PicListVo picPathList:picList){ //获取盘符并转换映射地址的头部地址 String root = selectRootByNotWater(picPathList.getPicUrl()); @@ -104,6 +106,10 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ String picPath = picPathList.getPicUrl().substring(str1.length() + 1, picPathList.getPicUrl().length()); String fileUrl = NEW_EMR_RECORD_JSP+ File.separator + root + picPath; picPathList.setPicUrl(fileUrl); + //生成文件id + String fileId = scanAssortList.getPatientId() + picPathList.getScanPage(); + String s = DigestUtils.md5DigestAsHex(fileId.getBytes()); + picPathList.setFileId(s); } } return list; @@ -122,6 +128,10 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ String picPath = picPathList.getPicUrl().substring(str1.length() + 1, picPathList.getPicUrl().length()); String fileUrl = NEW_EMR_RECORD_JSP+ File.separator + root + picPath; picPathList.setPicUrl(fileUrl); + //生成文件id + String fileId = scanAssortList.getPatientId() + picPathList.getScanPage(); + String s = DigestUtils.md5DigestAsHex(fileId.getBytes()); + picPathList.setFileId(s); } } return list; diff --git a/src/main/java/com/emr/vo/PicListVo.java b/src/main/java/com/emr/vo/PicListVo.java index b361c9a..9ba75bd 100644 --- a/src/main/java/com/emr/vo/PicListVo.java +++ b/src/main/java/com/emr/vo/PicListVo.java @@ -23,5 +23,9 @@ public class PicListVo { //分段名称 private String assortName; + //文件名 + private String scanPage; + //文件id + private String fileId; } diff --git a/src/main/java/com/emr/vo/ZhFyImageVo.java b/src/main/java/com/emr/vo/ZhFyImageVo.java index 4b41834..d23aa58 100644 --- a/src/main/java/com/emr/vo/ZhFyImageVo.java +++ b/src/main/java/com/emr/vo/ZhFyImageVo.java @@ -14,7 +14,8 @@ import java.util.List; @Data public class ZhFyImageVo { - + //病案id + private String patientId; //住院号 private String inpatientNo; //住院次数 @@ -26,4 +27,5 @@ public class ZhFyImageVo { private List picList; + } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 8127ebc..b16f10b 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -6,7 +6,7 @@ POWER_JSPHEAD = localhost POWER_JSP = http://localhost:8081/power #\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 -EMR_RECORD_JSP = http://localhost:8083/emr_record +EMR_RECORD_JSP = http://localhost:8081/emr_record #webSocket\u670D\u52A1\u5668\u5730\u5740 @@ -53,4 +53,4 @@ fullTextSearchMethod = SearchFulltext fullTextDays = 90 -NEW_EMR_RECORD_JSP : http://192.168.16.122:8083/emr_record \ No newline at end of file +NEW_EMR_RECORD_JSP : http://localhost:8081/emr_record \ No newline at end of file diff --git a/src/main/resources/mapper/BatchApplyDetailsMapper.xml b/src/main/resources/mapper/BatchApplyDetailsMapper.xml index ca05373..827dfac 100644 --- a/src/main/resources/mapper/BatchApplyDetailsMapper.xml +++ b/src/main/resources/mapper/BatchApplyDetailsMapper.xml @@ -41,16 +41,16 @@ effective_time = #{item.effectiveTime}, - + handling_name = #{item.handlingName}, - + examine_name = #{item.examineName}, - + examine_time = #{item.examineTime}, - + apply_statc = #{item.applyStatc}, @@ -59,7 +59,6 @@ - delete from batch_apply_details where batch_id=#{batchId} diff --git a/src/main/resources/mapper/BatchApplyMapper.xml b/src/main/resources/mapper/BatchApplyMapper.xml index afd6637..923abee 100644 --- a/src/main/resources/mapper/BatchApplyMapper.xml +++ b/src/main/resources/mapper/BatchApplyMapper.xml @@ -56,6 +56,12 @@ update batch_apply set borrowing_num=#{borrowingNum} where id=#{batchId} + + update batch_apply set read_num=#{readNum} where id=#{batchId} + + + update batch_apply set statc=#{statc} where id=#{batchId} + DELETE FROM batch_apply WHERE id =#{id} @@ -110,5 +116,8 @@ #{item} + \ No newline at end of file diff --git a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml index 5460ca6..3b92d3e 100644 --- a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml +++ b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml @@ -28,6 +28,7 @@ + @@ -36,7 +37,7 @@ - + insert into t_scan_assort (patient_id, assort_id, scan_page @@ -217,7 +218,7 @@