From 1fa7480c33f6fe5c35e37d75a89604451aecd0ca Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Wed, 22 Nov 2023 10:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=B8=8D=E7=8E=B0=E5=AE=9E?= =?UTF-8?q?=E7=AD=BE=E7=AB=A0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MedicalRecallController.java | 2 + .../emr/controller/inHospitalController.java | 226 +++++++++++------- .../emr/controller/signListController.java | 25 +- .../emr/dao/ArchiveDetailCaCopyMapper.java | 3 + .../com/emr/dao/ArchiveFinalSignMapper.java | 46 ++++ .../com/emr/entity/ArchiveFinalSignVo.java | 45 ++++ .../com/emr/service/Sign_ListService.java | 11 +- .../emr/service/ipml/CaSignServiceImpl.java | 5 + .../service/ipml/Sign_ListServiceImpl.java | 49 ++-- .../mapper/ArchiveDetailCaCopyMapper.xml | 3 + .../mapper/ArchiveFinalSignMapper.xml | 125 ++++++++++ .../WEB-INF/views/signListDir/signList.jsp | 83 ++++--- 12 files changed, 471 insertions(+), 152 deletions(-) create mode 100644 src/main/java/com/emr/dao/ArchiveFinalSignMapper.java create mode 100644 src/main/java/com/emr/entity/ArchiveFinalSignVo.java create mode 100644 src/main/resources/mapper/ArchiveFinalSignMapper.xml diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index 3837cf2c..e2075945 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -169,7 +169,9 @@ public class MedicalRecallController { //留观号召回推送第三方 archiveMasterService.requestObservationRecord(inpatientNo,"RETURNED",emrFaultDetail.getRecallReason(),null); } + result="召回成功!"; + } }else{ diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index ac066326..6412992b 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/src/main/java/com/emr/controller/inHospitalController.java @@ -126,24 +126,24 @@ public class inHospitalController { @ResponseBody @RequestMapping(value = "/getAssort") public List getAssort(HttpServletResponse response, Archive_Detail_Vo archiveDetailVo) throws Exception { - //查询是否签章 - int caMasterIdNum = caSignatureMapper.getCaMasterId(archiveDetailVo.getPatientId(), 1); - //如果存在记录查询新的签章文件表 - if (caMasterIdNum > 0) { - List list = archiveDetailCaCopyMapper.selectByClo(archiveDetailVo); - //查询新生儿数据并存入list - Integer page = archiveDetailService.selectChildByClo(archiveDetailVo); - if (page != 0) { - Archive_Detail_Vo archiveDetailVoNew = new Archive_Detail_Vo(); - archiveDetailVoNew.setAssortId("1000"); - archiveDetailVoNew.setAssortName("新生儿病历"); - archiveDetailVoNew.setPrintFlag("0"); - archiveDetailVoNew.setPageNum(page); - archiveDetailVoNew.setAssortSort((short) 1000); - list.add(archiveDetailVoNew); - } - return list; - } +// //查询是否签章 +// int caMasterIdNum = caSignatureMapper.getCaMasterId(archiveDetailVo.getPatientId(), 1); +// //如果存在记录查询新的签章文件表 +// if (caMasterIdNum > 0) { +// List list = archiveDetailCaCopyMapper.selectByClo(archiveDetailVo); +// //查询新生儿数据并存入list +// Integer page = archiveDetailService.selectChildByClo(archiveDetailVo); +// if (page != 0) { +// Archive_Detail_Vo archiveDetailVoNew = new Archive_Detail_Vo(); +// archiveDetailVoNew.setAssortId("1000"); +// archiveDetailVoNew.setAssortName("新生儿病历"); +// archiveDetailVoNew.setPrintFlag("0"); +// archiveDetailVoNew.setPageNum(page); +// archiveDetailVoNew.setAssortSort((short) 1000); +// list.add(archiveDetailVoNew); +// } +// return list; +// } //分段列表 List newList = archiveDetailService.selectByClo(archiveDetailVo); //查询新生儿数据并存入list @@ -374,7 +374,7 @@ public class inHospitalController { /** - * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名 + * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名 2023-11-20去签章注释 * * @param response * @param request @@ -386,21 +386,21 @@ public class inHospitalController { @ResponseBody @RequestMapping(value = "/getPdfToPdf") public String getPdfToPdf(HttpServletResponse response, HttpServletRequest request, String imgStr, String masterId, String flag) throws Exception { - //查询是否签章 - int caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1); - //如果存在记录查询新的签章文件表 - if (caMasterIdNum > 0) { - //组织分类id集合 - if (StringUtils.isNotBlank(imgStr)) { - String[] assortIds = StringUtils.split(imgStr, ","); - List srcFileList = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, flag, null); - if (!CollectionUtils.isEmpty(srcFileList)) { - //设置进缓存 - String key = SessionContant.setPdfUrl(masterId, imgStr, srcFileList, request); - return key; - } - } - } +// //查询是否签章 +// int caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1); +// //如果存在记录查询新的签章文件表 +// if (caMasterIdNum > 0) { +// //组织分类id集合 +// if (StringUtils.isNotBlank(imgStr)) { +// String[] assortIds = StringUtils.split(imgStr, ","); +// List srcFileList = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, flag, null); +// if (!CollectionUtils.isEmpty(srcFileList)) { +// //设置进缓存 +// String key = SessionContant.setPdfUrl(masterId, imgStr, srcFileList, request); +// return key; +// } +// } +// } //组织分类id集合 if (StringUtils.isNotBlank(imgStr)) { String[] assortIds = StringUtils.split(imgStr, ","); @@ -537,7 +537,7 @@ public class inHospitalController { } /** - * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名 + * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名 2023-11-20去掉签章注释 * * @param response * @param request @@ -545,35 +545,56 @@ public class inHospitalController { * @return * @throws Exception */ + @ResponseBody @RequestMapping(value = "/getPdfById") public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception { //组织分类id集合 - if (StringUtils.isNotBlank(idStr)) { + if(StringUtils.isNotBlank(idStr)){ List srcFileList = null; - List list = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, null, idStr); - //如果存在记录查询新的签章文件表 - if (list.size() > 0) { - if (!CollectionUtils.isEmpty(list)) { - //设置进缓存 - String key = SessionContant.setPdfUrl(idStr, idStr, list, request); - return key; - } - } else { - try { - srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null, null, null, idStr); - } catch (Exception e) { - e.printStackTrace(); - } - if (!CollectionUtils.isEmpty(srcFileList)) { - //设置进缓存 - String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request); - return key; - } + try { + srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null,null,null,idStr); + } catch (Exception e) { + e.printStackTrace(); + } + if(!CollectionUtils.isEmpty(srcFileList)){ + //设置进缓存 + String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request); + return key; } } return null; } + +// @ResponseBody +// @RequestMapping(value = "/getPdfById") +// public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception { +// //组织分类id集合 +// if (StringUtils.isNotBlank(idStr)) { +// List srcFileList = null; +// List list = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, null, idStr); +// //如果存在记录查询新的签章文件表 +// if (list.size() > 0) { +// if (!CollectionUtils.isEmpty(list)) { +// //设置进缓存 +// String key = SessionContant.setPdfUrl(idStr, idStr, list, request); +// return key; +// } +// } else { +// try { +// srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null, null, null, idStr); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// if (!CollectionUtils.isEmpty(srcFileList)) { +// //设置进缓存 +// String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request); +// return key; +// } +// } +// } +// return null; +// } /* public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception { request.setCharacterEncoding("utf-8"); @@ -1400,51 +1421,86 @@ public class inHospitalController { /** - * @Description: pdfStreamHandeler方法是加载pdf + * @Description: pdfStreamHandeler方法是加载pdf 2023-11-20注释判断签章 * @param: [request, response] * @return: void * @author 曾文和 * @createTime 2023/6/21 15:46 */ +// @RequestMapping(value = "/pdfStreamHandeler") +// public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response, String url) throws Exception { +// String filePath = request.getParameter("url"); +// int caMasterIdNum = 0; +// int archiveDetailNum = 0; +// String[] list = filePath.split("titleName="); +// String key = list[0].substring(0, list[0].length() - 1); +// //titleName为前端页面title显示的患者姓名，这里要去掉 +// List filePaths = SessionContant.getPdfUrl(key, request); +// if (CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)) { +// //终审页面没有缓存,key为Mid_文件id逗号隔开 +// String[] keyArr = StringUtils.split(key, "_"); +// String[] assortIds = StringUtils.split(keyArr[1], ","); +// String masterId = keyArr[0]; +// //查询是否签章 +// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { +// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 +// archiveDetailNum = archiveDetailCaCopyMapper.getArchiveDetailNum(masterId); +// } else { +// caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1); +// } +// //如果存在记录查询新的签章文件表 +// if (caMasterIdNum > 0 || archiveDetailNum > 0) { +// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { +// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 +// filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, "0", masterId); +// } else { +// //按文件分类id集合 +// filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, "0", null); +// } +// } else { +// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { +// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 +// filePaths = archiveDetailService.getPdfUrlByMasterOrId(null, null, "0", masterId); +// } else { +// //按文件分类id集合 +// filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds, masterId, "0", null); +// } +// } +// } +// if (null != filePaths && !filePaths.isEmpty()) { +// try { +// //合成PDF +// Jpg2PdfUtil.mulFile2One(response, filePaths, null); +// //清除session里的filePaths值 +// request.removeAttribute(key); +// } catch (Exception e) { +// ExceptionPrintUtil.printException(e); +// e.printStackTrace(); +// } +// } +// } + + + @RequestMapping(value = "/pdfStreamHandeler") - public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response, String url) throws Exception { + public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response,String url)throws Exception { String filePath = request.getParameter("url"); - int caMasterIdNum = 0; - int archiveDetailNum = 0; - String[] list = filePath.split("titleName="); - String key = list[0].substring(0, list[0].length() - 1); + String[] list=filePath.split("titleName="); + String key =list[0].substring(0,list[0].length()-1); //titleName为前端页面title显示的患者姓名，这里要去掉 List filePaths = SessionContant.getPdfUrl(key, request); - if (CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)) { + if(CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)){ //终审页面没有缓存,key为Mid_文件id逗号隔开 String[] keyArr = StringUtils.split(key, "_"); String[] assortIds = StringUtils.split(keyArr[1], ","); String masterId = keyArr[0]; - //查询是否签章 - if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { + if(masterId.substring(0,masterId.length()-1).equals(keyArr[1])){ //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 - archiveDetailNum = archiveDetailCaCopyMapper.getArchiveDetailNum(masterId); - } else { - caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1); - } - //如果存在记录查询新的签章文件表 - if (caMasterIdNum > 0 || archiveDetailNum > 0) { - if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { - //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 - filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, "0", masterId); - } else { - //按文件分类id集合 - filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, "0", null); - } - } else { - if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) { - //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号 - filePaths = archiveDetailService.getPdfUrlByMasterOrId(null, null, "0", masterId); - } else { - //按文件分类id集合 - filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds, masterId, "0", null); - } + filePaths = archiveDetailService.getPdfUrlByMasterOrId(null,null,"0",masterId); + }else{ + //按文件分类id集合 + filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds,masterId,"0",null); } } if (null != filePaths && !filePaths.isEmpty()) { diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index a956a88c..bcaed02a 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -96,10 +96,10 @@ public class signListController { @ResponseBody @RequestMapping(value = "/signList") - public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException { + public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit) throws UnsupportedEncodingException { response.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8"); - OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit); + OffsetLimitPage result = signListService.selectSignList(archiveFinalSignVo, offset, limit); return result; } @@ -169,18 +169,29 @@ public class signListController { String username = user.getUserName(); signList.setC1(username); signList.setC5("1"); - signList.setId(IDHelper.NewID()); - /*signList.setC2(master.get(0).getSigner()); - signList.setC3(master.get(0).getDeptName());*/ signList.setCreatedtime(sdf.format(new Date())); signList.setdTime(sdf.format(new Date())); signList.setT1(sdf.format(new Date())); Archive_Master archiveMaster = new Archive_Master(); archiveMaster.setIsSign(1); archiveMaster.setId(master.get(0).getId()); - int bol = archiveMasterService.updateByClo(archiveMaster); - int z = signListService.insertSignList(signList); + archiveMasterService.updateByClo(archiveMaster); + signListService.insertSignList(signList); + //增加最后签收记录 + ArchiveFinalSignVo archiveFinalSignVo=new ArchiveFinalSignVo(); + archiveFinalSignVo.setMasterId(master.get(0).getId()); + archiveFinalSignVo.setInpNo(master.get(0).getInpNo()); + archiveFinalSignVo.setVisitId(master.get(0).getVisitId()); + archiveFinalSignVo.setName(master.get(0).getName()); + archiveFinalSignVo.setDeptName(master.get(0).getDeptName()); + archiveFinalSignVo.setDischargeDateTime(master.get(0).getDischargeDateTime()); + archiveFinalSignVo.setSignStatic("1"); + archiveFinalSignVo.setIsscaned("1"); + archiveFinalSignVo.setOperateName(archiveMasterVo.getOperateName()); + archiveFinalSignVo.setDTime(sdf.format(new Date())); + archiveFinalSignVo.setSignName(username); + signListService.addArchiveFinalSign(archiveFinalSignVo); result = "签收成功"; } else { result = "该病历归档医生或护士尚未提交，是否强制签收？"; diff --git a/src/main/java/com/emr/dao/ArchiveDetailCaCopyMapper.java b/src/main/java/com/emr/dao/ArchiveDetailCaCopyMapper.java index de959934..eb604738 100644 --- a/src/main/java/com/emr/dao/ArchiveDetailCaCopyMapper.java +++ b/src/main/java/com/emr/dao/ArchiveDetailCaCopyMapper.java @@ -17,6 +17,9 @@ public interface ArchiveDetailCaCopyMapper { int addArchiveDetailCaCopyMapper(@Param("list") List list); + + int updateByMasterID(String masterID); + /** * 根据可选字段查询记录 * @param record diff --git a/src/main/java/com/emr/dao/ArchiveFinalSignMapper.java b/src/main/java/com/emr/dao/ArchiveFinalSignMapper.java new file mode 100644 index 00000000..a72eb496 --- /dev/null +++ b/src/main/java/com/emr/dao/ArchiveFinalSignMapper.java @@ -0,0 +1,46 @@ +package com.emr.dao; + +import com.emr.entity.ArchiveFinalSignVo; +import org.apache.ibatis.annotations.Param; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @InterfaceName ArchiveFinalSignMapper + * @Author linjj + * @Date 2023/11/20 15:37 + * @Version 1.0 + */ +public interface ArchiveFinalSignMapper { + + + /** + * @description: 新增数据 + * @params: archiveFinalSignVo + * @return: int + * @author linjj + * @date: 2023/11/20 15:41 + */ + int addFinalSign(ArchiveFinalSignVo archiveFinalSignVo); + + /** + * @description: 查询是否存在记录 + * @params: masterId + * @return: int + * @author linjj + * @date: 2023/11/20 15:41 + */ + int getIdNum(String masterId); + /** + * @description: 更新最后签收时间 + * @params: masterId + * @params: dTime + * @return: int + * @author linjj + * @date: 2023/11/20 15:44 + */ + int updateDTimeBymasterId(@Param("masterId") String masterId,@Param("dTime") String dTime,@Param("operateName") String operateName); + + List getArchiveFinalSignList(ArchiveFinalSignVo archiveFinalSignVo); +} diff --git a/src/main/java/com/emr/entity/ArchiveFinalSignVo.java b/src/main/java/com/emr/entity/ArchiveFinalSignVo.java new file mode 100644 index 00000000..42f5b1e3 --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveFinalSignVo.java @@ -0,0 +1,45 @@ +package com.emr.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName ArchiveFinalSignVo + * @Description 最后签收 + * @Author linjj + * @Date 2023/11/20 15:21 + * @Version 1.0 + */ +@Data +public class ArchiveFinalSignVo { + + //masterId + private String masterId; + //住院号 + private String inpNo; + //住院次数 + private String visitId; + //患者姓名 + private String name; + //出院科室 + private String deptName; + //出院日期 + private String dischargeDateTime; + //签收状态 + private String signStatic; + //是否有纸质病历送到病案室 + private String isscaned; + //最后签收时间 + private String dTime; + //纸质病历送达人 + private String operateName; + //签收人 + private String signName; + //签收次数 + private String num; + //开始时间 + private String startSignDate; + //结束时间 + private String endSignDate; +} diff --git a/src/main/java/com/emr/service/Sign_ListService.java b/src/main/java/com/emr/service/Sign_ListService.java index 64d70d18..c58ab4cc 100644 --- a/src/main/java/com/emr/service/Sign_ListService.java +++ b/src/main/java/com/emr/service/Sign_ListService.java @@ -22,7 +22,7 @@ public interface Sign_ListService { * @param * @return */ - OffsetLimitPage selectSignList(Sign_List_Vo signListVo, Integer offset, Integer limit); + OffsetLimitPage selectSignList(ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit); /** * 根据字段查询Vo记录 * @param @@ -89,6 +89,15 @@ public interface Sign_ListService { + /** + * @description: 添加最后签收记录 + * @author linjj + * @date: 2023/11/20 15:23 + */ + + int addArchiveFinalSign(ArchiveFinalSignVo archiveFinalSignVo); + + } diff --git a/src/main/java/com/emr/service/ipml/CaSignServiceImpl.java b/src/main/java/com/emr/service/ipml/CaSignServiceImpl.java index 4cd2c0e9..f8f91b67 100644 --- a/src/main/java/com/emr/service/ipml/CaSignServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/CaSignServiceImpl.java @@ -118,6 +118,11 @@ public class CaSignServiceImpl { } //添加签章记录 updateCaFileState(idList, failIdList, masterId); + //判断是否存在，存在在先删除 + int caMasterId = caSignatureMapper.getCaMasterId(masterId, 1); + if (caMasterId>0){ + archiveDetailCaCopyMapper.updateByMasterID(masterId); + } //签章完后保存新的文件表 archiveDetailCaCopyMapper.addArchiveDetailCaCopyMapper(list); //签章完成后保存状态 diff --git a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java index d8eac789..02e34a19 100644 --- a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java @@ -7,6 +7,8 @@ package com.emr.service.ipml; import com.alibaba.fastjson.JSONArray; +import com.emr.dao.ArchiveFinalSignMapper; +import com.emr.dao.Archive_MasterMapper; import com.emr.dao.Sign_ListMapper; import com.emr.entity.*; import com.emr.service.Emr_DictionaryService; @@ -35,11 +37,15 @@ public class Sign_ListServiceImpl implements Sign_ListService { @Autowired private PowerUserService powerUserService; + @Autowired + private ArchiveFinalSignMapper archiveFinalSignMapper; + @Override - public OffsetLimitPage selectSignList(Sign_List_Vo signListVo, Integer offset, Integer limit) { + public OffsetLimitPage selectSignList(ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list = signListMapper.selectSignList(signListVo); + List list = archiveFinalSignMapper.getArchiveFinalSignList(archiveFinalSignVo); +// List list = signListMapper.selectSignList(signListVo); if (list != null && list.size() > 0) { //获取科室列表 Emr_Dictionary dic = new Emr_Dictionary(); @@ -48,17 +54,12 @@ public class Sign_ListServiceImpl implements Sign_ListService { List dicList = emrDictionaryService.dicByTypeCode(dic); //转换科室 Map codeMap = ListUtil.toMap(dicList, Emr_Dictionary::getCode); - Setters.instance().list(list).cycleSetProperties(p -> { + Setters.instance().list(list).cycleSetProperties(p -> { String deptCode = p.getDeptName(); - String deptAdmissionCode = p.getDeptAdmissionTo(); - if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){ + if (StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)) { String deptName = codeMap.get(deptCode).getName(); p.setDeptName(deptName); } - if(StringUtils.isNotBlank(deptAdmissionCode) && codeMap.containsKey(deptAdmissionCode)){ - String deptAdmissionTo = codeMap.get(deptAdmissionCode).getName(); - p.setDeptAdmissionTo(deptAdmissionTo); - } }); //查询用户集合 JSONArray powerUsers = powerUserService.getPowerUserList("1"); @@ -68,15 +69,15 @@ public class Sign_ListServiceImpl implements Sign_ListService { powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class); } //遍历赋值 - for (Sign_List_Vo sign_list_vo : list) { + for (ArchiveFinalSignVo sign_list_vo : list) { if (null != powerUserList) { //获取签收人 - String singer = sign_list_vo.getC1(); + String singer = sign_list_vo.getSignName(); //遍历匹配工号赋值姓名 for (Power_User_Dto powerUserDto : powerUserList) { String name = powerUserDto.getName(); if (StringUtils.isNotBlank(singer) && powerUserDto.getUserName().equals(singer)) { - sign_list_vo.setC1(name); + sign_list_vo.setSignName(name); break; } } @@ -84,15 +85,15 @@ public class Sign_ListServiceImpl implements Sign_ListService { } //查询签收次数 //masterIds集合 - List masterIds = ListUtil.distinctSelect(list, Sign_List_Vo::getMasterID); + List masterIds = ListUtil.distinctSelect(list, ArchiveFinalSignVo::getMasterId); //转成逗号拼接 String ids = String.join(",", masterIds); List signNum = signListMapper.getSignNum(ids); //遍历签收次数 Map signNumMap = ListUtil.toMap(signNum, Sign_List_Vo::getMasterID); - Setters.instance().list(list).cycleSetProperties(p -> { - String masterID = p.getMasterID(); - if (signNumMap.containsKey(masterID)){ + Setters.instance().list(list).cycleSetProperties(p -> { + String masterID = p.getMasterId(); + if (signNumMap.containsKey(masterID)) { String num = signNumMap.get(masterID).getNum(); p.setNum(num); } @@ -229,6 +230,22 @@ public class Sign_ListServiceImpl implements Sign_ListService { return list; } + @Override + public int addArchiveFinalSign(ArchiveFinalSignVo archiveFinalSignVo) { + //判断是否存在存在则更新最后时间 + String masterId = archiveFinalSignVo.getMasterId(); + int idNum = archiveFinalSignMapper.getIdNum(masterId); + //等于0新增 + if (idNum == 0) { + return archiveFinalSignMapper.addFinalSign(archiveFinalSignVo); + } + //大于0更新最后签收时间 + if (idNum > 0) { + return archiveFinalSignMapper.updateDTimeBymasterId(masterId, archiveFinalSignVo.getDTime(),archiveFinalSignVo.getOperateName()); + } + return 0; + } + } diff --git a/src/main/resources/mapper/ArchiveDetailCaCopyMapper.xml b/src/main/resources/mapper/ArchiveDetailCaCopyMapper.xml index 3c3f37c7..51e3fd3b 100644 --- a/src/main/resources/mapper/ArchiveDetailCaCopyMapper.xml +++ b/src/main/resources/mapper/ArchiveDetailCaCopyMapper.xml @@ -39,6 +39,9 @@ ,#{item.pageCount}) + + delete FROM Archive_Detail_CA_COPY where MasterID=#{masterID} + + select count(*) + from Archive_Final_Sign + where master_id = #{masterId} + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp index 81e807a5..aa63eeb3 100644 --- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp +++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp @@ -3083,31 +3083,28 @@ limit = currPageSize; this.pageSize = currPageSize; } - // var url = window.location.href; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // if (deptName != null && deptName != '') { - // deptName += "," + $("#deptName").val(); - // } else { - // deptName = $("#deptName").val(); - // } - // + var url = window.location.href; + var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); + if (deptName != null && deptName != '') { + deptName += "," + $("#deptName").val(); + } else { + deptName = $("#deptName").val(); + } + var temp = { limit: limit, //页面大小 offset: offset, //页码 order: params.order, //排位命令（desc，asc） - //id: $("#id").val(), - idNo: $("#idNo").val(), inpNo: "" + $("#inpNo").val(), visitId: "" + $("#visitId").val(), //archivestate: "" + $("#archivestate").val(), name: "" + $("#name").val(), - c1: "" + $("#signer").val(), + signName: "" + $("#signer").val(), startSignDate: $("#startSignDate").val(), endSignDate: $("#endSignDate").val(), - deptName: "" + $("#deptName").val(), - operateName1: "" + $("#operateName1").val(), - + deptName: deptName, + operateName: "" + $("#operateName1").val(), }; return temp; }, @@ -3122,9 +3119,9 @@ align: 'center', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3137,9 +3134,9 @@ valign: 'middle', visible: false, cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3151,9 +3148,9 @@ align: 'left', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3165,9 +3162,9 @@ align: 'center', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3179,9 +3176,9 @@ align: 'left', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3194,9 +3191,9 @@ align: 'left', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3207,9 +3204,9 @@ field: 'dischargeDateTime', align: 'center', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3217,7 +3214,7 @@ }, { title: '签收状态', - field: 'c5', + field: 'signStatic', align: 'left', formatter: function (value, row, index) { //1已签收 2未签收 @@ -3243,9 +3240,9 @@ return a; }, cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3281,9 +3278,9 @@ return a; }, cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3291,12 +3288,12 @@ }, { title: '签收人', - field: 'c1', + field: 'signName', align: 'left', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3304,7 +3301,7 @@ }, { title: '签收日期', - field: 'dTime', + field: 'dtime', align: 'center', formatter: function (value, row, index) { if (value != null && value != "") { @@ -3313,9 +3310,9 @@ return value; }, cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3327,9 +3324,9 @@ align: 'center', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}}; @@ -3341,9 +3338,9 @@ align: 'center', valign: 'middle', cellStyle: function (value, row, index) { - var c5 = row.c5; + var signStatic = row.signStatic; var isscaned = row.isscaned; - if (c5 == 1 && isscaned == 0) { + if (signStatic == 1 && isscaned == 0) { return {css: {"background-color": "#3B8CFF"}}; } return {css: {}};