From cce7c045154232914d4d51e3311b4e67d6dde9f0 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Mon, 14 Mar 2022 20:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=B3=BB=E7=BB=9F=E7=BB=88?= =?UTF-8?q?=E5=AE=A1=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=98=AF=E5=90=A6=E6=9C=89=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E3=80=81=E6=80=A5=E8=AF=8A=E7=95=99=E8=A7=82=E7=97=85=E5=8E=86?= =?UTF-8?q?=E5=81=9A=E5=BD=92=E6=A1=A3=E6=8A=A5=E8=A1=A8=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=B3=BB=E7=BB=9F=E5=BD=92=E6=A1=A3=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=9B=B8=E5=90=8C=E3=80=81=E6=80=A5=E8=AF=8A=E7=95=99?= =?UTF-8?q?=E8=A7=82=E7=97=85=E5=8E=86=E9=80=80=E5=9B=9E=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8F=91=E9=80=80=E5=9B=9E=E5=8E=9F=E5=9B=A0=E7=BB=99?= =?UTF-8?q?=E7=95=99=E8=A7=82=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/VCountController.java | 6 ++++ .../controller/beHospitaledController.java | 4 +-- .../emr/controller/lastVerifyController.java | 10 +++--- .../com/emr/entity/Archive_Master_Vo.java | 10 ++++++ src/main/java/com/emr/entity/V_Count.java | 11 +++++++ .../emr/service/Archive_MasterService.java | 2 +- .../ipml/Archive_MasterServiceImpl.java | 19 +++++++++-- .../resources/mapper/Archive_MasterMapper.xml | 14 ++++++-- .../mapper/Emr_Fault_DetailMapper.xml | 7 +++- src/main/resources/mapper/V_CountMapper.xml | 16 ++++++++++ .../views/lastVerifyDir/lastVerifyList.jsp | 32 ++++++++++++++++--- .../WEB-INF/views/vCountDir/vCountList.jsp | 10 +++--- 12 files changed, 119 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 3725db51..12bf269c 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -36,6 +36,12 @@ public class VCountController { @RequestMapping(value = "/vCounts") public String faults(Model model){ + model.addAttribute("isLg",0); + return "vCountDir/vCountList"; + } + @RequestMapping(value = "/vCountsLg") + public String faultsLg(Model model){ + model.addAttribute("isLg",1); return "vCountDir/vCountList"; } diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 05b49cd0..bc817c09 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -74,8 +74,8 @@ public class beHospitaledController { @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); - String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印","状态"}; - String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtNurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum","archivestate"}; + String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印","是否缺陷","状态"}; + String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtNurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum","isFault","archivestate"}; //文件名 String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据beHospList diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 167457ff..3ad36753 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -123,18 +123,18 @@ public class lastVerifyController { String inpatientNo = archiveMaster.getInpNo(); //获取留观标识，“LG” String lgFlag = inpatientNo.substring(0,2); + //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示 + Emr_Fault_Detail entityFault=new Emr_Fault_Detail(); + entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); + List list=emrFaultDetailService.selectByArchiveId(entityFault); //退回给emr if(!"LG".equals(lgFlag)) { - String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request); + String result = archiveMasterService.returnEmr(list,emrFaultDetail, archiveMaster, request); if (StringUtils.isNotBlank(result)) { return result; } } archiveMaster.setArchivestate(emrFaultDetail.getState()); - //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示 - Emr_Fault_Detail entityFault=new Emr_Fault_Detail(); - entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); - List list=emrFaultDetailService.selectByArchiveId(entityFault); int doctorFlagNum=0; int nurseFlagNum=0; if(list!=null && list.size()>0){ diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index d135240c..22f00ea1 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -178,6 +178,16 @@ public class Archive_Master_Vo { //退回急诊室总数 private Integer backNum; + private String isFault; + + public String getIsFault() { + return isFault; + } + + public void setIsFault(String isFault) { + this.isFault = isFault; + } + public String getFaultDoctorNum() { return faultDoctorNum; } diff --git a/src/main/java/com/emr/entity/V_Count.java b/src/main/java/com/emr/entity/V_Count.java index 7ec725dd..0ebf3ede 100644 --- a/src/main/java/com/emr/entity/V_Count.java +++ b/src/main/java/com/emr/entity/V_Count.java @@ -59,6 +59,17 @@ public class V_Count { //及时率合计 private String inTimeRate; + //是否是查留观 + private Integer isLg; + + public Integer getIsLg() { + return isLg; + } + + public void setIsLg(Integer isLg) { + this.isLg = isLg; + } + public Integer getIsOutNum() { return isOutNum; } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index d7a72846..d90ea136 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -263,7 +263,7 @@ public interface Archive_MasterService { */ List selectStorageByCol(Archive_Master_Vo record); - String returnEmr(Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request); + String returnEmr( List list,Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request); /** * 复印记录明细 diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 64df5750..4a69d0ab 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -594,13 +594,26 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { * @param request */ @Override - public String returnEmr(Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request) { + public String returnEmr(List list,Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request) { String returnMsg = null; //获取退回标识，0打回首页；1打回医生；2打回护士 String returnFlag = emrFaultDetail.getDealFlag(); if(StringUtils.isNotBlank(returnFlag)) { //获取打回原因 - String returnContent = emrFaultDetail.getDealPerson(); + StringBuilder returnContent = new StringBuilder(); + if(!CollectionUtils.isEmpty(list)){ + for(Emr_Fault_Detail obj : list){ + if(StringUtils.isNotBlank(returnContent)){ + returnContent.append(","); + } + returnContent.append(obj.getBackContent()); + String content = obj.getContent(); + if(StringUtils.isBlank(content)){ + content = "无"; + } + returnContent.append(":").append(content); + } + } //组织打回参数值 /*{ "INP_NO": "1356601", @@ -623,7 +636,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { map.put("userid",user.getUserId().toString()); map.put("username",user.getUserName()); map.put("code",archiveMaster.getDeptName()); - map.put("REASON",returnContent); + map.put("REASON",returnContent.toString()); //定义请求信息记录表 DocusRequestInfo docusRequestInfo = new DocusRequestInfo(); docusRequestInfo.setCode("return"); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 62f3520e..09ef72dd 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -402,11 +402,11 @@ +
+ + +
<%--
--%> <%----%> <%--
@@ -224,6 +225,7 @@ entity.deptCode = $("#deptName").val(); entity.startDate = $("#startDate").val(); entity.endDate = $("#endDate").val(); + entity.isLg = $("#isLg").val(); $.ajax({ url: "${path}/vCount/vCountNumList", type: "POST", @@ -895,8 +897,8 @@ startDate: $("#startDate").val(), endDate: $("#endDate").val(), timeOutNum: $("#timeOutNum").val(), - overdueDays: $("#overdueDays").val() - + overdueDays: $("#overdueDays").val(), + isLg:$("#isLg").val() }; return temp; }, @@ -1142,9 +1144,9 @@ var startDateTo = $("#startDate").val(); var endDateTo = $("#endDate").val(); var archivestate="归档中,初审,复审退回,提交,主任退回"; - + var isLg = $("#isLg").val(); window.location.href = "${path}/vCount/exportExcel2?deptName=" + deptName + "&startDateTo=" + startDateTo - + "&endDateTo=" + endDateTo+ "&archivestate=" + archivestate; + + "&endDateTo=" + endDateTo+ "&archivestate=" + archivestate + "&isLg=" + isLg; });