新增封存选项

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

@@ -87,11 +87,6 @@ public class FontController {
         List<Archive_Master> list = new ArrayList<>();
         //判断工号是否存在
         try {
-           /* String checkUserName = checkUserName(userName);
-            if(StringUtils.isNotBlank(checkUserName)){
-                return retrunErrorPage(model,checkUserName);
-            }*/
-            //判断分类id是否存在,协商assortIds = "00000000"为查询全部
             if(!allAddortIds.equals(assortIds)) {
                 String checkAssortIds = checkAssortIds(assortIds);
                 if (StringUtils.isNotBlank(checkAssortIds)) {

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

@@ -162,6 +162,7 @@ public class storageController {
                         archiveMasterFollowing.setHandleTime(nowTime);
                         archiveMasterFollowing.setHandleId(username);
                         archiveMasterFollowing.setHandleName(handleName);
+                        archiveMasterFollowing.setSafekeepingName(emrFaultDetail.getSafekeepingName());
                         archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason());
                         bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing);
                     } else if (archiveMaster.getArchivestate().equals("已归档")) {// if (archiveMaster.getArchivestate().equals("已归档"))
@@ -215,8 +216,20 @@ public class storageController {
         OffsetLimitPage result = archiveMasterService.selectByFollowinglog(archiveMasterVo, offset, limit);
         return result;
     }
-
-
+    /**
+     * @description: 获取封存类型下拉框
+     * @author linjj
+     * @date: 2023/7/13 15:48
+     */
+    @ResponseBody
+    @RequestMapping(value = "getSafekeeping")
+    public List<Emr_Dictionary> getSafekeeping(){
+        Emr_Dictionary dic = new Emr_Dictionary();
+        dic.setEffective(1);
+        dic.setTypecode("safekeeping");
+        List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
+        return dicList;
+    }
 }
  
 

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

@@ -194,7 +194,7 @@ public interface Archive_MasterMapper  {
     List<Archive_Master_Vo> selectByFollowinglog(Archive_Master_Vo record);
 
 
-
+    List<Archive_Master_Vo>selectFollowing(@Param(value = "ids") String ids);
 
     /**
      * 查询病案是否存在

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

@@ -9,6 +9,16 @@ public class Archive_Master_Following {
 
     private String followingType;
 
+    public String getSafekeepingName() {
+        return safekeepingName;
+    }
+
+    public void setSafekeepingName(String safekeepingName) {
+        this.safekeepingName = safekeepingName;
+    }
+
+    private String safekeepingName;
+
     private String followingContent;
 
     private String handleTime;

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

@@ -69,6 +69,7 @@ public class Archive_Master_Vo {
 
     private String doctorInCharge2;
 
+    private String safekeepingName;
     public String getDoctorInCharge2() {
         return doctorInCharge2;
     }

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

@@ -11,6 +11,16 @@ public class Emr_Fault_Detail {
 
     private String StateFlag;
 
+    public String getSafekeepingName() {
+        return safekeepingName;
+    }
+
+    public void setSafekeepingName(String safekeepingName) {
+        this.safekeepingName = safekeepingName;
+    }
+
+    private String safekeepingName;
+
     public String getStateFlag() {
         return StateFlag;
     }

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

@@ -13,6 +13,8 @@ public interface Emr_DictionaryService {
      */
     List<Emr_Dictionary> dicByTypeCode(Emr_Dictionary emrDictionary);
 
+
+
     /**
      * 根据字段查找字典列表
      *

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

@@ -1264,6 +1264,34 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public OffsetLimitPage selectByFollowinglog(Archive_Master_Vo record, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByFollowinglog(record);
+        //科室列表
+        Emr_Dictionary dic = new Emr_Dictionary();
+        dic.setEffective(1);
+        dic.setTypecode("safekeeping");
+        List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
+        //添加封存类型
+        //masterIds集合
+        List<String> masterIds = ListUtils.distinctSelect(list, Archive_Master_Vo::getMasterId);
+        //转成逗号拼接
+        String ids = String.join(",", masterIds);
+        //查询封存记录
+        List<Archive_Master_Vo> archiveMasterVos = archiveMasterMapper.selectFollowing(ids);
+        Map<String, Archive_Master_Vo> masterIdMap = ListUtils.toMap(archiveMasterVos, Archive_Master_Vo::getMasterId);
+        Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
+            String masterId = p.getMasterId();
+            if (masterIdMap.containsKey(masterId)){
+                p.setSafekeepingName(masterIdMap.get(masterId).getSafekeepingName());
+            }
+        });
+        //转换科室
+        Map<String, Emr_Dictionary> codeMap = ListUtils.toMap(dicList, Emr_Dictionary::getCode);
+        Setters.<Archive_Master_Vo>instance().list(list).cycleSetProperties(p -> {
+            String afekeepingCode = p.getSafekeepingName();
+            if(StringUtils.isNotBlank(afekeepingCode) && codeMap.containsKey(afekeepingCode)){
+                String afekeepingame = codeMap.get(afekeepingCode).getName();
+                p.setSafekeepingName(afekeepingame);
+            }
+        });
         return  new OffsetLimitPage((Page) list);
     }
 

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1968,7 +1968,7 @@
     </select>
     <!--封存日志-->
     <select id="selectByFollowinglog" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
-        select m.INP_NO,m.VISIT_ID,m.name,m.sex,f.handle_name,CONVERT(VARCHAR(20),f.handle_time,120) handle_time, m.archiveState ,f.following_content
+        select f.master_id,m.INP_NO,m.VISIT_ID,m.name,m.sex,f.handle_name,CONVERT(VARCHAR(20),f.handle_time,120) handle_time, m.archiveState ,f.following_content
         from (select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1) m
         INNER JOIN Archive_Master_Following f on m.ID=f.master_id
         where 1=1 AND f.following_type in('11','12')
@@ -2579,4 +2579,17 @@
         GROUP BY
         archive_detail_id
     </select>
+    <select id="selectFollowing" resultType="com.emr.entity.Archive_Master_Vo">
+        SELECT
+        master_id,
+        safekeepingName
+        FROM
+        Archive_Master_Following
+        WHERE
+        following_type='11'
+        and master_id in
+        <foreach item="item" collection="ids.split(',')" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

src/main/resources/mapper/Archive_Master_FollowingMapper.xml

@@ -60,6 +60,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="safekeepingName != null">
+        safekeepingName,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <!--<if test="id != null">-->
@@ -86,6 +89,9 @@
       <if test="remark != null">
         #{remark,jdbcType=NVARCHAR},
       </if>
+      <if test="safekeepingName != null">
+        #{safekeepingName,jdbcType=NVARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.Archive_Master_Following">

src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp

@@ -224,6 +224,13 @@
                                                                                   maxlength="255"
                                                                                   id="recallReason"></textarea>
                     </div>
+                    <div class="form-group divCss8" id="safekeepingDiv">
+                        <label>封存选项 :</label>
+                        <select class="selectpicker bla bla bli" multiple data-live-search="true" name="safekeepingName"
+                                data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}" id="safekeepingName" title="请输入封存选项">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">
@@ -627,6 +634,22 @@
     }
 
 
+    function getSafekeeping(){
+        $.ajax({
+            url: "${path}/storage/getSafekeeping",
+            type: "POST",
+            success: function (result) {
+                if (result != null) {
+                    for (var i = 0; i < result.length; i++) {
+                        $("#safekeepingName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
+                    }
+                }
+                $('#safekeepingName').selectpicker('refresh');
+            }
+        })
+    }
+
+    getSafekeeping();
     function againRecallFun(id, archiveDetailId) {
         //生成表单token,防止表单重复提交
         setFormToken();
@@ -732,10 +755,11 @@
         var id = archiveDetailId;
         var StateFlag = $("#archivestate").html();
         var recallReason = $("#recallReason").val();
+        var safekeepingName = ''+$("#safekeepingName").val();
         $.ajax({
             url: "${path}/storage/updateState",
             type: "POST",
-            data: {"ArchiveState": "已封存", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken1").val(),ArchiveStateFlag:"0","StateFlag":StateFlag},
+            data: {"ArchiveState": "已封存", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken1").val(),ArchiveStateFlag:"0",safekeepingName:safekeepingName},
             success: function (result) {
                 //刷新
                 $('#table').bootstrapTable('refresh');

src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp

@@ -379,7 +379,12 @@
                             }
                             return a;
                         }
-
+                    },
+                    {
+                        title: '封存原因',
+                        field: 'safekeepingName',
+                        align: 'center',
+                        valign: 'middle',
                     }
                 ],
                 onLoadSuccess: function (result) {  //加载成功时执行