From 6e2348ea9127af3aed65db148bbc62d33a4aa938 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 5 Jan 2022 14:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=BB=E9=99=A4=E7=95=99?= =?UTF-8?q?=E8=A7=82=E4=B8=8D=E7=94=A8=E5=88=86=E6=A8=A1=E5=9D=97=E9=80=80?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/lastVerifyController.java | 14 ++++--- .../com/emr/controller/pdfController.java | 9 ++++- .../WEB-INF/views/pdfDir/pdfLastDir.jsp | 38 ++++++++++--------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 53768ea1..fe6531e6 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -120,10 +120,15 @@ public class lastVerifyController { //修改病案归档状态：复审退回或主任退回 Archive_Master archiveMaster = archiveMasterService.selectById(emrFaultDetail.getArchiveDetailId()); if(archiveMaster!=null) { + String inpatientNo = archiveMaster.getInpNo(); + //获取留观标识，“LG” + String lgFlag = inpatientNo.substring(0,2); //退回给emr - String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request); - if(StringUtils.isNotBlank(result)){ - return result; + if(!"LG".equals(lgFlag)) { + String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request); + if (StringUtils.isNotBlank(result)) { + return result; + } } archiveMaster.setArchivestate(emrFaultDetail.getState()); //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示 @@ -192,9 +197,6 @@ public class lastVerifyController { archiveMaster.setCmtNurse(1); } bol = archiveMasterService.updateByClo(archiveMaster); - String inpatientNo = archiveMaster.getInpNo(); - //获取留观标识，“LG” - String lgFlag = inpatientNo.substring(0,2); if(!"LG".equals(lgFlag)) { if (emrFaultDetail.getState().equals("复审退回")) { //2021-01-30 following表中添加病案室退回操作记录 diff --git a/src/main/java/com/emr/controller/pdfController.java b/src/main/java/com/emr/controller/pdfController.java index 8b6ffd91..78bb7988 100644 --- a/src/main/java/com/emr/controller/pdfController.java +++ b/src/main/java/com/emr/controller/pdfController.java @@ -6,7 +6,10 @@ */ package com.emr.controller; +import com.emr.dao.Archive_MasterMapper; +import com.emr.entity.Archive_Master; import com.emr.entity.Emr_Fault_Detail; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,7 +20,8 @@ import javax.servlet.http.HttpServletResponse; @Controller @RequestMapping("pdfCtr") public class pdfController { - + @Autowired + private Archive_MasterMapper archiveMasterMapper; @RequestMapping(value = "/pdfDir") public String pdfDir(HttpServletRequest req, Emr_Fault_Detail emrFaultDetail) { String archiveDetailId= emrFaultDetail.getArchiveDetailId(); @@ -31,7 +35,10 @@ public class pdfController { @RequestMapping(value = "/pdfLastDir") public String pdfLastDir(HttpServletRequest req, Emr_Fault_Detail emrFaultDetail) { String archiveDetailId = emrFaultDetail.getArchiveDetailId(); + //根据masterId查看master + Archive_Master archiveMaster = archiveMasterMapper.selectById(archiveDetailId); //req.setAttribute("aa", "cccc"); + req.setAttribute("inpNo", archiveMaster.getInpNo()); req.setAttribute("archiveDetailId", archiveDetailId); req.setAttribute("type", req.getAttribute("type")); //req.setAttribute("roleVal","1"+ emrFaultDetail.getBackFlag()); diff --git a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp index bc5b4e6f..c12cf505 100644 --- a/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp +++ b/src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp @@ -299,25 +299,27 @@ 内容： -
-
- 请选择电子病历可修改部分： -
-
- -
-
-
-
- 退回电子病历原因： +
-1}">none"> +
+
+ 请选择电子病历可修改部分： +
+
+ +
-
- +
+
+ 退回电子病历原因： +
+
+ +