From 64707947976ce293d9fa70c2745e1bc797240b8f Mon Sep 17 00:00:00 2001 From: hujl Date: Fri, 18 Nov 2022 09:26:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=A4=8D?= =?UTF-8?q?=E9=80=89=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beHospitaledController.java | 7 +- .../com/emr/dao/Archive_MasterMapper.java | 2 + .../emr/service/Archive_MasterService.java | 10 +++ .../ipml/Archive_MasterServiceImpl.java | 75 ++++++++++++++++--- src/main/resources/config/spring-shiro.xml | 1 + .../resources/mapper/Archive_MasterMapper.xml | 19 +++++ .../webapp/static/js/inHospList/inHospList.js | 9 +-- .../webapp/static/js/vCount/vCountList.js | 2 +- src/test/java/com/emr/Test.java | 48 ++++++++++++ 9 files changed, 153 insertions(+), 20 deletions(-) create mode 100644 src/test/java/com/emr/Test.java diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 57a0227..b7d1e22 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -163,13 +163,10 @@ public class beHospitaledController { @ResponseBody - @RequestMapping(value = "/beHospList1") + @RequestMapping(value = "/beHospListTwo") public OffsetLimitPage beHospList1(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch,HttpServletRequest request){ - //判断是否是初始化查询，是初始化查询把开始结束时间置空 - archiveMasterVo.setStartDateTo(null); - archiveMasterVo.setEndDateTo(null); try { - return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit,request); + return archiveMasterService.selectByColumnTwo(archiveMasterVo, offset, limit,request); } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 4c8b59f..9499c37 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -22,6 +22,8 @@ public interface Archive_MasterMapper { List selectByColumn(Archive_Master_Vo record); + List selectStatisColumn(Archive_Master_Vo record); + List selectByLast(Archive_Master_Vo record); List selectByUnfile(Archive_Master_Vo record); diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 8d30719..b9561b0 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -58,6 +58,16 @@ public interface Archive_MasterService { OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request); + /** + * 统计列表二级列表查询 + * + * @param archiveMasterVo + * @return + */ + OffsetLimitPage selectByColumnTwo(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request); + + List selectStatisColumn(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo, 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 e6fc715..540d01e 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -88,6 +88,58 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return new OffsetLimitPage((Page) list); } + + /** + * 出院列表 + * */ + @Override + public OffsetLimitPage selectByColumnTwo(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) { + //设置查询条件审核角色 + setInfoId(archiveMasterVo); + //设置登录用户 + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + if(user.getRoleId() != -100 && user.getRoleId() != 0){ + archiveMasterVo.setUserName(user.getUserName()); + } + List list = selectStatisColumn(offset, limit,archiveMasterVo,request); + return new OffsetLimitPage((Page) list); + } + + @Override + public List selectStatisColumn(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo, HttpServletRequest request) { + List list = null; + if(null != offset && null != limit) { + PageHelper.offsetPage(offset, limit); + } + list = archiveMasterMapper.selectStatisColumn(archiveMasterVo); + selectByColumnChange(list); + List flowRoles = flowRoleMapper.selectAll(); + //计算属于哪种审核角色 + Msg role = getRole(); + if(null != role) { + for (Archive_Master_Vo masterVo : list) { + String archivestate = masterVo.getArchivestate(); + if (StringUtils.isNotBlank(archivestate)) { + //转换中文状态 + boolean numeric = isNumeric(archivestate); + if (numeric) { + Integer status = Integer.valueOf(archivestate); + //组织已经审核的状态 + archivestate = EnumVerify.DocState.GetStepName(status, role.getCode()); + //组织未审核的状态 + String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode()); + masterVo.setStatus(archivestate); + masterVo.setCurrentStatus(currentArchivestate); + //根据角色 + //获取审核按钮和退回按钮集合 + getBtns(status, flowRoles, masterVo.getId(), masterVo.getPatientId(), masterVo); + } + } + } + } + return list; + } + /** * //循环遍历list集合判断是否完整，完整isCheck赋值1，且批量更新LockInfo字段为完整 * @param list @@ -296,15 +348,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { for (Archive_Master_Vo masterVo : list) { String archivestate = masterVo.getArchivestate(); String inpNo = masterVo.getPatientId(); - String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; - try { - String select = OracleConnect.select(sql); - masterVo.setHisStatic(select); -// String hisStatic = masterVo.getHisStatic(); - } catch (Exception e) { - ExceptionPrintUtil.printException(e); - e.printStackTrace(); - } +// String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; +// try { +// String select = OracleConnect.select(sql); +// masterVo.setHisStatic(select); +//// String hisStatic = masterVo.getHisStatic(); +// } catch (Exception e) { +// ExceptionPrintUtil.printException(e); +// e.printStackTrace(); +// if (StringUtils.isNotBlank(archivestate)) { //转换中文状态 boolean numeric = isNumeric(archivestate); @@ -327,6 +379,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return list; } + + + + + /** * 带完整性查询的出院记录查询 * @param archiveMasterVo diff --git a/src/main/resources/config/spring-shiro.xml b/src/main/resources/config/spring-shiro.xml index 99e24d5..f4d1d45 100644 --- a/src/main/resources/config/spring-shiro.xml +++ b/src/main/resources/config/spring-shiro.xml @@ -21,6 +21,7 @@ /font/**=anon /login=anon /static/**=anon + /statistics/**=anon /jspf/**=anon /img/**=anon /styles/**=anon diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index db45ecf..d0bef52 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -699,6 +699,25 @@ ORDER BY archive_master.discharge_date_time desc + + + +