1.对接ca登录认证，实现使用CA电子签名完成登录认证

2.归档病历召回时增加弹框提醒（“提醒患方及第三方已申请使用过病历”）
3.锁定状态病历，常用查询页面无法借阅，申请列表借阅后无法直接查看

src/main/java/com/emr/controller/PowerUserController.java

@@ -5,12 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.emr.entity.Power_User;
 
 
+import com.emr.service.PowerUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletRequest;
 
 
 @Controller
@@ -21,7 +23,7 @@ public class PowerUserController {
 
     @RequestMapping("getPowerUserList")
     @ResponseBody
-    public Object getPowerUserList(HttpServletRequest request,String type){
+    public Object getPowerUserList(HttpServletRequest request, String type){
         Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
         String handleName = user.getUserPosition();//姓名
         request.setAttribute("handleName",handleName);

src/main/java/com/emr/entity/Emr_Fault_Vo.java

@@ -106,6 +106,8 @@ public class Emr_Fault_Vo {
     //退回总费用
     private String totalBackFee;
 
+    private String vprintinfoId;
+
 
 
     public String getBackTime() {
@@ -475,6 +477,14 @@ public class Emr_Fault_Vo {
     public void setTotalBackFee(String totalBackFee) {
         this.totalBackFee = totalBackFee;
     }
+
+    public String getVprintinfoId() {
+        return vprintinfoId;
+    }
+
+    public void setVprintinfoId(String vprintinfoId) {
+        this.vprintinfoId = vprintinfoId;
+    }
 }
  
 

src/main/java/com/emr/service/PowerUserService.java

@@ -2,10 +2,13 @@ package com.emr.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.emr.entity.Archive_Master_Following;
 
 import java.util.List;
 
 public interface PowerUserService {
 
     JSONArray getPowerUserList(String type);
+
+    List<Archive_Master_Following> getHandleName(String patientIds);
 }

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

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.emr.service.PowerUserService;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service

src/main/resources/mapper/Emr_Fault_DetailMapper.xml

@@ -66,6 +66,7 @@
     <result column="type_name" jdbcType="NVARCHAR" property="typeName"/>
     <result column="DOCTOR_IN_CHARGE" jdbcType="NVARCHAR" property="doctorInCharge"/>
     <result column="minus_point" jdbcType="VARCHAR" property="minusPoint"/>
+    <result column="v_printinfo_id" jdbcType="VARCHAR" property="vprintinfoId"/>
   </resultMap>
   <sql id="Base_Column_List">
     id, archive_detail_id, assort_id, parent_id, content,price, score, back_content, first_trial,state,recall_reason
@@ -311,11 +312,13 @@
   </select>
 
   <select id="selectByCol" parameterType="com.emr.entity.Emr_Fault_Vo" resultMap="BaseResultMap2">
-      select m.id as archive_detail_id,ISNULL(f.state, '未召回') state,f.recall_reason,m.inp_no,m.visit_id,m.name,m.dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,m.dept_admission_to,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION
+      select m.id as archive_detail_id,ISNULL(f.state, '未召回') state,f.recall_reason,m.inp_no,m.visit_id,m.name,m.dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,m.dept_admission_to,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION,
+             p.id as v_printinfo_id
       from archive_master m
       left join(select * from emr_fault_detail t where id = (select top 1 id from emr_fault_detail where archive_detail_id = t.archive_detail_id order by create_time desc )
       and state in('已召回','未召回')) f
       ON f.archive_detail_id=m.id
+      left join v_printinfo p ON m.id=p.masterID
       where 1=1 and  m.Is_Valid!=1
     <if test="archiveDetailId != null">
       and f.archive_detail_id = #{archiveDetailId,jdbcType=NVARCHAR}

src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp

@@ -559,6 +559,13 @@
                         align: 'left',
                         valign: 'middle'
                     },
+                    {
+                        title: '打印ID',
+                        field: 'vprintinfoId',
+                        align: 'left',
+                        valign: 'middle',
+                        visible: false
+                    },
                     {
                         title: '入院日期',
                         field: 'admissionDateTime',
@@ -646,9 +653,9 @@
                             if (index != null && index != "" && index.indexOf("recall") != -1) {
                                 if (row.archivestate == "已认证" || row.archivestate == "已归档") {
                                     if(row.state=="已召回"){
-                                        htmlVal+= '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.inpNo + '\')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
+                                        htmlVal+= '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.inpNo + '\',\'' + row.vprintinfoId + '\')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
                                     }else{
-                                        htmlVal+= '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.inpNo + '\')">召回 </button>';
+                                        htmlVal+= '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.inpNo + '\',\'' + row.vprintinfoId + '\')">召回 </button>';
                                     }
                                 } else {
                                     htmlVal='';
@@ -738,9 +745,10 @@
 
     }
 
-    function recallFun(id, archiveDetailId,inpNo){
+    function recallFun(id, archiveDetailId,inpNo,vprintinfoId){
         //生成表单token,防止表单重复提交
         setFormToken();
+
         $('#exampleModal').modal({
             backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
             keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
@@ -750,6 +758,13 @@
         $("#inpatientNo").val(inpNo)
         //$("#id").val(id);
         $("#danganhao").html(archiveDetailId);
+
+        //提醒是否使用
+        if (vprintinfoId != null && vprintinfoId != "" && vprintinfoId != "null"){
+            alert("已使用");
+        }else {
+            alert("未使用");
+        }
     }
 
     var value = [];