From 651f8982b1608dc84c40c760268f6256f01b734a Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 8 Jul 2021 11:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E5=A2=9E=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/FontController.java | 5 +++++ .../java/com/emr/dao/Zd_AssortMapper.java | 2 +- .../com/emr/entity/Archive_Detail_Vo.java | 2 ++ .../ipml/Archive_DetailServiceImpl.java | 3 ++- .../com/emr/service/ipml/ZdAssortService.java | 2 +- .../resources/mapper/Archive_DetailMapper.xml | 5 +++-- src/main/resources/mapper/Zd_AssortMapper.xml | 5 +++-- .../webapp/WEB-INF/views/font/showRecord.jsp | 20 +++++++++++++++++++ 8 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 9875819..21bc898 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -2,6 +2,7 @@ package com.emr.controller; import com.alibaba.fastjson.JSON; import com.emr.dao.Emr_DictionaryMapper; +import com.emr.dao.TPrintinfoMapper; import com.emr.entity.*; import com.emr.service.Archive_DetailService; import com.emr.service.Archive_MasterService; @@ -61,6 +62,8 @@ public class FontController { private ArchiveFlowInfoService archiveFlowInfoService; @Autowired private ArchiveOtherExtService archiveOtherExtService; + @Autowired + private TPrintinfoMapper tPrintinfoMapper; @RequestMapping("selectIsPrintByPatienId") @ResponseBody @@ -111,6 +114,8 @@ public class FontController { ExceptionPrintUtil.printException(e); e.printStackTrace(); } + List tPrintinfos = tPrintinfoMapper.selectIsPrintByPatienId(patientId); + model.addAttribute("printCount",tPrintinfos.size()); model.addAttribute("patientId",list.get(0).getId()); model.addAttribute("accountNumber",list.get(0).getPatientId()); model.addAttribute("assortIds",assortIds); diff --git a/src/main/java/com/emr/dao/Zd_AssortMapper.java b/src/main/java/com/emr/dao/Zd_AssortMapper.java index 32acc7d..744d84d 100644 --- a/src/main/java/com/emr/dao/Zd_AssortMapper.java +++ b/src/main/java/com/emr/dao/Zd_AssortMapper.java @@ -11,5 +11,5 @@ public interface Zd_AssortMapper { * */ List selectAll(@Param("record") Zd_Assort record); - List selectAssortListByUserId(Integer userId); + List selectAssortListByUserId(@Param("userId") Integer userId,@Param("roleId")Integer roleId); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java index 2050ed2..49f95fa 100644 --- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java @@ -41,6 +41,8 @@ public class Archive_Detail_Vo extends Archive_Detail{ private String createTime; private Integer userId; + + private Integer roleId; } diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index f4bef7b..e8aa9d7 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -123,6 +123,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { //不是管理员需过滤分类权限 if(roleId != 0 && roleId != -100){ record.setUserId(currentUser.getUserId()); + record.setRoleId(currentUser.getRoleId()); } PageHelper.offsetPage(offset, limit); List list = archiveDetailMapper.detailByClo(record); @@ -172,7 +173,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { } } } - ((Page) returnList).setTotal(returnList.size()); + ((Page) returnList).setTotal(offsetLimitPage.getTotal()); return new OffsetLimitPage((Page) returnList); } return offsetLimitPage; diff --git a/src/main/java/com/emr/service/ipml/ZdAssortService.java b/src/main/java/com/emr/service/ipml/ZdAssortService.java index d572b64..767113c 100644 --- a/src/main/java/com/emr/service/ipml/ZdAssortService.java +++ b/src/main/java/com/emr/service/ipml/ZdAssortService.java @@ -52,7 +52,7 @@ public class ZdAssortService { return null; } else { //按权限分类查 - List zdAssorts = assortMapper.selectAssortListByUserId(currentUser.getUserId()); + List zdAssorts = assortMapper.selectAssortListByUserId(currentUser.getUserId(),currentUser.getRoleId()); //如果未分配分类使用全部查询 if (CollectionUtils.isEmpty(zdAssorts)) { return null; diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index a28cf68..56ff9dd 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -156,8 +156,9 @@ AND emr_user_reader.record_id = emr_role_reader.record_id AND user_id = #{userId} WHERE - flag IS NULL - OR flag != 0 + emr_role_reader.role_id = #{roleId} AND + (flag IS NULL + OR flag != 0) UNION SELECT record_id diff --git a/src/main/resources/mapper/Zd_AssortMapper.xml b/src/main/resources/mapper/Zd_AssortMapper.xml index fee42fc..688df8d 100644 --- a/src/main/resources/mapper/Zd_AssortMapper.xml +++ b/src/main/resources/mapper/Zd_AssortMapper.xml @@ -39,8 +39,9 @@ AND emr_user_reader.record_id = emr_role_reader.record_id AND user_id = #{userId} WHERE - flag IS NULL - OR flag != 0 + emr_role_reader.role_id = #{roleId} AND + (flag IS NULL + OR flag != 0) UNION SELECT record_id diff --git a/src/main/webapp/WEB-INF/views/font/showRecord.jsp b/src/main/webapp/WEB-INF/views/font/showRecord.jsp index e4bea18..9edbdb8 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecord.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecord.jsp @@ -87,6 +87,23 @@ #iframe{ height: 100%; } + .seal-result{ + width: 60px; + height: 60px; + transform: rotate(30deg); + border: solid 2px red; + border-radius: 100%; + text-align: center; + color: red; + font-size: 16px; + font-weight: bold; + line-height: 60px; + left: 17.5%; + top: 6%; + position: absolute; + background-color: rgba(255,255,255,0.8); + z-index: 1000; + } @@ -142,6 +159,9 @@ + +
已打印
+