From 9a01fce5768a868a33ecde1e4fb898bfcf16eb2c Mon Sep 17 00:00:00 2001 From: hujl Date: Tue, 21 Dec 2021 15:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D=E5=B0=81?= =?UTF-8?q?=E8=A3=85=E5=8F=8A=E4=B8=8D=E5=8F=AF=E9=87=8D=E5=A4=8D=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/storageController.java | 91 ++++++++++++------- .../MedicalRecordStorage.jsp | 4 +- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/emr/controller/storageController.java b/src/main/java/com/emr/controller/storageController.java index 2c41c8c1..38d750d4 100644 --- a/src/main/java/com/emr/controller/storageController.java +++ b/src/main/java/com/emr/controller/storageController.java @@ -10,6 +10,7 @@ import com.emr.annotation.OptionalLog; import com.emr.entity.*; import com.emr.service.*; import com.emr.util.ThreadExcelUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; @@ -99,41 +100,61 @@ public class storageController { } response.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8"); - Subject currentUser = SecurityUtils.getSubject(); - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - String handleName = user.getUserPosition();//姓名 - String username = user.getUserName();//获取前面登录的用户名 - emrFaultDetail.setUpdater(username); - SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowTime = format1.format(new Date()); - emrFaultDetail.setUpdateTime(nowTime); - - Archive_Master archiveMaster = new Archive_Master(); - Archive_Master_Following archiveMasterFollowing = new Archive_Master_Following(); - archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); - archiveMaster.setArchivestate(emrFaultDetail.getArchiveState()); - archiveMaster.setCmtNurse(1); - archiveMaster.setCmtDoctor(1); - int bol = archiveMasterService.updateByClo(archiveMaster); - if (bol == 1) { - if(archiveMaster.getArchivestate().equals("已封存")){ - archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); - archiveMasterFollowing.setFollowingContent("病案封存"); - archiveMasterFollowing.setFollowingType("11"); - archiveMasterFollowing.setHandleTime(nowTime); - archiveMasterFollowing.setHandleId(username); - archiveMasterFollowing.setHandleName(handleName); - archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); - bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); - }else if (archiveMaster.getArchivestate().equals("已归档")){ - archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); - archiveMasterFollowing.setFollowingContent("病案取消封存"); - archiveMasterFollowing.setFollowingType("12"); - archiveMasterFollowing.setHandleTime(nowTime); - archiveMasterFollowing.setHandleId(username); - archiveMasterFollowing.setHandleName(handleName); - archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); - bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); + int bol =0; + String result=""; + //判断是否已经封存 + if(StringUtils.isNotBlank(emrFaultDetail.getArchiveDetailId())) { + //判断病案是否已经封存 + Archive_Master_Following followingLastInfo = new Archive_Master_Following(); + if(emrFaultDetail.getArchiveState().equals("已封存")){ + followingLastInfo.setFollowingType("11"); + result="请不要重复封装!"; + }else{ + followingLastInfo.setFollowingType("12"); + result="请不要重复取消封装!"; + } + followingLastInfo.setMasterId(emrFaultDetail.getArchiveDetailId()); + List followingLastList = archiveMasterFollowingService.selLastByType(followingLastInfo); + if (followingLastList == null || followingLastList.size() <= 0) { + Subject currentUser = SecurityUtils.getSubject(); + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + String handleName = user.getUserPosition();//姓名 + String username = user.getUserName();//获取前面登录的用户名 + emrFaultDetail.setUpdater(username); + SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = format1.format(new Date()); + emrFaultDetail.setUpdateTime(nowTime); + + Archive_Master archiveMaster = new Archive_Master(); + Archive_Master_Following archiveMasterFollowing = new Archive_Master_Following(); + archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); + archiveMaster.setArchivestate(emrFaultDetail.getArchiveState()); + archiveMaster.setCmtNurse(1); + archiveMaster.setCmtDoctor(1); + bol = archiveMasterService.updateByClo(archiveMaster); + if (bol == 1) { + if(archiveMaster.getArchivestate().equals("已封存")){ + archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); + archiveMasterFollowing.setFollowingContent("病案封存"); + archiveMasterFollowing.setFollowingType("11"); + archiveMasterFollowing.setHandleTime(nowTime); + archiveMasterFollowing.setHandleId(username); + archiveMasterFollowing.setHandleName(handleName); + archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); + bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); + }else if (archiveMaster.getArchivestate().equals("已归档")){ + archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); + archiveMasterFollowing.setFollowingContent("病案取消封存"); + archiveMasterFollowing.setFollowingType("12"); + archiveMasterFollowing.setHandleTime(nowTime); + archiveMasterFollowing.setHandleId(username); + archiveMasterFollowing.setHandleName(handleName); + archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); + bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); + } + } + }else{ + return result; } } return bol + ""; diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index fdc9ac5b..07ede5e6 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -665,7 +665,7 @@ if (result > 0) { toastr.success("取消封存成功!"); } else { - toastr.error("取消封存失败!"); + toastr.warning(result); } }, error: function () { //刷新 @@ -692,7 +692,7 @@ if (result == '1') { toastr.success("确认封存成功!"); } else { - toastr.error(result); + toastr.warning(result); } }, error: function () { //刷新