From 29dae59643ac8d51039172d6ddcea8a766559aa0 Mon Sep 17 00:00:00 2001 From: zengwh Date: Mon, 14 Sep 2020 14:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8E=86=E5=8F=B2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/FontController.java | 5 +-- .../controller/beHospitaledController.java | 9 +++++- .../service/ipml/ArchiveFlowInfoService.java | 4 +-- .../emr/service/ipml/StatisticsService.java | 24 ++++++++++++++ .../views/beHospitaledDir/beHospList.jsp | 2 +- .../views/inHospitalDir/inHositalList.jsp | 2 +- src/main/webapp/WEB-INF/views/index.jsp | 20 +++++++----- .../views/lastVerifyDir/lastVerifyList.jsp | 2 +- .../unfileMedicalDir/unfileMedicalList.jsp | 2 +- src/main/webapp/static/js/menu.js | 32 +++++++++++++------ 10 files changed, 75 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 3501f4d..b871834 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -12,6 +12,7 @@ import com.emr.service.ipml.ZdAssortService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Msg; import com.emr.vo.ArchiveFlowInfoVo; +import com.emr.vo.User; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; @@ -435,8 +436,8 @@ public class FontController { */ @RequestMapping("toShowFlowInfo") @ResponseBody - public Msg toShowFlowInfo(String masterId) throws Exception{ - List list = archiveFlowInfoService.selectFlowInfoByMasterId(masterId); + public Msg toShowFlowInfo(String masterId, String userName) throws Exception{ + List list = archiveFlowInfoService.selectFlowInfoByMasterId(masterId,userName); return Msg.success().add("list",list); } } diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index edb4017..9254654 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -13,13 +13,16 @@ import com.emr.entity.Archive_Master_Vo; import com.emr.entity.OffsetLimitPage; import com.emr.service.Archive_MasterService; import com.emr.service.ipml.ArchiveFlowInfoService; +import com.emr.service.ipml.StatisticsService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.ExportExcelUtil; import com.emr.util.Msg; import com.emr.util.OracleConnect; import com.emr.vo.ArchiveFlowInfoVo; +import com.emr.vo.User; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -46,6 +49,8 @@ public class beHospitaledController { private ArchiveFlowRoleMapper flowRoleMapper; @Autowired private ArchiveFlowInfoService flowInfoService; + @Autowired + private StatisticsService statisticsService; @RequestMapping(value = "/beHosps") public String inHospitals(){ return "beHospitaledDir/beHospList"; @@ -230,7 +235,9 @@ public class beHospitaledController { //查询流程信息集合 List list = null; try { - list = flowInfoService.selectFlowInfoByMasterId(master.getId()); + //获取登录时输入的用户名 + String userName = (String) SecurityUtils.getSubject().getSession().getAttribute("userSession"); + list = flowInfoService.selectFlowInfoByMasterId(master.getId(),userName); } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); diff --git a/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java b/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java index 0d3cb11..3024ee2 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveFlowInfoService.java @@ -261,14 +261,14 @@ public class ArchiveFlowInfoService { * @param id * @return */ - public List selectFlowInfoByMasterId(String id) throws Exception{ + public List selectFlowInfoByMasterId(String id,String userNameTemp) throws Exception{ List list = flowInfoMapper.selectFlowInfoByMasterId(id); if(!CollectionUtils.isEmpty(list)) { //获取缺陷类别列表 Emr_Fault_Type obj = new Emr_Fault_Type(); obj.setEffective(1); List typeList = faultTypeService.selectByCol(obj); - List userList = statisticsService.getUserList(); + List userList = statisticsService.getUserList(userNameTemp); //替换姓名 if (!CollectionUtils.isEmpty(userList)) { for (ArchiveFlowInfoVo infoVo : list) { diff --git a/src/main/java/com/emr/service/ipml/StatisticsService.java b/src/main/java/com/emr/service/ipml/StatisticsService.java index ecd0d8d..236c229 100644 --- a/src/main/java/com/emr/service/ipml/StatisticsService.java +++ b/src/main/java/com/emr/service/ipml/StatisticsService.java @@ -204,6 +204,30 @@ public class StatisticsService { return userList; } + public List getUserList(String userName) throws Exception{ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + List userList = (List)request.getSession().getAttribute("USER_LIST"); + if(null == userList || userList.isEmpty()){ + //调用接口查询 + String resultString = ""; + // 创建uri + String url = POWER_URLHEAD+"/font/getUserList?userName="+userName; + // 执行请求 + CloseableHttpResponse response = HttpClients.createDefault().execute(new HttpGet(url)); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), "UTF-8"); + } + JSONObject jsonObject = JSONObject.fromObject(resultString); + String extend = jsonObject.getString("extend"); + JSONObject extendObject = JSONObject.fromObject(extend); + String userList1 = extendObject.getString("userList"); + userList = JSON.parseArray(userList1,User.class); + //设置进session + request.getSession().setAttribute("USER_LIST",userList); + } + return userList; + } /** * 统计病案列表 * @param recordStatistics diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 94345c6..fab7f3e 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -323,7 +323,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 647b384..2108d76 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -262,7 +262,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 9318584..2007aed 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -62,6 +62,9 @@ padding-bottom: 0; } +