From 4d682f7f821d6cb430f80f98367520a7a496bfa2 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 6 Nov 2020 09:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=A8=E7=A7=91=E6=9F=A5?= =?UTF-8?q?=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beHospitaledController.java | 8 ++-- .../com/emr/entity/Archive_Master_Vo.java | 2 + .../emr/service/Archive_MasterService.java | 4 +- .../ipml/Archive_MasterServiceImpl.java | 11 +++-- .../resources/mapper/Archive_MasterMapper.xml | 40 ++++++++++++++++++- .../webapp/static/js/beHospList/beHospList.js | 1 + 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 6e42f1c..4c5a51a 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -110,14 +110,14 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/beHospList") - public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch){ + public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch,HttpServletRequest request){ //判断是否是初始化查询，是初始化查询把开始结束时间置空 if(isSearch == 0){ archiveMasterVo.setStartDateTo(null); archiveMasterVo.setEndDateTo(null); } try { - return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit); + return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit,request); } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); @@ -127,7 +127,7 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/exportExcel") - public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo,Integer isSearch){ + public void exportExcel(HttpServletResponse response, HttpServletRequest request,Archive_Master_Vo archiveMasterVo,Integer isSearch){ String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态"; String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status"; //构造excel的数据 @@ -136,7 +136,7 @@ public class beHospitaledController { archiveMasterVo.setEndDateTo(null); } try { - List list = archiveMasterService.selectByColumn(archiveMasterVo); + List list = archiveMasterService.selectByColumn(archiveMasterVo,request); //文件名 String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //ExportExcelUtil 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 4c4005a..59247b8 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -53,6 +53,8 @@ public class Archive_Master_Vo extends Archive_Master{ private Integer overtimeDays;//超期天数 private String doctorInChargeCode;//主管医生工号 + + private String userName;//登录用户 } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 3969cf3..5109587 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -36,7 +36,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - List selectByColumn(Archive_Master_Vo archiveMasterVo); + List selectByColumn(Archive_Master_Vo archiveMasterVo,HttpServletRequest request); //验证字符串是否是数字 @@ -55,7 +55,7 @@ public interface Archive_MasterService { * @param archiveMasterVo * @return */ - OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); + OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,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 b335862..d8c9176 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -69,10 +69,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { * 出院列表 * */ @Override - public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) { PageHelper.offsetPage(offset, limit); //查询出院集合 - List list = selectByColumn(archiveMasterVo); + List list = selectByColumn(archiveMasterVo,request); //组织完整性字段 //list集合的分组分类集合 if(!CollectionUtils.isEmpty(list)){ @@ -309,8 +309,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } @Override - public List selectByColumn(Archive_Master_Vo archiveMasterVo) { + public List selectByColumn(Archive_Master_Vo archiveMasterVo,HttpServletRequest request) { setMaxRoleId(archiveMasterVo); + //设置登录用户 + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + if(user.getRoleId() == 1 && user.getRoleId() != -100){ + archiveMasterVo.setUserName(user.getUserName()); + } List list = archiveMasterMapper.selectByColumn(archiveMasterVo); //转换科室与赋值超期天数 selectByColumnChange(list); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 7ecdab5..945c45c 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -178,7 +178,7 @@ ORDER BY m.admission_date_time desc - + and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801' @@ -212,6 +212,34 @@ and m.DOCTOR_IN_CHARGE in (${doctorInCharge}) + + + and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801' + + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + + and m.visit_id=#{visitId,jdbcType=NCHAR} + + + and m.name like '%'+#{name,jdbcType=NCHAR}+'%' + + + + and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + + + and m.discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + + and m.DOCTOR_IN_CHARGE in (${doctorInCharge}) + + @@ -429,9 +457,17 @@ and archive_flow_info.master_id is null + + union all + select from archive_transfer_dept_user + inner join + archive_master m + on m.id = archive_transfer_dept_user.master_id + where user_name = #{userName} + + ) m ORDER BY m.discharge_date_time desc - diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index 0bc0537..fcc103e 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -852,6 +852,7 @@ var opts = { var spinner = new Spinner(opts); //获取所有分段列表 function initTree2(deptName,masterId) { + zNodes = [] $.ajax({ url: path+"/transferDeptUser/selectTranferDeptUserTree", type: "POST",