From 05f24abde114d592e24277c2043245d887043102 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 24 Aug 2021 08:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E5=AE=A1=E6=89=B9=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=A7=91=E5=AE=A4=EF=BC=8C=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E8=B0=83=E9=98=85=E5=A2=9E=E5=8A=A0=E7=97=85=E6=A1=88?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=BD=8F=E9=99=A2=E6=AC=A1=E6=95=B0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FontShowRecordController.java | 40 +++++++++++++++++-- .../emrApprove/ApproveController.java | 6 ++- .../emr/entity/approve/Emr_Apply_Approve.java | 10 +++++ src/main/java/com/emr/vo/User.java | 10 +++++ src/main/resources/mapper/CommomMapper.xml | 18 +++++---- .../approve/Emr_Apply_ApproveMapper.xml | 1 + .../approveManageList174.jsp | 2 +- .../WEB-INF/views/font/showRecordFont.jsp | 2 +- .../approveManageList/approveManageList174.js | 4 ++ .../webapp/static/js/font/showRecordFont.js | 1 + 10 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index 87ae204..73d74cd 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -287,6 +288,29 @@ public class FontShowRecordController { } } + /** + * 病案主键为空，通过病案号或与住院次数组合查询对应的病案主键 + * @param patientId + * @param inpatientNo + * @param admissTimes + * @return + */ + private String getPatientIdByInpatientNoAndAdmissTimes(String patientId,String inpatientNo,Short admissTimes,Model model){ + if(StringUtils.isBlank(patientId)){ + List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(admissTimes, inpatientNo, null, null, null); + if(!CollectionUtils.isEmpty(patientIdList)){ + if(patientIdList.size() > 1){ + return "查询到数据不只一个"; + } + patientId = patientIdList.get(0); + }else{ + return "查询不到该数据"; + } + } + model.addAttribute("patientId", patientId); + return null; + } + /**接口 * @MethodName: showRecordFont * @Description: 跳转到档案预览 @@ -300,8 +324,12 @@ public class FontShowRecordController { * @Version: 1.0 */ @RequestMapping("showRecordFont") - public String showRecordFont(String patientId, Model model, HttpServletRequest request) { - model.addAttribute("patientId", patientId); + public String showRecordFont(String patientId,String inpatientNo,Short admissTimes, Model model, HttpServletRequest request) { + //病案主键为空，通过病案号或与住院次数组合查询对应的病案主键 + String msg = getPatientIdByInpatientNoAndAdmissTimes(patientId, inpatientNo, admissTimes,model); + if(StringUtils.isNotBlank(msg)){ + return msg; + } //加载登陆者 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); if (null != user) { @@ -328,8 +356,12 @@ public class FontShowRecordController { * @return */ @RequestMapping("showRecordFontSouth") - public String showRecordFontSouth(String patientId, Model model, HttpServletRequest request) { - model.addAttribute("patientId", patientId); + public String showRecordFontSouth(String patientId,String inpatientNo,Short admissTimes, Model model, HttpServletRequest request) { + //病案主键为空，通过病案号或与住院次数组合查询对应的病案主键 + String msg = getPatientIdByInpatientNoAndAdmissTimes(patientId, inpatientNo, admissTimes,model); + if(StringUtils.isNotBlank(msg)){ + return msg; + } try { List printCount = printOrDownLoadInfoService.getPrintCount(patientId); if (null != printCount && !printCount.isEmpty()) { diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java index dbc0178..cf2d544 100644 --- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java +++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java @@ -747,6 +747,7 @@ public class ApproveController { String name = user1.getName(); if(StringUtils.isNotBlank(applyer) && user1.getUserName().equals(applyer)){ obj.setApplyer(name); + obj.setDeptName(user1.getDeptName()); } if(StringUtils.isNotBlank(approver) && user1.getUserName().equals(approver)){ obj.setApprover(name); @@ -843,8 +844,8 @@ public class ApproveController { @ResponseBody public void exportExcelApproveList(HttpServletResponse response, Emr_Apply_Approve approve, String startTime1, String endTime1,String startTime2, String endTime2,HttpServletRequest request,String checks) throws Exception{ - String tableThNames = "申请人,申请日期,有效日期,有效天数,姓名,病案号,住院次数,出院日期,申请原因,申请类型,审批状态,审批时间,审批人,批注内容"; - String fieldCns = "applyer,applyTime,effeTime,effeDays,name,inpatientNo,admissTimes,disTime,applyReason,applyType,approveState,approveTime,approver,approveNotes"; + String tableThNames = "申请人,申请科室,申请日期,有效日期,有效天数,姓名,病案号,住院次数,出院日期,申请原因,申请类型,审批状态,审批时间,审批人,批注内容"; + String fieldCns = "applyer,deptName,applyTime,effeTime,effeDays,name,inpatientNo,admissTimes,disTime,applyReason,applyType,approveState,approveTime,approver,approveNotes"; List approves = new ArrayList<>(); //匹配权限 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); @@ -875,6 +876,7 @@ public class ApproveController { String name = user1.getName(); if(StringUtils.isNotBlank(applyer) && user1.getUserName().equals(applyer)){ obj.setApplyer(name); + obj.setDeptName(user1.getDeptName()); } if(StringUtils.isNotBlank(approver) && user1.getUserName().equals(approver)){ obj.setApprover(name); diff --git a/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java b/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java index 07e1eb9..d16b4e2 100644 --- a/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java +++ b/src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java @@ -53,6 +53,16 @@ public class Emr_Apply_Approve { private String disTime; + private String deptName; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + public String getDisTime() { return disTime; } diff --git a/src/main/java/com/emr/vo/User.java b/src/main/java/com/emr/vo/User.java index 10277dd..75eeadb 100644 --- a/src/main/java/com/emr/vo/User.java +++ b/src/main/java/com/emr/vo/User.java @@ -15,6 +15,16 @@ public class User { private String deptCode; + private String deptName; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + public String getDeptCode() { return deptCode; } diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index 4b695f3..427b759 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -117,13 +117,6 @@ WHERE patient_id in (${patientIds}) - - + +