提交新增打印图标

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<TPrintinfo> 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);

src/main/java/com/emr/dao/Zd_AssortMapper.java

@@ -11,5 +11,5 @@ public interface Zd_AssortMapper {
      * */
     List<Zd_Assort> selectAll(@Param("record") Zd_Assort record);
 
-    List<Zd_Assort> selectAssortListByUserId(Integer userId);
+    List<Zd_Assort> selectAssortListByUserId(@Param("userId") Integer userId,@Param("roleId")Integer roleId);
 }

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;
 }
  
 

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<Archive_Detail_Vo> list = archiveDetailMapper.detailByClo(record);
@@ -172,7 +173,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
                     }
                 }
             }
-            ((Page<Archive_Detail_Vo>) returnList).setTotal(returnList.size());
+            ((Page<Archive_Detail_Vo>) returnList).setTotal(offsetLimitPage.getTotal());
             return new OffsetLimitPage((Page) returnList);
         }
         return offsetLimitPage;

src/main/java/com/emr/service/ipml/ZdAssortService.java

@@ -52,7 +52,7 @@ public class ZdAssortService {
             return null;
         } else {
             //按权限分类查
-            List<Zd_Assort> zdAssorts = assortMapper.selectAssortListByUserId(currentUser.getUserId());
+            List<Zd_Assort> zdAssorts = assortMapper.selectAssortListByUserId(currentUser.getUserId(),currentUser.getRoleId());
             //如果未分配分类使用全部查询
             if (CollectionUtils.isEmpty(zdAssorts)) {
                 return null;

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

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

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;
+        }
     </style>
 </head>
 <body style="scroll:auto" onkeydown="disabledPrint()">
@@ -142,6 +159,9 @@
                 </div>
             </div>
         </div>
+        <c:if test="${printCount != 0}">
+            <div class="seal-result">已打印</div>
+        </c:if>
         <div class="row rowDiv">
         <div class="col-sm-3 inputDiv">
             <div class="form-group">