封存病案逻辑修改

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

@@ -174,13 +174,18 @@ public class lastVerifyController {
                     }
                     if(nurseFlagNum>0){
                         if (returnFlag!=1){
-                            archiveMaster.setCmtDoctor(0);
-                            archiveMaster.setDoctorName("");
-                            archiveMaster.setCmtDoctorDate("");
+                            archiveMaster.setCmtNurse(0);
+                            archiveMaster.setNurseName("");
+                            archiveMaster.setCmtNurseDate("");
                         }
-                        archiveMaster.setCmtNurse(0);
-                        archiveMaster.setNurseName("");
-                        archiveMaster.setCmtNurseDate("");
+//                        if (returnFlag!=1){
+//                            archiveMaster.setCmtDoctor(0);
+//                            archiveMaster.setDoctorName("");
+//                            archiveMaster.setCmtDoctorDate("");
+//                        }
+//                        archiveMaster.setCmtNurse(0);
+//                        archiveMaster.setNurseName("");
+//                        archiveMaster.setCmtNurseDate("");
                         //2021-01-30 following表中添加科主任退回护士长操作记录
                         archive_master_following.setFollowingType("6");
                         archive_master_following.setFollowingContent("科主任退回护士长");

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

@@ -83,7 +83,7 @@ public class signListController {
     @ResponseBody
     @RequestMapping(value = "/signList")
     public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
-        System.out.println("signListVo:::"+signListVo.getOperateName1());
+        System.out.println("signListVo:::" + signListVo.getOperateName1());
         response.setCharacterEncoding("utf-8");
         request.setCharacterEncoding("utf-8");
         //判断所有都为空则签收日期按当前日期
@@ -105,8 +105,8 @@ public class signListController {
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(HttpServletResponse response, Sign_List_Vo signListVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"病历清单id", "住院号", "住院次数", "名字",  "出院科室", "出院日期", "签收状态", "是否有纸质病历送病案室", "签收人", "签收日期", "签收次数"};
-        String[] fileNames = {"id", "inpNo", "visitId", "name",  "deptName", "dischargeDateTime", "c5", "isscaned", "c1", "dTime", "num"};
+        String[] header = {"病历清单id", "住院号", "住院次数", "名字", "出院科室", "出院日期", "签收状态", "是否有纸质病历送病案室", "签收人", "签收日期", "签收次数"};
+        String[] fileNames = {"id", "inpNo", "visitId", "name", "deptName", "dischargeDateTime", "c5", "isscaned", "c1", "dTime", "num"};
         //文件名
         String fileName = "纸质病历签收列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
@@ -117,13 +117,19 @@ public class signListController {
 
     @ResponseBody
     @RequestMapping(value = "/selSignByColm")
-    public OffsetLimitPage selSignByColm(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
-        response.setCharacterEncoding("utf-8");
-        request.setCharacterEncoding("utf-8");
-        OffsetLimitPage result = signListService.selSignByColm(signListVo, offset, limit);
+    public OffsetLimitPage selSignByColm(HttpServletRequest request, HttpServletResponse response, SignList signList, Integer offset, Integer limit) {
+        OffsetLimitPage result = signListService.selSignByColm(signList, offset, limit);
         return result;
     }
 
+    @Transactional
+    @ResponseBody
+    @RequestMapping(value = "/delotherId")
+    public String delotherId(HttpServletRequest request, HttpServletResponse response,String id) {
+        signListService.deleteSignListById(id);
+        return "取消签收成功!";
+    }
+
 
     @ResponseBody
     @RequestMapping(value = "/addSignList")
@@ -168,6 +174,10 @@ public class signListController {
                 signList.setCreatedtime(sdf.format(new Date()));
                 signList.setdTime(sdf.format(new Date()));
                 signList.setT1(sdf.format(new Date()));
+                Archive_Master archiveMaster = new Archive_Master();
+                archiveMaster.setIsSign(1);
+                archiveMaster.setId(master.get(0).getId());
+                int bol = archiveMasterService.updateByClo(archiveMaster);
                 int z = signListService.insertSignList(signList);
                 result = "签收成功";
             } else {
@@ -214,6 +224,9 @@ public class signListController {
             signList.setCreatedtime(sdf.format(new Date()));
             signList.setdTime(sdf.format(new Date()));
             signList.setT1(sdf.format(new Date()));
+            Archive_Master archiveMaster = new Archive_Master();
+            archiveMaster.setIsSign(1);
+            int bol = archiveMasterService.updateByClo(archiveMaster);
             signListService.insertSignList(signList);
             result = "签收成功";
         } else {
@@ -232,8 +245,6 @@ public class signListController {
     }*/
 
 
-
-
     @ResponseBody
     @RequestMapping(value = "/getFaultType")
     public List<Emr_Fault_Type> getFaultType(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws UnsupportedEncodingException {
@@ -435,6 +446,7 @@ public class signListController {
                         result = "无纸质，无需签收!";
                         return result;
                     } else {
+                        archiveMaster.setIsSign(0);
                         archiveMaster.setSigner(username);
                         archiveMaster.setSignTime(nowTime);
                     }
@@ -453,7 +465,7 @@ public class signListController {
                         followingType = "14";
                     }
                     //2021-05-13 following表中添加签收操作记录
-                   String handleName = user.getUserPosition();//姓名
+                    String handleName = user.getUserPosition();//姓名
                     Archive_Master_Following archive_master_following = new Archive_Master_Following();
                     archive_master_following.setMasterId(archiveMaster.getId());
                     archive_master_following.setFollowingType(followingType);
@@ -673,7 +685,7 @@ public class signListController {
 
     @ResponseBody
     @RequestMapping(value = "/collection")
-    public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum,String id,String pid) throws Exception {
+    public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum, String id, String pid) throws Exception {
         response.setCharacterEncoding("utf-8");
         request.setCharacterEncoding("utf-8");
         // 从session获取用户名
@@ -684,18 +696,18 @@ public class signListController {
 
         //新增ext表数据逻辑
         Archive_Master archive_master = archiveMasterService.selectById(id);
-        if (archive_master != null){
+        if (archive_master != null) {
             //查ext表有无任务
-            ArchiveOtherExt archiveOtherExtParm=new ArchiveOtherExt();
+            ArchiveOtherExt archiveOtherExtParm = new ArchiveOtherExt();
             archiveOtherExtParm.setMid(id);
             archiveOtherExtParm.setSysflag(-300);
             List<ArchiveOtherExt> extList = archiveOtherExtService.selectExtTaskIsExistOrNot(archiveOtherExtParm);
-            if (!extList.isEmpty() && extList.size()==1){
+            if (!extList.isEmpty() && extList.size() == 1) {
                 //有任务，则ext表更新statusFlag=0，对应C3-C8置空，T1-T6置空，其他不变
                 //1.statusFlag=0
                 extList.get(0).setStatusflag(0);
                 //2.对应C3-C8置空，T1-T6置空
-                switch (flagNum){
+                switch (flagNum) {
                     //体温单
                     case 1:
                         extList.get(0).setC5("");
@@ -728,20 +740,20 @@ public class signListController {
                         break;
                 }
                 archiveOtherExtService.updateByPrimaryKeySelective(extList.get(0));
-            }else if(extList.isEmpty()|| extList.size()<0){
+            } else if (extList.isEmpty() || extList.size() < 0) {
                 //无任务，则新增
                 OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(archive_master.getInpNo(), archive_master.getVisitId());
                 //V6医生最后完成时间
                 String doctorFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getFinishedDateTime());
                 //V6护士最后完成时间
                 String nurseFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getMrCommitNurseDateTime());
-                ArchiveOtherExt archiveOtherExt = new ArchiveOtherExt(IDHelper.NewID(),new Date(),"按需采集",0L,-300,date_1801,pid,
-                        archive_master.getInpNo(),date_1801,date_1801,0,"",id,archive_master.getVisitId(),
-                        doctorFinishedDateTime,nurseFinishedDateTime,"Done","Done","Done","Done","Done","Done","",archive_master.getName(),
-                        BigDecimal.valueOf(0.0000),BigDecimal.valueOf(0.0000),BigDecimal.valueOf(0.0000),
-                        date_1801,date_1801,date_1801,date_1801,date_1801,date_1801);
+                ArchiveOtherExt archiveOtherExt = new ArchiveOtherExt(IDHelper.NewID(), new Date(), "按需采集", 0L, -300, date_1801, pid,
+                        archive_master.getInpNo(), date_1801, date_1801, 0, "", id, archive_master.getVisitId(),
+                        doctorFinishedDateTime, nurseFinishedDateTime, "Done", "Done", "Done", "Done", "Done", "Done", "", archive_master.getName(),
+                        BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000), BigDecimal.valueOf(0.0000),
+                        date_1801, date_1801, date_1801, date_1801, date_1801, date_1801);
                 //对应C3-C8置空,T无需置空
-                switch (flagNum){
+                switch (flagNum) {
                     //体温单
                     case 1:
                         archiveOtherExt.setC5("");
@@ -768,7 +780,7 @@ public class signListController {
                         break;
                 }
                 archiveOtherExtService.insertSelective(archiveOtherExt);
-            }else{
+            } else {
                 //archive_Other_Ext表已经存在记录,且不只1条,删除多余或采集接口那边需要调整
                 return "同一个病案ID,ext表只允许1条数据!";
             }
@@ -778,39 +790,39 @@ public class signListController {
         Sign_List signList = new Sign_List();
         signList.setPid(pid);
         signList.setMasterID(id);
-        int num=0;
-        switch (flagNum){
+        int num = 0;
+        switch (flagNum) {
             //体温单
             case 1:
-                num=-401;
+                num = -401;
                 break;
             //护理记录
             case 2:
-                num=-402;
+                num = -402;
                 break;
             //首页
             case 3:
-                num=-403;
+                num = -403;
                 break;
             //医生文书
             case 4:
-                num=-404;
+                num = -404;
                 break;
             //评估单
             case 5:
-                num=-405;
+                num = -405;
                 break;
             //护士文书
             case 6:
-                num=-406;
+                num = -406;
                 break;
         }
         signList.setSysFlag(num);
         signList.setC5("0");
-        List<Sign_List> list=signListService.selectSignListWith(signList);
-        if(list!=null&&list.size()>0){
+        List<Sign_List> list = signListService.selectSignListWith(signList);
+        if (list != null && list.size() > 0) {
             return "当前采集计划已存在，请勿重复发起!";
-        }else{
+        } else {
             signList.setId(IDHelper.NewID());
             signList.setCreatedtime(sdf.format(new Date()));
             signList.setC1(username);

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

@@ -51,37 +51,37 @@ public class storageController {
 
     @ResponseBody
     @RequestMapping(value = "/StorageList")
-    public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response,Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+    public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
         OffsetLimitPage result = archiveMasterService.selectStorageByCol(archiveMasterVo, offset, limit);
         return result;
     }
 
     @ResponseBody
     @RequestMapping(value = "/exportExcelStorageList")
-    public void exportExcelStorageList(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception {
+    public void exportExcelStorageList(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"病历清单id","住院号","住院次数","名字","性别","入院科室","入院日期","出院科室","出院日期","状态","封存人","封存日期"};
-        String[] fileNames = {"id","inpNo","visitId","name","sex","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","archivestate","handleName","handleTime"};
+        String[] header = {"病历清单id", "住院号", "住院次数", "名字", "性别", "入院科室", "入院日期", "出院科室", "出院日期", "状态", "封存人", "封存日期"};
+        String[] fileNames = {"id", "inpNo", "visitId", "name", "sex", "deptAdmissionTo", "admissionDateTime", "deptName", "dischargeDateTime", "archivestate", "handleName", "handleTime"};
         //文件名
         String fileName = "病案封存列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list=archiveMasterService.selectStorageByCol(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectStorageByCol(archiveMasterVo);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
-        String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
+        String result = utils.exportExcelToFilePath(response, utils.listConvert(list));
     }
 
     @ResponseBody
     @RequestMapping(value = "/exportExcel")
-    public void exportExcel(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception {
+    public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"住院号","住院次数","名字","性别","撤回人","撤回时间","归档状态","状态"};
-        String[] fileNames = {"inpNo","visitId","name","sex","handleName","handleTime","archivestate","followingContent"};
+        String[] header = {"住院号", "住院次数", "名字", "性别", "撤回人", "撤回时间", "归档状态", "状态"};
+        String[] fileNames = {"inpNo", "visitId", "name", "sex", "handleName", "handleTime", "archivestate", "followingContent"};
         //文件名
         String fileName = "病案封存日志" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list=archiveMasterService.selectByFollowinglog(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByFollowinglog(archiveMasterVo);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
-        String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
+        String result = utils.exportExcelToFilePath(response, utils.listConvert(list));
     }
 
     /**
@@ -100,18 +100,18 @@ public class storageController {
         }
         response.setCharacterEncoding("utf-8");
         request.setCharacterEncoding("utf-8");
-        int bol =0;
-        String result="";
+        int bol = 0;
+        String result = "";
         //判断是否已经封存
-        if(StringUtils.isNotBlank(emrFaultDetail.getArchiveDetailId())) {
+        if (StringUtils.isNotBlank(emrFaultDetail.getArchiveDetailId())) {
             //判断病案是否已经封存
             Archive_Master_Following followingLastInfo = new Archive_Master_Following();
-            if(emrFaultDetail.getArchiveState().equals("已封存")){
+            if (emrFaultDetail.getArchiveState().equals("已封存")) {
                 followingLastInfo.setFollowingType("11");
-                result="请不要重复封装!";
-            }else{
+                result = "请不要重复封装!";
+            } else {
                 followingLastInfo.setFollowingType("12");
-                result="请不要重复取消封装!";
+                result = "请不要重复取消封装!";
             }
             followingLastInfo.setMasterId(emrFaultDetail.getArchiveDetailId());
             List<Archive_Master_Following> followingLastList = archiveMasterFollowingService.selLastByType(followingLastInfo);
@@ -131,9 +131,11 @@ public class storageController {
                 archiveMaster.setArchivestate(emrFaultDetail.getArchiveState());
                 archiveMaster.setCmtNurse(1);
                 archiveMaster.setCmtDoctor(1);
-                bol = archiveMasterService.updateByClo(archiveMaster);
+                if (!emrFaultDetail.getArchiveStateFlag().equals("1")) {
+                    bol = archiveMasterService.updateByClo(archiveMaster);
+                }
                 if (bol == 1) {
-                    if(archiveMaster.getArchivestate().equals("已封存")){
+                    if (archiveMaster.getArchivestate().equals("已封存")) {
                         archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId());
                         archiveMasterFollowing.setFollowingContent("病案封存");
                         archiveMasterFollowing.setFollowingType("11");
@@ -142,7 +144,7 @@ public class storageController {
                         archiveMasterFollowing.setHandleName(handleName);
                         archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason());
                         bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing);
-                    }else{// if (archiveMaster.getArchivestate().equals("已归档"))
+                    } else if (archiveMaster.getArchivestate().equals("已归档")) {// if (archiveMaster.getArchivestate().equals("已归档"))
                         archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId());
                         archiveMasterFollowing.setFollowingContent("病案取消封存");
                         archiveMasterFollowing.setFollowingType("12");
@@ -153,7 +155,17 @@ public class storageController {
                         bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing);
                     }
                 }
-            }else{
+                if (archiveMaster.getArchivestate().equals("再次封存")) {
+                    archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId());
+                    archiveMasterFollowing.setFollowingContent("病案再次封存");
+                    archiveMasterFollowing.setFollowingType("11");
+                    archiveMasterFollowing.setHandleTime(nowTime);
+                    archiveMasterFollowing.setHandleId(username);
+                    archiveMasterFollowing.setHandleName(handleName);
+                    archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason());
+                    bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing);
+                }
+            } else {
                 return result;
             }
         }
@@ -180,8 +192,6 @@ public class storageController {
     }
 
 
-
-
 }
  
 

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

@@ -44,7 +44,7 @@ public interface Sign_ListMapper {
      * @param id
      * @return
      */
-    int deleteSignListById(Integer id);
+    int deleteSignListById(String id);
 
     /**
      * 根据id查询记录
@@ -59,6 +59,12 @@ public interface Sign_ListMapper {
      */
     List<Sign_List> selSignByColm(Sign_List_Vo signListVo);
 
+
+    /**
+     * 查询纸质签收记录列表Vo
+     * @return
+     */
+    List<SignList> selSignByColm1(SignList signList);
     /**
      *
      * @param record

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

@@ -5,8 +5,17 @@ import java.math.BigDecimal;
 public class Emr_Fault_Detail {
     private Integer id;
 
+    private String ArchiveStateFlag;
     private Integer idPage;
 
+    public String getArchiveStateFlag() {
+        return ArchiveStateFlag;
+    }
+
+    public void setArchiveStateFlag(String archiveStateFlag) {
+        ArchiveStateFlag = archiveStateFlag;
+    }
+
     public Integer getIdPage() {
         return idPage;
     }

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

@@ -0,0 +1,63 @@
+/**
+ * Copyright (C), 2015-2019
+ * Author:   HJL
+ * Date:     2019/9/2 14:22
+ * Description:统计
+ */
+package com.emr.entity;
+
+import sun.rmi.runtime.Log;
+
+import java.math.BigDecimal;
+
+public class SignList {
+    private String id;
+    private String idtile;
+
+    public String getIdtile() {
+        return idtile;
+    }
+
+    public void setIdtile(String idtile) {
+        this.idtile = idtile;
+    }
+
+    private String masterID;
+
+    public String getdTime() {
+        return dTime;
+    }
+
+    public void setdTime(String dTime) {
+        this.dTime = dTime;
+    }
+
+    private String c1;
+    private String dTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getMasterID() {
+        return masterID;
+    }
+
+    public void setMasterID(String masterID) {
+        this.masterID = masterID;
+    }
+
+    public String getC1() {
+        return c1;
+    }
+
+    public void setC1(String c1) {
+        this.c1 = c1;
+    }
+}
+ 
+

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

@@ -82,10 +82,32 @@ public class Sign_List {
      */
     private Integer isSign;
 
+    private String endSignDate;
+
     public String getPid() {
         return pid;
     }
 
+    public String getEndSignDate() {
+        return endSignDate;
+    }
+
+    public void setEndSignDate(String endSignDate) {
+        this.endSignDate = endSignDate;
+    }
+
+    public String getStartSignDate() {
+        return startSignDate;
+    }
+
+    public void setStartSignDate(String startSignDate) {
+        this.startSignDate = startSignDate;
+    }
+
+    /**
+     * 签收开始日期
+     */
+    private String startSignDate;
     public void setPid(String pid) {
         this.pid = pid;
     }

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

@@ -56,7 +56,7 @@ public interface Sign_ListService {
      * @param
      * @return
      */
-    int deleteSignListById(Integer id);
+    int deleteSignListById(String id);
 
     /**
      * 删除
@@ -75,10 +75,19 @@ public interface Sign_ListService {
 
     /**
      * 根据条件查询纸质签收记录列表Vo分页
-     * @param signListVo
+     * @param signList
+     * @return
+     */
+    OffsetLimitPage selSignByColm(SignList signList, Integer offset, Integer limit);
+
+    /**
+     * 根据条件查询纸质签收记录列表Vo
+     * @param signList
      * @return
      */
-    OffsetLimitPage selSignByColm(Sign_List_Vo signListVo, Integer offset, Integer limit);
+    List<SignList> selSignByColm1(SignList signList);
+
+
 
 }
  

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

@@ -140,8 +140,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public List<Archive_Master_Vo> selectByLastByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit) {
-        //判断并设置查询是否打印权限
-        //setIdByPrintNum(archiveMasterVo);
+//        //判断并设置查询是否打印权限
+//        setIdByPrintNum(archiveMasterVo);
         //根据条件查询记录
         if(null != offset && null != limit) {
             PageHelper.offsetPage(offset, limit);
@@ -332,7 +332,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     }
                 }
                 String printNum = archiveMaster.getPrintNum();
-                if(StringUtils.isNotBlank(printNum) && "1".equals(printNum)){
+                if(StringUtils.isNotBlank(printNum) && !"0".equals(printNum)){
                     archiveMaster.setPrintNum("已打印");
                 }else{
                     archiveMaster.setPrintNum("未打印");

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

@@ -122,7 +122,7 @@ public class Sign_ListServiceImpl implements Sign_ListService {
     }
 
     @Override
-    public int deleteSignListById(Integer id) {
+    public int deleteSignListById(String id) {
         return signListMapper.deleteSignListById(id);
     }
 
@@ -161,13 +161,44 @@ public class Sign_ListServiceImpl implements Sign_ListService {
     }
 
     @Override
-    public OffsetLimitPage selSignByColm(Sign_List_Vo signListVo, Integer offset, Integer limit) {
+    public OffsetLimitPage selSignByColm(SignList signList, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
-        List<Sign_List> list= selSignByColm(signListVo);
+        List<SignList> list= selSignByColm1(signList);
         return new OffsetLimitPage((Page) list);
     }
 
 
+
+    @Override
+    public List<SignList> selSignByColm1(SignList signList) {
+        List<SignList> list=signListMapper.selSignByColm1(signList);
+        if(list!=null && list.size()>0){
+            //查询用户集合
+            JSONArray powerUsers = powerUserService.getPowerUserList("1");
+            List<Power_User_Dto> powerUserList = null;
+            if (!CollectionUtils.isEmpty(powerUsers)) {
+                //转换对象
+                powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
+            }
+            //遍历赋值
+            for (SignList signObj : list) {
+                if (null != powerUserList) {
+                    //获取签收人
+                    String singer = signObj.getC1();
+                    //遍历匹配工号赋值姓名
+                    for (Power_User_Dto powerUserDto : powerUserList) {
+                        String name = powerUserDto.getName();
+                        if (StringUtils.isNotBlank(singer) && powerUserDto.getUserName().equals(singer)) {
+                            signObj.setC1(name);
+                        }
+                    }
+                }
+                String id = signObj.getId();
+                signObj.setIdtile(id);
+            }
+        }
+        return list;
+    }
 }
  
 

src/main/resources/config/jdbc.properties

@@ -1,8 +1,8 @@
-POWER_IP=10.6.1.127
+POWER_IP=localhost
 jdbc.username=sa
-jdbc.password=docus@702
-dataBaseName=DB_PrivilegeManagement_GYFY
-POWER_PORT=9001
+jdbc.password=admin123
+dataBaseName=zj_record_new
+POWER_PORT=8082
 jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName}
 
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver

src/main/resources/mapper/Sign_ListMapper.xml

@@ -9,6 +9,7 @@
     <result column="createdtime" property="createdtime"/>
     <result column="otherInfo" property="otherInfo"/>
     <result column="masterID" property="masterID"/>
+    <result column="masterID" property="masterID"/>
     <result column="detailID" property="detailID"/>
     <result column="dTime" property="dTime"/>
     <result column="sysFlag" property="sysFlag"/>
@@ -77,6 +78,7 @@
           where  s.id in(
           (select top 1 id from archive_other a where a.pid=s.pid and a.masterID=s.masterID ORDER BY createdtime desc)
           )
+          and m.is_sign =1
           <if test="id != null  and id != ''"> and s.ID = #{id}</if>
           <if test="pid != null and pid != ''"> and s.pid = #{pid}</if>
           <choose>
@@ -164,7 +166,7 @@
     where ID = #{id}
   </select>
   <select id="selSignByColm" resultMap="BaseResultMap" parameterType="com.emr.entity.Sign_List_Vo">
-    select id,pid,CONVERT (VARCHAR (20),createdtime,120) createdtime,otherInfo,masterID,detailID,CONVERT (VARCHAR (20),dTime,120)  dTime,sysFlag,C1,C2,C3,C4,C5,N1,N2,N3,T1,T2,T3
+    select *
     from archive_other
     <where>
       1=1 and sysFlag = '1'
@@ -188,8 +190,19 @@
       order by createdtime desc
     </where>
   </select>
+    <select id="selSignByColm1" resultType="com.emr.entity.SignList" parameterType="com.emr.entity.SignList">
+        select id,c1,dTime
+        from archive_other
+        <where>
+            1=1 and sysFlag = '1'
+            <if test="masterID != null and masterID != ''">
+                and masterID=#{masterID,jdbcType=VARCHAR}
+            </if>
+            order by createdtime desc
+        </where>
+    </select>
 
-  <insert id="insertSignList" parameterType="Sign_List" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSignList" parameterType="Sign_List" useGeneratedKeys="true" keyProperty="id">
     insert into archive_other
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null  and id != ''">ID,</if>
@@ -266,9 +279,7 @@
     where ID = #{id}
   </update>
 
-  <delete id="deleteSignListById" parameterType="java.lang.Integer">
-        delete from archive_other where ID = #{id}
-    </delete>
+
 
   <delete id="deleteSignListByIds" parameterType="java.lang.String">
     delete from archive_other where ID in
@@ -276,6 +287,9 @@
       #{id}
     </foreach>
   </delete>
+    <delete id="deleteSignListById" parameterType="java.lang.String">
+        delete from archive_other where ID = #{id}
+    </delete>
 
 
 </mapper>

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -1375,6 +1375,7 @@
                 <button type="button" class="btn btn-primary btn-sm" id="nursBtn">确认</button>
             </div>
         </div>
+        
     </div>
 </div>
 
@@ -3819,7 +3820,7 @@
                         emrCmit: $("#emrCmit").val(),
                         bedNumber: $("#bedNumber").val(),
                         printNum:$("#printNum").val(),
-                        doctorInCharge2:doctorInCharge.toString()
+                        // doctorInCharge2:doctorInCharge.toString()
                     };
                     return temp;
                 },
@@ -4357,14 +4358,17 @@
                             if (redFlag == 0) {
                                 if (value == 1) {
                                     a = '<span style="color:orange;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
-                                } else {
+                                } else if (value !=1 &&row.nurseName==null) {
                                     a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
+                                }else {
+                                    a = '<span style="color:orange;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
                                 }
+
                             } else {
                                 //有缺陷显示红色
                                 if (value == 1) {
                                     //有缺陷显示红色
-                                    a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:orange;"></i><span style="color:red;">已提交</span>';
+                                    a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:orange;"></i><span style="color:#698B69;">已提交</span>';
                                 } else {
                                     a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
                                 }

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -3715,53 +3715,11 @@
                             return a;
                         }
                     },
-                    /*{
-                        title: '签收人',
-                        field: 'signer',
-                        align: 'left',
-                        visible: false,
-                        formatter: function (value, row, index) {
-                            var redFlag = row.numb;
-                            var a = "";
-                            if (value != null && value != "") {
-                                value = value.substring(0, 10);
-                            } else if (value == null) {
-                                value = "";
-                            } else {
-                                value = value;
-                            }
-                            if (redFlag == 0) {
-                                a = value;
-                            } else {
-                                //有缺陷显示红色
-                                a = '<span style="color:red;">' + value + '</span>';
-                            }
-                            return a;
-                        }
-                    },*/
                     {
                         title: '签收日期',
                         field: 'signTime',
                         align: 'center',
                         visible: false
-                        /*formatter: function (value, row, index) {
-                            var redFlag = row.numb;
-                            var a = "";
-                            if (value != null && value != "") {
-                                value = value.substring(0, 10);
-                            } else if (value == null) {
-                                value = "";
-                            } else {
-                                value = value;
-                            }
-                            if (redFlag == 0) {
-                                a = value;
-                            } else {
-                                //有缺陷显示红色
-                                a = '<span style="color:red;">' + value + '</span>';
-                            }
-                            return a;
-                        }*/
                     },
                     {
                         title: '是否扫描',
@@ -4112,7 +4070,7 @@
         if (row.id != null && row.id != "") {
             $.ajax({
                 url: "${path}/beHosp/getMaster",
-                type: "POST",
+                type: "get",
                 data: {"id": row.id},
                 success: function (result) {
                     if (result != null) {

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

@@ -235,6 +235,37 @@
 </div>
 
 
+
+
+<%--确认框--确认/取消封存--%>
+<div class="modal fade" id="exampleModal2" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content ">
+            <div class="modal-header2">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                        aria-hidden="true">×</span></button>
+                <h4 class="modal-title" id="exampleModalLabel2">再次封存信息修改</h4>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group ">
+                        <input id="formToken2" hidden>
+                        <input type="hidden" id="id2" name="id" value=""/><label hidden id="danganhao2"></label>
+                        <span style="vertical-align:top;">确认封存概述：</span><textarea rows="6" style="width:100%;"
+                                                                                        maxlength="255"
+                                                                                        id="recallReason3"></textarea>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
+                <button type="button" class="btn btn-primary btn-sm" id="stateBtn2">确认</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 </body>
 <script>
     var tipLoad = 1;
@@ -510,6 +541,7 @@
                     align: 'center',
                     valign: 'middle',
                     formatter: function (value, row, index) {
+                        var a="";
                         if (value == "未归档") {
                             a = '<span style="color:#c12e2a;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
                         } else if (value == "已归档") {
@@ -529,6 +561,9 @@
                         } else if (value == "主任退回") {
                             a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                         }
+                        else if (value == "再次封存") {
+                            a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        }
                         return a;
                     }
                 },
@@ -551,30 +586,15 @@
                     valign: 'middle',
                     width: 80, // 定义列的宽度，单位为像素px
                     formatter: function (value, row, index) {
-                        /*console.log(row);
-                        var url = window.location.href;
-                        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
-                        if (index != null && index != "" && index.indexOf("recall") != -1) {
-                            if (row.archivestate == "已封存" || row.archivestate == "已归档") {
-                                if (row.archivestate == "已封存") {
-                                    return '<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">取消封存 </button>';
-                                    //return '<button class="btn btn-warning btn-sm"  onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">已封存 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
-                                } else {
-                                    return '<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">封存 </button>';
-                                }
-                            } else {
-                                return '';
-                            }
-                        }*/
+                        var html = "";
                         //已封存
                         if (row.followingType+"" == "11") {
-                            return '<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.id + '\')">取消封存 </button>';
-                            //return '<button class="btn btn-warning btn-sm"  onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\')">已封存 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',\'' + row.recallReason + '\')">日志</button>';
+                            html = html +'<button class="btn btn-success btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.id + '\')">取消封存 </button>';
+                            html = html +'<button class="btn btn-warning btn-sm" onclick="againRecallFun(\'' + row.id + '\',\'' + row.id + '\')">再次封存 </button>';
                         } else {
-                            return '<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.id + '\')">封存 </button>';
+                            html = html +'<button class="btn btn-warning btn-sm" onclick="recallFun1(\'' + row.id + '\',\'' + row.id + '\')">封存 </button>';
                         }
-
-
+                     return html;
                     },
                     cellStyle: function (value, row, index) {
                         return {classes: 'success'}
@@ -606,6 +626,20 @@
         $("#danganhao").html(archiveDetailId);
     }
 
+
+    function againRecallFun(id, archiveDetailId) {
+        //生成表单token,防止表单重复提交
+        setFormToken();
+        $('#exampleModal2').modal({
+            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+            show: true//弹出对话框
+        });
+        $("#recallReason3").val("");
+        $("#danganhao2").html(archiveDetailId);
+    }
+
+
     function recallFun1(id, archiveDetailId) {
         //生成表单token,防止表单重复提交
         setFormToken();
@@ -674,7 +708,7 @@
         $.ajax({
             url: "${path}/storage/updateState",
             type: "POST",
-            data: {"ArchiveState": "已归档", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken").val()},
+            data: {"ArchiveState": "已归档", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken").val(),ArchiveStateFlag:"0"},
             success: function (result) {
                 //刷新
                 $('#table').bootstrapTable('refresh');
@@ -701,7 +735,35 @@
         $.ajax({
             url: "${path}/storage/updateState",
             type: "POST",
-            data: {"ArchiveState": "已封存", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken1").val()},
+            data: {"ArchiveState": "已封存", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken1").val(),ArchiveStateFlag:"0"},
+            success: function (result) {
+                //刷新
+                $('#table').bootstrapTable('refresh');
+                if (result == '1') {
+                    toastr.success("确认封存成功!");
+                } else {
+                    toastr.warning(result);
+                }
+            }, error: function () {
+                //刷新
+                toastr.error("封存异常!!")
+            }
+        });
+    });
+
+
+
+    $("#stateBtn2").click(function () {
+        $('#exampleModal2').modal('hide');  //手动关闭
+        var archiveDetailId = $("#danganhao2").html();
+        var visitId = $("#visitId").html();
+        var id = archiveDetailId;
+        var ArchiveState = $("#archivestate").html();
+        var recallReason = $("#recallReason3").val();
+        $.ajax({
+            url: "${path}/storage/updateState",
+            type: "POST",
+            data: {"ArchiveState": "再次封存", "archiveDetailId": archiveDetailId, recallReason: recallReason,formToken:$("#formToken1").val(),ArchiveStateFlag:"1"},
             success: function (result) {
                 //刷新
                 $('#table').bootstrapTable('refresh');

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

@@ -374,6 +374,8 @@
                                 a = '<span style="color: #c0c0c0;"><i class="fa fa-check-circle-o" aria-hidden="true"></i>'+value+'</span>';
                             } else if(value == "病案封存"){
                                 a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>'+value+'</span>';
+                            }else if (value == "病案再次封存"){
+                                a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>'+value+'</span>';
                             }
                             return a;
                         }

src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp

@@ -318,7 +318,7 @@
                                     <span>退回电子病历原因：</span>
                                 </div>
                                 <div class="contentDiv">
-                                    <textarea id="retrunContent" rows="3" style="width: 88%;" maxlength="128"></textarea>
+                                    <textarea id="retrunContent" rows="3" style="width: 88%;" maxlength="128" ></textarea>
                                 </div>
                             </div>
                         </div>
@@ -1152,6 +1152,7 @@
                                     $("#backContentLast").val("");
                                     //生成表单token,防止表单重复提交
                                     //多选
+                                    $('#retrunContent').val('病案室打回');
                                     $('#returnFlag').val(["0","1","2"]);
                                     $('#returnFlag').selectpicker('render');
                                     $('#returnFlag').selectpicker('refresh');