diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index d368c804..777878e7 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -80,14 +80,16 @@ public class MedicalRecallController { //替换科室 for (int k = 0; k < dicList.size(); k++) { String deptName = list.get(i).getDeptName(); + String dept2 = list.get(i).getDeptAdmissionTo(); if (deptName.equals(dicList.get(k).getCode())) { //出院科室 deptName = deptName.replace(deptName, dicList.get(k).getName()); list.get(i).setDeptName(deptName); + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { //入院科室dept_admission_to - deptName = list.get(i).getDeptAdmissionTo(); - deptName = deptName.replace(deptName, dicList.get(k).getName()); - list.get(i).setDeptAdmissionTo(deptName); + dept2 = dept2.replace(dept2, dicList.get(k).getName()); + list.get(i).setDeptAdmissionTo(dept2); } } } @@ -101,24 +103,18 @@ public class MedicalRecallController { @RequestMapping(value = "/updateState") public int updateState(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException { response.setCharacterEncoding("utf-8"); - request.setCharacterEncoding("utf-8"); + //request.setCharacterEncoding("utf-8"); Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 - //2021-01-30 - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - String handleName = user.getUserPosition();//姓名 - //2021-01-30 - - emrFaultDetail.setUpdater(username); SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String nowTime = format1.format(new Date()); - + emrFaultDetail.setUpdater(username); emrFaultDetail.setUpdateTime(nowTime); if(emrFaultDetail.getRecallReason()==null ||emrFaultDetail.getRecallReason()==""){ - emrFaultDetail.setRecallReason(recallReason); + //医院需要这份病案 + emrFaultDetail.setRecallReason( new String(recallReason.getBytes("iso-8859-1"),"utf-8")); } - //emrFaultDetail.setRecallReason("医院需要这份病案"); Archive_Master archiveMaster=new Archive_Master(); archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); archiveMaster.setCmtNurse(1); @@ -137,6 +133,9 @@ public class MedicalRecallController { bol = emrFaultDetailService.insertSel(emrFaultDetail); } + //2021-01-30 初审成功日志 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + String handleName = user.getUserPosition();//姓名 Archive_Master_Following archive_master_following = new Archive_Master_Following(); archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); //following表中添加病案室审核操作记录 diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 77079e29..6db7ceff 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -87,12 +87,12 @@ public class VCountController { String deptName = list.get(i).getDeptName(); //入院科室dept_admission_to String dept2 = list.get(i).getDeptAdmissionTo(); - if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) { + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { //出院科室 - if(deptName != null) { - deptName = deptName.replace(deptName, dicList.get(k).getName()); - list.get(i).setDeptName(deptName); - } + deptName = deptName.replace(deptName, dicList.get(k).getName()); + list.get(i).setDeptName(deptName); + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { dept2 = dept2.replace(dept2, dicList.get(k).getName()); list.get(i).setDeptAdmissionTo(dept2); } @@ -122,13 +122,13 @@ public class VCountController { String deptName = list.get(i).getDeptName(); //入院科室dept_admission_to String dept2 = list.get(i).getDeptAdmissionTo(); - - if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) { + if (deptName != null && deptName.equals(dicList.get(k).getCode())) { //出院科室 - if(deptName != null) { - deptName = deptName.replace(deptName, dicList.get(k).getName()); - list.get(i).setDeptName(deptName); - } + deptName = deptName.replace(deptName, dicList.get(k).getName()); + list.get(i).setDeptName(deptName); + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())){ + //入院科室dept_admission_to dept2 = dept2.replace(dept2, dicList.get(k).getName()); list.get(i).setDeptAdmissionTo(dept2); } diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 2c38f323..24cae7dc 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -153,6 +153,19 @@ public class beHospitaledController { emrFaultDetail.setCreateTime(nowTime); emrFaultDetail.setState("未召回"); bol = emrFaultDetailService.insertSel(emrFaultDetail); + + //初审成功日志 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + String handleName = user.getUserPosition();//姓名 + Archive_Master_Following archive_master_following = new Archive_Master_Following(); + archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); + //following表中添加科主任审核操作记录 + archive_master_following.setFollowingType("5"); + archive_master_following.setFollowingContent("科主任审核"); + archive_master_following.setHandleTime(nowTime); + archive_master_following.setHandleId(username); + archive_master_following.setHandleName(handleName); + archive_master_followingService.insertSelective(archive_master_following); } }else{ //修改病案归档完整内容Lockinfo @@ -168,19 +181,6 @@ public class beHospitaledController { archiveMasterService.updateByClo(archiveMaster); } - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - String handleName = user.getUserPosition();//姓名 - - Archive_Master_Following archive_master_following = new Archive_Master_Following(); - archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); - //following表中添加科主任审核操作记录 - archive_master_following.setFollowingType("5"); - archive_master_following.setFollowingContent("科主任审核"); - archive_master_following.setHandleTime(nowTime); - archive_master_following.setHandleId(username); - archive_master_following.setHandleName(handleName); - archive_master_followingService.insertSelective(archive_master_following); - return result; } @@ -204,19 +204,31 @@ public class beHospitaledController { archiveMaster.setFirstInstance(username); archiveMaster.setLockinfo(emrFaultDetail.getContent()); int bol = archiveMasterService.updateByClo(archiveMaster); - - emrFaultDetail.setCreater(username); - emrFaultDetail.setCreateTime(nowTime); - emrFaultDetail.setArchiveState("初审"); - bol = emrFaultDetailService.insertSel(emrFaultDetail); - //添加初审内容 - if (bol == 1) { - //参数输入 - emrFaultDetail.setState("未召回"); - emrFaultDetail.setArchiveState(null); + if(bol==1) { + emrFaultDetail.setCreater(username); + emrFaultDetail.setCreateTime(nowTime); + emrFaultDetail.setArchiveState("初审"); bol = emrFaultDetailService.insertSel(emrFaultDetail); + //添加初审内容 + if (bol == 1) { + //参数输入 + emrFaultDetail.setState("未召回"); + emrFaultDetail.setArchiveState(null); + bol = emrFaultDetailService.insertSel(emrFaultDetail); + } + //初审成功日志 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + String handleName = user.getUserPosition();//姓名 + Archive_Master_Following archive_master_following = new Archive_Master_Following(); + archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); + //following表中添加科主任审核操作记录 + archive_master_following.setFollowingType("5"); + archive_master_following.setFollowingContent("科主任审核"); + archive_master_following.setHandleTime(nowTime); + archive_master_following.setHandleId(username); + archive_master_following.setHandleName(handleName); + archive_master_followingService.insertSelective(archive_master_following); } - return bol+""; } diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 5b044c6e..f6838785 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -91,12 +91,13 @@ public class faultController { String deptName = list.get(i).getDeptName(); //入院科室dept_admission_to String dept2 = list.get(i).getDeptAdmissionTo(); - ; - if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) { + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { //出院科室 deptName = deptName.replace(deptName, dicList.get(k).getName()); list.get(i).setDeptName(deptName); - + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 dept2 = dept2.replace(dept2, dicList.get(k).getName()); list.get(i).setDeptAdmissionTo(dept2); } diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index b9099371..1fdbdf6c 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -218,60 +218,61 @@ public class lastVerifyController { public int updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); - //修改病案归档状态 - Archive_Master archiveMaster = new Archive_Master(); - archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); - archiveMaster.setArchivestate("已归档"); - archiveMaster.setCmtDoctor(1); - archiveMaster.setCmtNurse(1); - int bol = archiveMasterService.updateByClo(archiveMaster); - - //添加初审内容 - if (bol == 1) { - // 从session获取用户名 - Subject currentUser = SecurityUtils.getSubject(); - Session session = currentUser.getSession(); - String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 - - SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowTime = format1.format(new Date()); - - //参数输入 - emrFaultDetail.setCreater(username); - emrFaultDetail.setCreateTime(nowTime); - emrFaultDetail.setState("未召回"); - //判断是否已经有召回记录 - Emr_Fault_Vo vo=new Emr_Fault_Vo(); - vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); - List list = emrFaultDetailService.selectByCol(vo); - if(list.size()>0){ - bol = emrFaultDetailService.delbyCol(emrFaultDetail); - if(bol==1){ - bol = emrFaultDetailService.insertSel(emrFaultDetail); - } - }else{ + //修改病案归档状态 + Archive_Master archiveMaster = new Archive_Master(); + archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); + archiveMaster.setArchivestate("已归档"); + archiveMaster.setCmtDoctor(1); + archiveMaster.setCmtNurse(1); + int bol = archiveMasterService.updateByClo(archiveMaster); + + //添加初审内容 + if (bol == 1) { + // 从session获取用户名 + Subject currentUser = SecurityUtils.getSubject(); + Session session = currentUser.getSession(); + String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 + + SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = format1.format(new Date()); + + //参数输入 + emrFaultDetail.setCreater(username); + emrFaultDetail.setCreateTime(nowTime); + emrFaultDetail.setState("未召回"); + //判断是否已经有召回记录 + Emr_Fault_Vo vo=new Emr_Fault_Vo(); + vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId()); + List list = emrFaultDetailService.selectByCol(vo); + if(list.size()>0){ + bol = emrFaultDetailService.delbyCol(emrFaultDetail); + if(bol==1){ bol = emrFaultDetailService.insertSel(emrFaultDetail); } - - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - String handleName = user.getUserPosition();//姓名 - - Archive_Master_Following archive_master_following = new Archive_Master_Following(); - archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); - //following表中添加病案室审核操作记录 - archive_master_following.setFollowingType("8"); - archive_master_following.setFollowingContent("病案室审核（已归档）"); - archive_master_following.setHandleTime(nowTime); - archive_master_following.setHandleId(username); - archive_master_following.setHandleName(handleName); - archive_master_followingService.insertSelective(archive_master_following); + }else{ + bol = emrFaultDetailService.insertSel(emrFaultDetail); } + + //初审成功日志 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + String handleName = user.getUserPosition();//姓名 + Archive_Master_Following archive_master_following = new Archive_Master_Following(); + archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); + //following表中添加病案室审核操作记录 + archive_master_following.setFollowingType("8"); + archive_master_following.setFollowingContent("病案室审核（已归档）"); + archive_master_following.setHandleTime(nowTime); + archive_master_following.setHandleId(username); + archive_master_following.setHandleName(handleName); + archive_master_followingService.insertSelective(archive_master_following); + } + return bol; } @ResponseBody @RequestMapping(value = "/updateSignState") - public String updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Archive_Master archiveMaster) throws UnsupportedEncodingException { + public String updateSignState(HttpServletRequest request, HttpServletResponse response, Archive_Master archiveMaster) throws UnsupportedEncodingException { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); String result=""; @@ -310,11 +311,11 @@ public class lastVerifyController { if(isSign == 1) { result = "该份病案签收成功!"; followingContent="病案签收成功"; - followingType="12"; + followingType="13"; }else{ result = "该份病案取消签收成功!"; followingContent="病案取消签收成功"; - followingType="13"; + followingType="14"; } //2021-05-13 following表中添加签收操作记录 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); diff --git a/src/main/java/com/emr/controller/medicalOverdueController.java b/src/main/java/com/emr/controller/medicalOverdueController.java index ca305cce..1ce5b438 100644 --- a/src/main/java/com/emr/controller/medicalOverdueController.java +++ b/src/main/java/com/emr/controller/medicalOverdueController.java @@ -46,12 +46,22 @@ public class medicalOverdueController { @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","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","overdue"}; + String[] header = {"住院号","住院次数","姓名","入院科室","出院科室","出院日期","科室提交","初审人","主管医生","间隔天数","超期天数"}; + String[] fileNames = {"inpNo","visitId","name","deptAdmissionTo","deptName","dischargeDateTime","createTime","firstInstance","doctorInCharge","overdue","score"}; //文件名 String fileName = "首次签收超期列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; - //构造excel的数据 + //构造excel的数据overdueDays List list = archiveMasterService.selectOverdue(archiveMasterVo); + if(archiveMasterVo.getOverdueDays()!=null && archiveMasterVo.getOverdueDays()!="") { + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + if (list.get(i).getOverdue() != null && list.get(i).getOverdue() != "" ) { + int score = Integer.parseInt(list.get(i).getOverdue()) - Integer.parseInt(archiveMasterVo.getOverdueDays()); + list.get(i).setScore("" + score); + } + } + } + } ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); } diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index f1bc36da..ef6ae9b2 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -59,18 +59,19 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { obj.setEffective(1); List typeLis = emrFaultTypeService.selectByCol(obj); for (int i = 0; i < list.size(); i++) { - //替换科室 for (int k = 0; k < dicList.size(); k++) { String deptName = list.get(i).getDeptName(); //入院科室dept_admission_to String dept2 = list.get(i).getDeptAdmissionTo(); - if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) { + if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) { //出院科室 deptName = deptName.replace(deptName, dicList.get(k).getName()); list.get(i).setDeptName(deptName); - + } + if (dept2 != null && dept2.equals(dicList.get(k).getCode())) { + //入院科室 dept2 = dept2.replace(dept2, dicList.get(k).getName()); list.get(i).setDeptAdmissionTo(dept2); } @@ -170,18 +171,18 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { obj.setEffective(1); List typeLis = emrFaultTypeService.selectByCol(obj); for (int i = 0; i < list.size(); i++) { - //替换科室 for (int k = 0; k < dicList.size(); k++) { String deptName = list.get(i).getDeptName(); //入院科室dept_admission_to String dept2 = list.get(i).getDeptAdmissionTo(); - - if ((deptName != null && deptName.equals(dicList.get(k).getCode())) || (dept2 != null && dept2.equals(dicList.get(k).getCode()))) { + if (deptName != null && deptName.equals(dicList.get(k).getCode())) { //出院科室 deptName = deptName.replace(deptName, dicList.get(k).getName()); list.get(i).setDeptName(deptName); - + } + if(dept2 != null && dept2.equals(dicList.get(k).getCode())){ + //入院科室dept_admission_to dept2 = dept2.replace(dept2, dicList.get(k).getName()); list.get(i).setDeptAdmissionTo(dept2); } diff --git a/src/main/java/com/emr/util/ThreadExcelUtils.java b/src/main/java/com/emr/util/ThreadExcelUtils.java index 68370524..a1e63295 100644 --- a/src/main/java/com/emr/util/ThreadExcelUtils.java +++ b/src/main/java/com/emr/util/ThreadExcelUtils.java @@ -11,8 +11,6 @@ import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import java.beans.PropertyDescriptor; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; @@ -149,7 +147,7 @@ public class ThreadExcelUtils { else pageCount = totalCount / excelSize; // 创建线程池 多sheet多线程写入 线程数 为sheet页的 1/4 - Integer threadNumber = pageCount / 4; + Integer threadNumber =pageCount;// pageCount / 4; if (threadNumber == 0) threadNumber = 1; ExecutorService threadPool = Executors.newFixedThreadPool(threadNumber); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index e5ec3450..b0a849ff 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1188,12 +1188,15 @@ ORDER BY f.handle_time desc diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 336a7c52..04c4bb75 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -151,7 +151,7 @@ and d.update_time = #{updateTime,jdbcType=NCHAR} - + ORDER BY case WHEN( d.update_time is not null) THEN d.update_time ELSE d.create_time END desc diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index c7f60221..2e95e779 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -4356,7 +4356,6 @@ function initTable4() { - $("#table4").bootstrapTable({ // 对应table标签的id //method: 'POST', url: "${path}/commCtr/bbSelPage", // 获取表格数据的url diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 53843529..9fe494c6 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -18,7 +18,6 @@ href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-multiselect-master/dist/css/bootstrap-multiselect.css" type="text/css"/>