潮州人医快速借阅、快速归还

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

@@ -1,5 +1,6 @@
 package com.emr.controller;
 
+import com.emr.dto.FastBorrowingDto;
 import com.emr.entity.BatchApplyDetails;
 import com.emr.service.BatchApplyDetails.BatchApplyDetailsService;
 import com.emr.util.ExceptionPrintUtil;
@@ -9,6 +10,7 @@ import com.emr.vo.commomSearch.CommomVo;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -97,11 +99,8 @@ public class BatchApplyDetailsController {
         if (StringUtils.isBlank(batchBorrowingVo.getPatientIds())) {
             return Msg.fail("病案主键为空");
         }
-        int i = batchApplyDetailsService.addBatchBorrowing(batchBorrowingVo);
-        if (i == 0) {
-            return Msg.fail("批量申请保存失败");
-        }
-        return Msg.success("批量申请保存成功");
+        Msg msg = batchApplyDetailsService.addBatchBorrowing(batchBorrowingVo);
+        return msg;
     }
 
     /**
@@ -142,4 +141,87 @@ public class BatchApplyDetailsController {
     public int agreeById(String ids, Integer batchId) {
         return batchApplyDetailsService.agreeById(ids, batchId);
     }
+
+    /**
+     * @description: 快速归还接口
+     * @params: barCode
+     * @return: int
+     * @author linjj
+     * @date: 2023/12/27 17:05
+     */
+    @RequestMapping("updateReturn")
+    @ResponseBody
+    public int updateReturn(String barCode,String barCodeName) {
+        return batchApplyDetailsService.updateReturn(barCode,barCodeName);
+    }
+
+    /**
+     * @description: 快速借阅接口
+     * @params: FastBorrowingDto
+     * @return: Msg
+     * @author linjj
+     * @date: 2023/12/29 10:06
+     */
+    @RequestMapping("fastBorrowing")
+    @ResponseBody
+    public Msg fastBorrowing(FastBorrowingDto dto) {
+        if (null==dto.getEffeDays()) {
+            return Msg.BorrowingFail("申请天数不能为空！！");
+        }
+        if (StringUtils.isBlank(dto.getApplyType())) {
+            return Msg.BorrowingFail("申请类型不能为空！！");
+        }
+        if (StringUtils.isBlank(dto.getApplyReason())) {
+            return Msg.BorrowingFail("申请理由不能为空");
+        }
+        if (StringUtils.isBlank(dto.getBarCode())) {
+            return Msg.BorrowingFail("条形码不能为空");
+        }
+        return batchApplyDetailsService.addFastBorrowing(dto);
+    }
+
+
+    /**
+     * @description: 批次申请快速归还
+     * @params:  barCode
+     * @return:  barCodeName
+     * @author linjj
+     * @date: 2024/1/8 9:02
+     */
+    @RequestMapping("updateBatchApply")
+    @ResponseBody
+    public Msg updateBatchApply(String barCode,String barCodeName,Integer batchId){
+        if (StringUtils.isBlank(barCode)){
+            return Msg.BorrowingFail("条形码不能为空");
+        }
+        if (StringUtils.isBlank(barCodeName)){
+            return Msg.BorrowingFail("归还人工号不能为空");
+        }
+        return batchApplyDetailsService.updateBatchApply(barCode,barCodeName,batchId);
+    }
+    /**
+     * @description: 批次申请快速借阅
+     * @params: fastBatchApply
+     * @return:  FastBorrowingDto
+     * @author linjj
+     * @date: 2024/1/8 14:52
+     */
+    @RequestMapping("fastBatchApply")
+    @ResponseBody
+    public Msg fastBatchApply(FastBorrowingDto dto) {
+        if (null==dto.getEffeDays()) {
+            return Msg.BorrowingFail("申请天数不能为空！！");
+        }
+        if (StringUtils.isBlank(dto.getApplyType())) {
+            return Msg.BorrowingFail("申请类型不能为空！！");
+        }
+        if (StringUtils.isBlank(dto.getApplyReason())) {
+            return Msg.BorrowingFail("申请理由不能为空");
+        }
+        if (StringUtils.isBlank(dto.getBarCode())) {
+            return Msg.BorrowingFail("条形码不能为空");
+        }
+        return batchApplyDetailsService.fastBatchApply(dto);
+    }
+
 }

src/main/java/com/emr/controller/emrApprove/ApproveController.java

@@ -550,6 +550,7 @@ public class ApproveController {
         return ResultUtil.ok();
     }
 
+
     /**
      * @MethodName: exportExcelApplyList
      * @Description: 根据搜索条件导出excel,申请列表集合

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

@@ -0,0 +1,27 @@
+package com.emr.dao;
+
+import com.emr.vo.UpdateReturnVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @InterfaceName Archive_MasterMapper
+ * @Description 基础数据接口
+ * @Author linjj
+ * @Date 2023/12/27 17:09
+ * @Version 1.0
+ */
+@Mapper
+public interface Archive_MasterMapper {
+
+    /**
+     * @description: 根据条形id查询住院号住院次数
+     * @params:  barCode
+     * @return:  UpdateReturnVo
+     * @author linjj
+     * @date: 2023/12/27 17:11
+     */
+    List<UpdateReturnVo> getInpNoAndVisitIdByBarCode(@Param("barCode") String barCode);
+}

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

@@ -32,4 +32,14 @@ public interface BatchApplyDetailsMapper {
     int upadteApplyDetailsList(@Param("list") List<BatchApplyDetailsVo> list);
 
     String getEffectiveTime(@Param("ids") Integer ids,@Param("examineTimes") String examineTimes);
+
+
+    int getNumInpNoAndAdmissTimes(@Param("inpatientNo")String inpatientNo,@Param("admissTimes")int admissTimes,@Param("batchId")int batchId);
+
+
+    List<String> getIdInpNoAndAdmissTimes(@Param("inpatientNo")String inpatientNo,@Param("admissTimes")String admissTimes,@Param("batchId")int batchId);
+
+
+    int updateBatchApplyDetails(@Param("id")String id,@Param("userName")String userName,@Param("barCodeName")String barCodeName,@Param("returnTime")String returnTime);
+
 }

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

@@ -140,4 +140,6 @@ public interface CommomMapper {
 
     int selectAllMaster(@Param("inpatientNo")String inpatientNo,@Param("idCard")String idCar);
 
+    String getPatientIdByInpNoAndVisitId(@Param("inpNo")String inpNo,@Param("visitId")String visitId);
+
 }

src/main/java/com/emr/dao/approve/Emr_Apply_ApproveMapper.java

@@ -1,6 +1,7 @@
 package com.emr.dao.approve;
 
 import com.emr.entity.approve.Emr_Apply_Approve;
+import com.emr.vo.ApplyStateVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -82,4 +83,26 @@ public interface Emr_Apply_ApproveMapper {
      Emr_Apply_Approve selectByApplyerAndPatientId(@Param("userName")String userName,@Param("patientId")String patientId);
 
     List<String>expireTime(@Param("currentTime") String currentTime,@Param("effeDays") int effeDays);
+
+    /**
+     * @description: 根据住院号修改归还状态
+     * @author linjj
+     * @date: 2023/12/27 17:14
+     */
+    int UpdateReturnState(@Param("id") String id, @Param("returnName")String returnName, @Param("returnTime")String returnTime,
+                          @Param("returnNameString")String returnNameString);
+    /**
+     * @description: 查询是否有需要归还病历
+     * @author linjj
+     * @date: 2023/12/28 16:11
+     */
+    List<ApplyStateVo> getReturnState(@Param("inpNo") String inpNo, @Param("visitId") String visitId, @Param("userName")String userName);
+    /**
+     * @description: 快速借阅查收是否存在
+     * @params:
+     * @return:
+     * @author linjj
+     * @date: 2023/12/29 10:20
+     */
+    List<Emr_Apply_Approve> getApproverState(@Param("inpNo") String inpNo, @Param("visitId") String visitId, @Param("userName")String userName);
 }

src/main/java/com/emr/dto/FastBorrowingDto.java

@@ -0,0 +1,26 @@
+package com.emr.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName FastBorrowingDto
+ * @Description 快速借阅入参
+ * @Author linjj
+ * @Date 2023/12/29 10:03
+ * @Version 1.0
+ */
+@Data
+public class FastBorrowingDto {
+
+    private Integer effeDays;
+
+    private String applyType;
+
+    private String applyReason;
+
+    private String barCode;
+
+    private String userName;
+
+    private int batchId;
+}

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

@@ -28,4 +28,6 @@ public class BatchApply {
 
     //创建时间
     private String applyName;
+
+    private Integer readNums;
 }

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

@@ -49,5 +49,14 @@ public class BatchApplyDetails {
     private String examineName;
     //审批时间
     private String examineTime;
-
+    //归还人
+    private String returnName;
+    //归还人姓名
+    private String returnNameString;
+    //归还时间
+    private String returnTime;
+    //申请人姓名
+    private String handlingNameString;
+    //审批人姓名
+    private String examineNameString;
 }

src/main/java/com/emr/entity/approve/Emr_Apply_Approve.java

@@ -9,6 +9,16 @@ public class Emr_Apply_Approve {
 
     private String applyTime;
 
+    private String returnState;
+
+    public String getReturnState() {
+        return returnState;
+    }
+
+    public void setReturnState(String returnState) {
+        this.returnState = returnState;
+    }
+
     private String effeTime;
 
     private Integer effeDays;
@@ -262,4 +272,34 @@ public class Emr_Apply_Approve {
     public void setDisDate(Date disDate) {
         this.disDate = disDate;
     }
+
+    private String returnName;
+
+    private String returnTime;
+
+    private String returnNameString;
+
+    public String getReturnName() {
+        return returnName;
+    }
+
+    public void setReturnName(String returnName) {
+        this.returnName = returnName;
+    }
+
+    public String getReturnTime() {
+        return returnTime;
+    }
+
+    public void setReturnTime(String returnTime) {
+        this.returnTime = returnTime;
+    }
+
+    public String getReturnNameString() {
+        return returnNameString;
+    }
+
+    public void setReturnNameString(String returnNameString) {
+        this.returnNameString = returnNameString;
+    }
 }

src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java

@@ -1,7 +1,9 @@
 package com.emr.service.BatchApplyDetails;
 
+import com.emr.dto.FastBorrowingDto;
 import com.emr.entity.BatchApplyDetails;
 import com.emr.vo.BatchBorrowingVo;
+import com.emr.vo.Msg;
 import com.emr.vo.commomSearch.CommomVo;
 
 import java.util.List;
@@ -21,11 +23,19 @@ public interface BatchApplyDetailsService {
 
      List<BatchApplyDetails> getBatchApplyDetails(int batchId,String inpatientNo);
 
-     int addBatchBorrowing(BatchBorrowingVo batchBorrowingVo);
+     Msg addBatchBorrowing(BatchBorrowingVo batchBorrowingVo);
 
      int deleteById(int id,int batchId);
 
      int rejectById(int id);
 
      int agreeById(String ids,Integer batchId);
+
+     int updateReturn(String barCode,String barCodeName);
+
+     Msg addFastBorrowing(FastBorrowingDto dto);
+
+     Msg updateBatchApply(String barCode,String barCodeName,int batchId);
+
+     Msg fastBatchApply(FastBorrowingDto dto);
 }

src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java

@@ -1,19 +1,22 @@
 package com.emr.service.BatchApplyDetails;
 
-import com.emr.dao.BatchApplyDetailsMapper;
-import com.emr.dao.BatchApplyMapper;
-import com.emr.dao.EmrComomSetMapper;
-import com.emr.dao.Emr_DictionaryMapper;
+import com.emr.dao.*;
+import com.emr.dao.approve.Emr_Apply_ApproveMapper;
+import com.emr.dto.FastBorrowingDto;
 import com.emr.entity.*;
+import com.emr.entity.approve.Emr_Apply_Approve;
+import com.emr.service.CommomService;
+import com.emr.service.approve.ApplyApproveService;
 import com.emr.util.ListUtils;
 import com.emr.util.Setters;
-import com.emr.vo.BatchApplyDetailsVo;
-import com.emr.vo.BatchApplyVo;
-import com.emr.vo.BatchBorrowingVo;
+import com.emr.vo.*;
 import com.emr.vo.commomSearch.CommomVo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -39,6 +42,21 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
     BatchApplyDetailsMapper batchApplyDetailsMapper;
     @Autowired
     EmrComomSetMapper emrComomSetMapper;
+    @Autowired
+    Archive_MasterMapper archiveMasterMapper;
+    @Autowired
+    Emr_Apply_ApproveMapper emrApplyApproveMapper;
+    @Autowired
+    private Emr_Apply_ApproveMapper applyApproveMapper;
+    @Autowired
+    private CommomMapper commomMapper;
+    @Value("${applyApproveFlag}")
+    private String applyApproveFlag;
+    @Autowired
+    private ApplyApproveService applyApproveService;
+
+    @Autowired
+    private CommomService commomService;
 
     @Override
     public List<CommomVo> addCommomVo(CommomVo commomVo) {
@@ -47,7 +65,13 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
         convertDepartment(list);
         //当查询集合中只有一条记录时直接插入申请列表
         if (commomVo.getRefreshTable() == 1) {
+            //判断是否已经存在并且未过期
+            int i = batchApplyDetailsMapper.getNumInpNoAndAdmissTimes(list.get(0).getInpatientNo(), list.get(0).getAdmissTimes(), commomVo.getBatchId());
+            if (i == 0) {
                 addApplyDetails(list, commomVo.getBatchId(), commomVo.getApplyName());
+            } else {
+                list.get(0).setApplyStatc("住院号:" + list.get(0).getInpatientNo() + "住院次数:" + list.get(0).getAdmissTimes() + "已经申请且在有效期内,无需重复申请！！！");
+            }
         }
         return list;
     }
@@ -71,10 +95,21 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
     }
 
     @Override
-    public int addBatchBorrowing(BatchBorrowingVo batchBorrowingVo) {
+    public Msg addBatchBorrowing(BatchBorrowingVo batchBorrowingVo) {
         //查询患者基础数据
         List<CommomVo> commomList = batchApplyMapper.getCommomVoByPatientIds(batchBorrowingVo.getPatientIds());
-        return addApplyDetailsList(commomList, batchBorrowingVo);
+        //判断是否已经存在并且未过期
+        for (CommomVo list : commomList) {
+            int i = batchApplyDetailsMapper.getNumInpNoAndAdmissTimes(list.getInpatientNo(), list.getAdmissTimes(), batchBorrowingVo.getBatchId());
+            if (i > 0) {
+                return Msg.addBatchFail("住院号:" + list.getInpatientNo() + "住院次数:" + list.getAdmissTimes() + "已经申请且在有效期内,无需重复申请！！！");
+            }
+        }
+        int i = addApplyDetailsList(commomList, batchBorrowingVo);
+        if (i == 1) {
+            return Msg.addBatchSuccess("批量申请保存成功");
+        }
+        return Msg.addBatchFail("批量申请保存失败");
     }
 
     @Override
@@ -93,7 +128,8 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
         // 从session获取用户名
         Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
         BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo();
-        batchApplyDetailsVo.setExamineName(user.getUserPosition());
+        batchApplyDetailsVo.setExamineName(user.getUserName());
+        batchApplyDetailsVo.setExamineNameString(user.getUserPosition());
         batchApplyDetailsVo.setExamineTime(fmt.format(new Date()));
         batchApplyDetailsVo.setId(id);
         batchApplyDetailsVo.setApplyStatc(3);
@@ -116,7 +152,8 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
         //遍历审核信息
         for (Integer id : idsList) {
             BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo();
-            batchApplyDetailsVo.setExamineName(user.getUserPosition());
+            batchApplyDetailsVo.setExamineName(user.getUserName());
+            batchApplyDetailsVo.setExamineNameString(user.getUserPosition());
             batchApplyDetailsVo.setExamineTime(fmt.format(new Date()));
             batchApplyDetailsVo.setApplyStatc(1);
             batchApplyDetailsVo.setId(id);
@@ -133,6 +170,191 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
         return i;
     }
 
+    @Override
+    public int updateReturn(String barCode, String barCodeName) {
+        int i = 0;
+        Power_User user = new Power_User();
+        //获取系统当前时间
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ");
+        //获取登录用户信息
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        //不为空直接用barCodeName为空拿当前登录userName
+        if (StringUtils.isNotBlank(barCodeName)) {
+            user.setUserName(barCodeName);
+            String s = convertUserName(user.getUserName());
+            if (StringUtils.isBlank(s)) {
+                return i;
+            }
+            user.setUserPosition(s);
+        } else {
+            // 从session获取用户名
+            user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        }
+        List<UpdateReturnVo> inpNoAndVisitIdByBarCode = archiveMasterMapper.getInpNoAndVisitIdByBarCode(barCode);
+        //集合为空则返回2无需要归还病历
+        if (CollectionUtils.isEmpty(inpNoAndVisitIdByBarCode)) {
+            i = 2;
+            return i;
+        }
+        //查询是否有需要归还病历
+        for (UpdateReturnVo list : inpNoAndVisitIdByBarCode) {
+            List<ApplyStateVo> ids = emrApplyApproveMapper.getReturnState(list.getInpNo(), list.getVisitId(), user.getUserName());
+            //集合为空则返回2无需要归还病历
+            if (CollectionUtils.isEmpty(ids)) {
+                i = 2;
+                return i;
+            }
+            //需要归还病历id
+            ApplyStateVo applyStateVo = ids.get(ids.size() - 1);
+            //如果最后一条记录是已归还则不需要在次归还
+            if (StringUtils.isNotBlank(applyStateVo.getReturnState())) {
+                i = 2;
+                return i;
+            }
+            i = emrApplyApproveMapper.UpdateReturnState(applyStateVo.getId(), user.getUserName(), fmt.format(new Date()), user.getUserPosition());
+            return i;
+        }
+        return i;
+    }
+
+    @Override
+    public Msg addFastBorrowing(FastBorrowingDto dto) {
+        Power_User user = new Power_User();
+        //保存实体
+        Emr_Apply_Approve applyApprove = new Emr_Apply_Approve();
+        //获取系统当前时间
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ");
+        //获取登录用户信息
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        if (StringUtils.isNotBlank(dto.getUserName())) {
+            user.setUserName(dto.getUserName());
+        } else {
+            // 从session获取用户名
+            user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        }
+        //查询是否未过期
+        //根据条形码查询信息
+        List<UpdateReturnVo> list = archiveMasterMapper.getInpNoAndVisitIdByBarCode(dto.getBarCode());
+        //集合为空则返回无该条形码病历
+        if (CollectionUtils.isEmpty(list)) {
+            return Msg.BorrowingFail("无该条形码病历");
+        }
+        //查询patientId
+        String patientId = commomMapper.getPatientIdByInpNoAndVisitId(list.get(0).getInpNo(), list.get(0).getVisitId());
+        if (StringUtils.isBlank(patientId)) {
+            return Msg.BorrowingFail("无该条形码已归档病历");
+        }
+        //判断是否有未过期切未归还病历
+        List<Emr_Apply_Approve> approves = applyApproveMapper.getApproverState(list.get(0).getInpNo(), list.get(0).getVisitId(), user.getUserName());
+        if (!CollectionUtils.isEmpty(approves)) {
+            return Msg.BorrowingFail("该病案另一个申请还处于有效期，无须重复申请!");
+        }
+        //有效期是否过滤节假日
+        if (applyApproveFlag.equals("1")) {
+            SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd");
+            List<String> expireTimeList = applyApproveService.expireTime(fmt1.format(new Date()), applyApprove.getEffeDays());
+            String s = expireTimeList.get(expireTimeList.size() - 1);
+            applyApprove.setEffeTime(s);
+        } else {
+            Calendar calendar2 = Calendar.getInstance();
+            SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+            calendar2.add(Calendar.DATE, 3);
+            applyApprove.setEffeTime(sdf2.format(calendar2.getTime()));
+        }
+        applyApprove.setApplyer(user.getUserName());
+        applyApprove.setApplyTime(fmt.format(new Date()));
+        applyApprove.setEffeDays(dto.getEffeDays());
+        applyApprove.setApplyType(dto.getApplyType());
+        applyApprove.setApplyReason(dto.getApplyReason());
+        applyApprove.setApplyState("2");
+        applyApprove.setPatientId(patientId);
+        applyApprove.setAdmissId(list.get(0).getInpNo());
+        applyApprove.setInpatientNo(list.get(0).getInpNo());
+        applyApprove.setAdmissTimes(Short.parseShort(list.get(0).getVisitId()));
+        applyApprove.setDisDate(list.get(0).getDischargeDateTime());
+        int i = applyApproveMapper.insertSelective(applyApprove);
+        if (i == 1) {
+            return Msg.success("条形码" + dto.getBarCode() + "快速借阅成功");
+        }
+        return Msg.BorrowingFail("条形码" + dto.getBarCode() + "快速借阅失败");
+    }
+
+    @Override
+    public Msg updateBatchApply(String barCode, String barCodeName, int batchId) {
+        //转换用户名
+        String userName = convertUserName(barCodeName);
+        //获取系统当前时间
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ");
+        if (StringUtils.isBlank(userName)){
+            return Msg.BorrowingFail("该工号:" + barCodeName + "查询不到对应用户名");
+        }
+        //根据条形码查询病历
+        List<UpdateReturnVo> list = archiveMasterMapper.getInpNoAndVisitIdByBarCode(barCode);
+        //集合为空则未查询到该条形码病历
+        if (CollectionUtils.isEmpty(list)) {
+            return Msg.BorrowingFail("未查询到该条形码病历");
+        }
+        //根据条形码查询批量表需要归还病历
+        List<String> ids = batchApplyDetailsMapper.getIdInpNoAndAdmissTimes(list.get(0).getInpNo(), list.get(0).getVisitId(), batchId);
+        if (CollectionUtils.isEmpty(ids)) {
+            return Msg.BorrowingFail("该条形码:" + barCode + "无需要归还的病历");
+        }
+        int i = batchApplyDetailsMapper.updateBatchApplyDetails(ids.get(ids.size() - 1), userName, barCodeName, fmt.format(new Date()));
+        if (i==1){
+            return Msg.success("该条形码:" + barCode + "快速归还成功");
+        }
+        return Msg.BorrowingFail("该条形码:" + barCode + "快速归还失败");
+    }
+
+    @Override
+    public Msg fastBatchApply(FastBorrowingDto dto) {
+        //获取系统当前时间
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
+        //获取登录用户信息
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        // 从session获取用户名
+        Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        List<BatchApplyDetailsVo> NewList = Collections.synchronizedList(new ArrayList<>());
+        //根据条形码查询信息
+        List<UpdateReturnVo> updateReturnVo = archiveMasterMapper.getInpNoAndVisitIdByBarCode(dto.getBarCode());
+        //集合为空则返回无该条形码病历
+        if (CollectionUtils.isEmpty(updateReturnVo)) {
+            return Msg.BorrowingFail("无该条形码病历");
+        }
+        //判断是否已经借阅
+        for (UpdateReturnVo list:updateReturnVo){
+            int i = batchApplyDetailsMapper.getNumInpNoAndAdmissTimes(list.getInpNo(), Integer.parseInt(list.getVisitId()), dto.getBatchId());
+            if (i > 0) {
+                return Msg.addBatchFail("住院号:" + list.getInpNo() + "住院次数:" + list.getVisitId() + "已经申请且在有效期内,无需重复申请！！！");
+            }
+            //插入申请借阅详情集合
+            BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo();
+            batchApplyDetailsVo.setBatchId(dto.getBatchId());
+            batchApplyDetailsVo.setApplyName(dto.getUserName());
+            batchApplyDetailsVo.setApplyDate(user.getRemark());
+            batchApplyDetailsVo.setApplyTime(fmt.format(new Date()));
+            batchApplyDetailsVo.setEffectiveDay(dto.getEffeDays());
+            batchApplyDetailsVo.setInpatientNo(list.getInpNo());
+            batchApplyDetailsVo.setAdmissTimes(Short.parseShort(list.getVisitId()));
+            batchApplyDetailsVo.setPatientName(list.getName());
+            batchApplyDetailsVo.setDisTime(list.getDischargeDateTime().toString());
+            batchApplyDetailsVo.setApplyReason(dto.getApplyReason());
+            batchApplyDetailsVo.setApplyFlag(2);
+            batchApplyDetailsVo.setApplyStatc(2);
+            batchApplyDetailsVo.setHandlingName(user.getUserName());
+            batchApplyDetailsVo.setHandlingNameString(user.getUserPosition());
+            //将对象传入集合
+            NewList.add(batchApplyDetailsVo);
+        }
+        //同步数量
+        updateNum(dto.getBatchId(), NewList.size());
+        int i = batchApplyDetailsMapper.addBatchApplyDetails(NewList);
+        if (i==1){
+            return Msg.success("条形码:"+dto.getBarCode()+"快速借阅成功");
+        }
+        return Msg.BorrowingFail("条形码:"+dto.getBarCode()+"快速借阅成功");
+    }
+
     private void upDateAgreeNum(int batchId, int readNum) {
         BatchApplyVo batchApplyVo = batchApplyMapper.getreadNum(batchId);
         int i = readNum + batchApplyVo.getReadNum();
@@ -186,6 +408,7 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
             batchApplyDetailsVo.setApplyFlag(batchBorrowingVo.getApplyFlag());
             batchApplyDetailsVo.setApplyStatc(2);
             batchApplyDetailsVo.setHandlingName(user.getUserName());
+            batchApplyDetailsVo.setHandlingNameString(user.getUserPosition());
             //将对象传入集合
             list.add(batchApplyDetailsVo);
         }
@@ -238,6 +461,7 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
             batchApplyDetailsVo.setApplyReason("需要借阅这份病历");
             batchApplyDetailsVo.setApplyFlag(1);
             batchApplyDetailsVo.setApplyStatc(2);
+            batchApplyDetailsVo.setHandlingNameString(user.getUserPosition());
             List<BatchApplyDetailsVo> batchApplyDetailsList = Arrays.asList(batchApplyDetailsVo);
             batchApplyDetailsMapper.addBatchApplyDetails(batchApplyDetailsList);
             //新增时同步批次数量先获取原先数量
@@ -268,5 +492,25 @@ public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService {
         batchApplyMapper.updateBorrowingNum(i, batchId);
     }
 
+    //转换用户名
+    private String convertUserName(String userName) {
+        String userNameString = null;
+        //获取登录用户信息
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        //获取用户名
+        List<User> userList = null;
+        try {
+            userList = commomService.getUserList(userName, request);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        for (User user1 : userList) {
+            String name = user1.getName();
+            if (StringUtils.isNotBlank(userName) && user1.getUserName().equals(userName)) {
+                userNameString = name;
+            }
+        }
+        return userNameString;
+    }
 
 }

src/main/java/com/emr/service/batchApply/BatchApplyServiceImpl.java

@@ -7,6 +7,7 @@ import com.emr.entity.BatchApply;
 import com.emr.entity.BatchApplyDetails;
 import com.emr.entity.Emr_Dictionary;
 import com.emr.entity.Power_User;
+import com.emr.util.ListUtil;
 import com.emr.util.ListUtils;
 import com.emr.util.Setters;
 import com.emr.vo.BatchApplyDetailsVo;
@@ -54,7 +55,22 @@ public class BatchApplyServiceImpl implements BatchApplyService {
                 batchApplyVo.setCreateName(user.getUserName());
             }
         }
-        return batchApplyMapper.selectBatchApply(batchApplyVo);
+        List<BatchApply> batchApplies = batchApplyMapper.selectBatchApply(batchApplyVo);
+        for (BatchApply list:batchApplies){
+            //判断该批次审批状态
+            if (list.getReadNums()==0){
+                list.setStatc(0);
+                continue;
+            }
+            if (list.getReadNums()==list.getBorrowingNum()){
+                list.setStatc(2);
+                continue;
+            }
+            if (list.getReadNums()<list.getBorrowingNum()){
+                list.setStatc(3);
+            }
+        }
+        return batchApplies;
     }
 
     @Override

src/main/java/com/emr/util/ListUtil.java

@@ -0,0 +1,73 @@
+package com.emr.util;
+
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+public final class ListUtil {
+    public static <T, K> Map<K, T> toMap(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyMap();
+        Map<K, T> map = new HashMap<>(list.size());
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) map.put(key, t);
+        }
+        return map;
+    }
+
+    public static <T, K> Map<K, List<T>> groupBy(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyMap();
+        Map<K, List<T>> map = new HashMap<>();
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key == null) continue;
+            if (!map.containsKey(key)) {
+                map.put(key, new ArrayList<T>());
+            }
+            map.get(key).add(t);
+        }
+        return map;
+    }
+
+    public static <T, K> List<K> select(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        List<K> filedList = new ArrayList<>(list.size());
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) filedList.add(key);
+        }
+        return filedList;
+    }
+
+    public static <T, K> List<K> distinctSelect(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        Set<K> filedSet = new HashSet<>();
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) filedSet.add(key);
+        }
+        return new ArrayList<>(filedSet);
+    }
+
+    @SafeVarargs
+    public static <T> List<T> unionWithoutDuplicate(List<T>... values) {
+        if (null == values || values.length <= 0) return Collections.emptyList();
+        Set<T> unionFiledSet = new HashSet<>();
+        for (List<T> value : values) {
+            if (!CollectionUtils.isEmpty(value)) {
+                unionFiledSet.addAll(value);
+            }
+        }
+        return new ArrayList<>(unionFiledSet);
+    }
+
+    public static <T, K> List<T> skipDuplicateKey(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        List<T> filedList = new ArrayList<>(list.size());
+        Map<K, T> map = toMap(list, selector);
+        for (K key : map.keySet()) {
+            filedList.add(map.get(key));
+        }
+        return filedList;
+    }
+}

src/main/java/com/emr/util/ListUtils.java

@@ -29,6 +29,47 @@ public final class ListUtils {
         return map;
     }
 
+    public static <T> List<List<T>> partition(List<T> list, int size) {
+        if (list == null) {
+            throw new NullPointerException("List must not be null");
+        } else if (size <= 0) {
+            throw new IllegalArgumentException("Size must be greater than 0");
+        } else {
+            return new Partition(list, size);
+        }
+    }
+
+    private static class Partition<T> extends AbstractList<List<T>> {
+        private final List<T> list;
+        private final int size;
+
+        private Partition(List<T> list, int size) {
+            this.list = list;
+            this.size = size;
+        }
+
+        public List<T> get(int index) {
+            int listSize = this.size();
+            if (index < 0) {
+                throw new IndexOutOfBoundsException("Index " + index + " must not be negative");
+            } else if (index >= listSize) {
+                throw new IndexOutOfBoundsException("Index " + index + " must be less than size " + listSize);
+            } else {
+                int start = index * this.size;
+                int end = Math.min(start + this.size, this.list.size());
+                return this.list.subList(start, end);
+            }
+        }
+
+        public int size() {
+            return (int)Math.ceil((double)this.list.size() / (double)this.size);
+        }
+
+        public boolean isEmpty() {
+            return this.list.isEmpty();
+        }
+    }
+
     public static <T, K> List<K> select(List<T> list, FieldSelector<T, K> selector) {
         if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
         List<K> filedList = new ArrayList<>(list.size());

src/main/java/com/emr/vo/ApplyStateVo.java

@@ -0,0 +1,16 @@
+package com.emr.vo;
+
+import lombok.Data;
+
+/**
+ * @ClassName ApplyState
+ * @Author linjj
+ * @Date 2023/12/29 9:15
+ * @Version 1.0
+ */
+@Data
+public class ApplyStateVo {
+
+    private String id;
+    private String returnState;
+}

src/main/java/com/emr/vo/BatchApplyDetailsVo.java

@@ -49,4 +49,8 @@ public class BatchApplyDetailsVo {
     private String examineName;
     //审批时间
     private String examineTime;
+    //申请人姓名
+    private String handlingNameString;
+    //审批人姓名
+    private String examineNameString;
 }

src/main/java/com/emr/vo/Msg.java

@@ -66,12 +66,41 @@ public class Msg {
 	}
 
 	public static Msg success(String msg){
+		Msg result=new Msg();
+		result.setCode(200);
+		result.setMsg(msg);
+		return result;
+	}
+
+
+	public static Msg addBatchSuccess(String msg){
+		Msg result=new Msg();
+		result.setCode(200);
+		result.setMsg(msg);
+		return result;
+	}
+
+
+	public static Msg addBatchFail(String msg){
 		Msg result=new Msg();
 		result.setCode(100);
 		result.setMsg(msg);
 		return result;
 	}
 
+
+
+	public static Msg BorrowingFail(String msg){
+		Msg result=new Msg();
+		result.setCode(100);
+		result.setMsg(msg);
+		return result;
+	}
+
+
+
+
+
 	public Msg add(String key,Object value){
 		this.getExtend().put(key, value);
 		return this;

src/main/java/com/emr/vo/UpdateReturnVo.java

@@ -0,0 +1,23 @@
+package com.emr.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName updateReturnVo
+ * @Description 快速归还查询住院号、住院次数
+ * @Author linjj
+ * @Date 2023/12/27 17:08
+ * @Version 1.0
+ */
+@Data
+public class UpdateReturnVo {
+    private String inpNo;
+
+    private String visitId;
+
+    private Date dischargeDateTime;
+
+    private String name;
+}

src/main/java/com/emr/vo/commomSearch/CommomVo.java

@@ -11,8 +11,19 @@ public class CommomVo {
 
     private String name;//姓名
 
+
+    private String applyStatc;
+
     private String admissId;//住院号
 
+    public String getApplyStatc() {
+        return applyStatc;
+    }
+
+    public void setApplyStatc(String applyStatc) {
+        this.applyStatc = applyStatc;
+    }
+
     private String sex;//性别
 
     private String age;//年龄(岁)

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.emr.dao.Archive_MasterMapper">
+
+
+    <select id="getInpNoAndVisitIdByBarCode" resultType="com.emr.vo.UpdateReturnVo">
+        select inp_no,visit_id,discharge_date_time,name from archive_master where  bar_code=#{barCode}
+    </select>
+</mapper>

src/main/resources/mapper/BatchApplyDetailsMapper.xml

@@ -4,12 +4,12 @@
 
     <insert id="addBatchApplyDetails" parameterType="java.util.List">
         insert into batch_apply_details (batch_id,apply_name,apply_time,apply_reason,apply_flag,
-        apply_date,apply_statc,dis_time,effective_day,patient_name,inpatient_no,admiss_times,handling_name
+        apply_date,apply_statc,dis_time,effective_day,patient_name,inpatient_no,admiss_times,handling_name,handling_name_string
         )
         values
         <foreach collection="list" item="item" separator=",">(#{item.batchId},#{item.applyName},#{item.applyTime},
             #{item.applyReason},#{item.applyFlag},#{item.applyDate},#{item.applyStatc},
-            #{item.disTime},#{item.effectiveDay},#{item.patientName},#{item.inpatientNo},#{item.admissTimes},#{item.handlingName}
+            #{item.disTime},#{item.effectiveDay},#{item.patientName},#{item.inpatientNo},#{item.admissTimes},#{item.handlingName},#{item.handlingNameString}
             )
         </foreach>
     </insert>
@@ -31,6 +31,9 @@
             <if test="applyStatc != null">
                 apply_statc=#{applyStatc},
             </if>
+            <if test="examineNameString != null">
+                examine_name_string=#{examineNameString},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -57,6 +60,10 @@
             where id = #{item.id}
         </foreach>
     </update>
+    <update id="updateBatchApplyDetails">
+        update batch_apply_details set apply_statc=5,return_name=#{barCodeName},return_time=#{returnTime},return_name_string=#{userName}
+        where id=#{id}
+    </update>
 
 
     <delete id="deleteByBatchId">
@@ -84,4 +91,13 @@
             </if>
         </where>
     </select>
+    <select id="getNumInpNoAndAdmissTimes" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM batch_apply_details WHERE apply_statc !=3 AND effective_time>convert(varchar(10),getdate()-1,120)
+        AND inpatient_no=#{inpatientNo} AND admiss_times=#{admissTimes} AND  batch_id=#{batchId}
+    </select>
+    <select id="getIdInpNoAndAdmissTimes" resultType="java.lang.String">
+        SELECT id FROM batch_apply_details WHERE apply_statc !=3 and apply_statc !=2 and apply_statc!=5
+        AND inpatient_no=#{inpatientNo} AND admiss_times=#{admissTimes} AND  batch_id=#{batchId}
+    </select>
+
 </mapper>

src/main/resources/mapper/BatchApplyMapper.xml

@@ -68,7 +68,9 @@
 
 
     <select id="selectBatchApply" resultType="com.emr.entity.BatchApply">
-        select * from  batch_apply
+        select * ,
+        (SELECT COUNT(id)FROM batch_apply_details WHERE apply_statc in(1,5)  AND batch_id=batch_apply.id) readNums
+        from  batch_apply
         <where> 1=1
             <if test="batchName != null and batchName != ''">
                 and  batch_name=#{batchName}

src/main/resources/mapper/CommomMapper.xml

@@ -1320,6 +1320,9 @@
         </where>
         order by visit_id desc
     </select>
+    <select id="getPatientIdByInpNoAndVisitId" resultType="java.lang.String">
+        select patient_id from commomtable where inpatient_no=#{inpNo} and admiss_times=#{visitId}
+    </select>
     <!--修改病案备注-->
     <update id="updateRecordReMark" parameterType="com.emr.vo.commomSearch.CommomVo">
         update commomtable

src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml

@@ -19,6 +19,10 @@
         <result column="inpatient_no" property="inpatientNo" jdbcType="CHAR"/>
         <result column="admiss_times" property="admissTimes" jdbcType="SMALLINT"/>
         <result column="dis_date" property="disDate" jdbcType="TIMESTAMP"/>
+        <result column="return_state" property="returnState" jdbcType="VARCHAR"/>
+        <result column="return_name" property="returnName" jdbcType="VARCHAR"/>
+        <result column="return_time" property="returnTime" jdbcType="VARCHAR"/>
+        <result column="return_name_string" property="returnNameString" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
     id, applyer, apply_time, effe_time, effe_days, apply_type, apply_reason, apply_state, 
@@ -269,6 +273,8 @@
         AND
         approve_state != '2'
         AND
+        approver is not null
+        AND
         applyer = #{userName}
         <if test="patientId != null and patientId != ''">
             AND patient_id IN (${patientId})
@@ -322,7 +328,11 @@
         CASE WHEN effe_time &lt;= convert(varchar(10),getdate()-1,23) THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN
         '审核不通过' WHEN approve_state is null THEN '待审批' END approve_state,
         c.name,
-        CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus
+        CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,
+        return_state,
+        return_name,
+        return_time,
+        return_name_string
         FROM
         emr_apply_approve a
         LEFT JOIN
@@ -407,7 +417,11 @@
         CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN approve_state='2' THEN
         '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批' END approve_state,
         c.name,
-        CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus
+        CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,
+        return_state,
+        return_name,
+        return_time,
+        return_name_string
         FROM
         emr_apply_approve a
         LEFT JOIN
@@ -661,6 +675,11 @@
         </set>
         where id in (${idsStr})
     </update>
+    <update id="UpdateReturnState">
+        update emr_apply_approve set return_state='1',return_name=#{returnName},
+        return_time=#{returnTime},return_name_string=#{returnNameString}
+        where id=#{id}
+    </update>
     <select id="selectCountByApproveState" resultMap="BaseResultMap">
         SELECT *
         FROM
@@ -690,6 +709,30 @@
     <select id="expireTime" resultType="java.lang.String">
         SELECT top (${effeDays})  date FROM emr_holiday_set where date> #{currentTime} AND flag=1
     </select>
+    <select id="getReturnState" resultType="com.emr.vo.ApplyStateVo">
+        SELECT
+            id,return_state
+        FROM
+            emr_apply_approve
+        WHERE
+            applyer = #{userName}
+          AND inpatient_no = #{inpNo}
+          AND admiss_times=#{visitId}
+          AND approver is not null
+        ORDER BY
+            effe_time
+    </select>
+    <select id="getApproverState" resultType="com.emr.entity.approve.Emr_Apply_Approve">
+        SELECT patient_id
+        FROM emr_apply_approve
+        WHERE effe_time > convert(varchar (10), getdate() - 1, 120)
+        AND apply_state = '2'
+        AND approver is null
+        AND applyer = #{userName}
+        AND inpatient_no = #{inpNo}
+        AND admiss_times=#{visitId}
+        GROUP BY patient_id
+    </select>
 
 
 </mapper>

src/main/webapp/WEB-INF/views/approveManage/approveList/approveList174.jsp

@@ -22,68 +22,84 @@
         .mainDiv {
             background-color: #fff;
         }
+
         /**搜索区*/
         .searchDiv {
             padding-top: 5px;
             height: 30px;
         }
+
         .searchDiv1 {
             margin-top: 10px;
             height: 30px;
         }
+
         .tableDiv {
             width: 100%;
             background-color: #fff;
             margin-left: 1%;
             margin-top: -10px;
         }
+
         .dateSearchDiv {
             width: 29%;
         }
+
         .dateSearchInput {
             width: 30%;
             margin-left: 3%;
         }
+
         .dateLabelDiv {
             width: 30%;
             text-align: right;
         }
+
         .searchInput {
             width: 20%;
         }
+
         .searchElement {
             width: 40%;
         }
+
         .searchInputElement {
             width: 60%;
         }
+
         .labelDiv {
             padding-top: 4%;
             margin-left: 5px;
         }
+
         /**查询按钮组*/
         .btnsDiv {
             text-align: right;
             height: 30px;
             margin-right: 25px;
         }
+
         .btn {
             margin-left: 1%;
         }
+
         /**级联病案号内容*/
         .mouseOver {
             background-color: #708090;
             color: #FFFAFA;
         }
+
         .mouseOut {
             background-color: #FFFAFA;
             color: #000000;
         }
+
         /*模态框头*/
         .modal-header {
             background-color: #199ED8;
             text-align: center;
         }
+
         .loading {
             width: 160px;
             height: 56px;
@@ -136,10 +152,12 @@
                     <label class="labelDiv">申请日期：</label>
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间"
+                           autocomplete="off">
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间"
+                           autocomplete="off">
                 </div>
             </div>
             <div class="searchInput left">
@@ -179,14 +197,27 @@
             </div>
         </div>
         <div class="btnsDiv">
+            <shiro:hasPermission name="/approve/updateReturn">
+                <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myModal">快速归还</button>
+            </shiro:hasPermission>
+            <shiro:hasPermission name="/approve/updateReturn">
+                <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myBorrowing">快速借阅
+                </button>
+            </shiro:hasPermission>
             <shiro:hasPermission name="/approve/addApplyApprove">
-                <button type="button" class="btn btn-sm btn-warning btns" onclick="addApproves()" data-toggle="modal" data-target="#myModal5">  +  批量申请</button>
+                <button type="button" class="btn btn-sm btn-warning btns" onclick="addApproves()" data-toggle="modal"
+                        data-target="#myModal5"> + 批量申请
+                </button>
             </shiro:hasPermission>
             <shiro:hasPermission name="/approve/addApplyApprove">
-                <button type="button" class="btn btn-sm btn-warning btns" onclick="addApprove()" data-toggle="modal" data-target="#myModal3">  +  增加</button>
+                <button type="button" class="btn btn-sm btn-warning btns" onclick="addApprove()" data-toggle="modal"
+                        data-target="#myModal3"> + 增加
+                </button>
             </shiro:hasPermission>
             <shiro:hasPermission name="/approve/deleteApproveById">
-                <button type="button" class="btn btn-sm btn-primary btns" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
+                <button type="button" class="btn btn-sm btn-primary btns" onclick="exportExcel()"><i
+                        class="fa fa-reply"></i>导出
+                </button>
             </shiro:hasPermission>
         </div>
         <!--数据表格-->
@@ -196,6 +227,78 @@
         </div>
     </div>
 </div>
+<%--快速归还弹窗--%>
+<div class="modal fade" id="myModal" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速归还
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="barCodeReturnTable">
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeReturn">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyForm()">取消</button>
+                <button type="button" class="btn btn-primary" onclick="updateReturn()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<%--快速借阅弹窗--%>
+<div class="modal fade" id="myBorrowing" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速借阅
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="borrowingTable">
+                    <div class="form-group">
+                        <label class="col-form-label">申请天数:</label>
+                        <input type="text" autofocus class="form-control" id="effeDaysBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请类型：</label>
+                        <select class="form-control" id="applyTypeBorrowing" name="applyTypeBorrowing">
+                        </select>
+                        <div class="col-sm-1"></div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请理由:</label>
+                        <input type="text" autofocus class="form-control" id="applyReasonBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeBorrowing">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyBorrowingForm()">取消</button>
+                <button type="button" class="btn btn-primary" onclick="fastBorrowing()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <!-- 模态框3（Modal）添加 -->
 <div class="modal fade" id="myModal3" tabindex="-1" role="dialog" aria-labelledby="myModalLabe3" aria-hidden="true">
     <div class="modal-dialog">
@@ -217,7 +320,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime" maxlength="10" autocomplete="off">
+                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime"
+                                       maxlength="10" autocomplete="off">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -226,7 +330,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" name="effeDays" id="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" name="effeDays" id="effeDays"
+                                       oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -255,7 +360,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请原因：</label>
                             <div class="col-sm-7">
-                                <textarea class="form-control input-sm input" id="applyReason" name="applyReason" maxlength="250"></textarea>
+                                <textarea class="form-control input-sm input" id="applyReason" name="applyReason"
+                                          maxlength="250"></textarea>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -274,7 +380,10 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">病案号：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="inpatientNo" id="inpatientNo" onkeyup="getInpatientNoContents('inpatientNo')" onfocus="getInpatientNoContents('inpatientNo')" onblur="clearContent('inpatientNo')" maxlength="16">
+                                <input type="text" class="form-control input-sm input" name="inpatientNo"
+                                       id="inpatientNo" onkeyup="getInpatientNoContents('inpatientNo')"
+                                       onfocus="getInpatientNoContents('inpatientNo')"
+                                       onblur="clearContent('inpatientNo')" maxlength="16">
                                 <div id="inpatientNoDiv">
                                     <table id="inpatientNoContent_table" bgcolor="#FFFAFA" border="0"
                                            cellspacing="0" cellpadding="0">
@@ -289,7 +398,9 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">患者姓名：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="name" id="name" onkeyup="getNameContents('name')" onfocus="getNameContents('name')" onblur="clearContent('name')" maxlength="16">
+                                <input type="text" class="form-control input-sm input" name="name" id="name"
+                                       onkeyup="getNameContents('name')" onfocus="getNameContents('name')"
+                                       onblur="clearContent('name')" maxlength="16">
                                 <div id="nameDiv">
                                     <table id="nameContent_table" bgcolor="#FFFAFA" border="0"
                                            cellspacing="0" cellpadding="0">
@@ -304,7 +415,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">住院次数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" min="1" name="admissTimes" id="admissTimes" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" min="1" name="admissTimes"
+                                       id="admissTimes" oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -313,9 +425,16 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">出院日期：</label>
                             <div class="col-sm-7">
-                                <div class="col-sm-5" style="padding: 0!important"><input type="text" class="form-control input-sm input" id="startTime2" name="startTime2" autocomplete="off"></div>
+                                <div class="col-sm-5" style="padding: 0!important"><input type="text"
+                                                                                          class="form-control input-sm input"
+                                                                                          id="startTime2"
+                                                                                          name="startTime2"
+                                                                                          autocomplete="off"></div>
                                 <div class="col-sm-1">-</div>
-                                <div class="col-sm-5" style="padding: 0!important"><input type="text" class="form-control input-sm input"  id="endTime2" name="endTime2" autocomplete="off"></div>
+                                <div class="col-sm-5" style="padding: 0!important"><input type="text"
+                                                                                          class="form-control input-sm input"
+                                                                                          id="endTime2" name="endTime2"
+                                                                                          autocomplete="off"></div>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -343,7 +462,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime5" maxlength="10" autocomplete="off">
+                                <input type="text" class="form-control input-sm input" name="effeTime" id="effeTime5"
+                                       maxlength="10" autocomplete="off">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -352,7 +472,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input"  name="effeDays" id="effeDays5" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" name="effeDays" id="effeDays5"
+                                       oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -381,7 +502,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请原因：</label>
                             <div class="col-sm-7">
-                                <textarea class="form-control input-sm input" id="applyReason5" name="applyReason" maxlength="250"></textarea>
+                                <textarea class="form-control input-sm input" id="applyReason5" name="applyReason"
+                                          maxlength="250"></textarea>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -397,7 +519,9 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">下载模板：</label>
                             <div class="col-sm-7">
-                                <button type="button" class="btn btn-sm btn-primary" onclick="window.open('${path }/static/js/template/借阅申请模板.xls');">下载模板</button>
+                                <button type="button" class="btn btn-sm btn-primary"
+                                        onclick="window.open('${path }/static/js/template/借阅申请模板.xls');">下载模板
+                                </button>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -434,7 +558,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" readonly id="effeTime1" maxlength="10" autocomplete="off">
+                                <input type="text" class="form-control input-sm input" readonly id="effeTime1"
+                                       maxlength="10" autocomplete="off">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -506,7 +631,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label collectLabel">住院次数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" min="1" readonly id="admissTimes1">
+                                <input type="number" class="form-control input-sm input" min="1" readonly
+                                       id="admissTimes1">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>

src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp

@@ -33,10 +33,19 @@
             height: 30px;
         }
 
+        .searchDiv2 {
+            padding-top: 3%;
+            height: 30px;
+        }
+
         .tableDiv {
             width: 100%;
             background-color: #fff;
             margin-left: 1%;
+            transform:translateY(8%);/**下移元素**/
+            -ms-transform:translateY(8%);
+            -webkit-transform:translateY(8%);
+
         }
 
         .dateSearchDiv {
@@ -80,6 +89,7 @@
             margin-right: 5px;
             margin-left: 10px;
         }
+
         /**批准驳回按钮组*/
         .approveBtns {
             margin-left: 110px;
@@ -118,10 +128,12 @@
                     <label class="labelDiv">申请日期：</label>
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间"
+                           autocomplete="off">
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间"
+                           autocomplete="off">
                 </div>
             </div>
             <div class="searchInput left">
@@ -162,10 +174,12 @@
                     <label class="labelDiv">审批日期：</label>
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="startTime2" placeholder="开始时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="startTime2" placeholder="开始时间"
+                           autocomplete="off">
                 </div>
                 <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="endTime2" placeholder="结束时间" autocomplete="off">
+                    <input type="text" class="form-control input-sm" id="endTime2" placeholder="结束时间"
+                           autocomplete="off">
                 </div>
             </div>
             <div class="searchInput left">
@@ -178,11 +192,27 @@
             </div>
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
+            </div>
+        </div>
+        <div class="searchDiv2">
+            <div class="btnsDiv">
                 <shiro:hasPermission name="/approve/updateApprove">
-                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning" onclick="addApprovesMore()">  +  批量审批</button>
+                    <button id="addApprovesMore" type="button" class="btn btn-sm btn-warning"
+                            onclick="addApprovesMore()">批量审批
+                    </button>
                 </shiro:hasPermission>
                 <shiro:hasPermission name="/approve/exportExcelApproveList">
-                    <button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
+                    <button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i
+                            class="fa fa-reply"></i>导出
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="/approve/updateReturn">
+                    <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myModal">快速归还
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="/approve/updateReturn">
+                    <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myBorrowing">快速借阅
+                    </button>
                 </shiro:hasPermission>
             </div>
         </div>
@@ -222,7 +252,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" id="effeTime" name="effeTime" autocomplete="off">
+                                <input type="text" class="form-control input-sm input" id="effeTime" name="effeTime"
+                                       autocomplete="off">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -231,7 +262,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays" oninput="if(value.length>4)value=value.slice(0,4)">
+                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays"
+                                       oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -343,18 +375,22 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">批注：</label>
                             <div class="col-sm-7">
-                                <textarea class="form-control input-sm input" id="moreApproveNotes" name="approveNotes" maxlength="250"></textarea>
+                                <textarea class="form-control input-sm input" id="moreApproveNotes" name="approveNotes"
+                                          maxlength="250"></textarea>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
                     </div>
                     <div class="">
-                        <button type="button" class="btn btn-sm btn-primary approveBtns" onclick="moreAdd(1)">批准</button>
-                        <button type="button" class="btn btn-sm btn-danger approveBtns" onclick="moreAdd(2)">驳回</button>
+                        <button type="button" class="btn btn-sm btn-primary approveBtns" onclick="moreAdd(1)">批准
+                        </button>
+                        <button type="button" class="btn btn-sm btn-danger approveBtns" onclick="moreAdd(2)">驳回
+                        </button>
                     </div>
                 </form>
                 <div id="tabDiv" style="height: 490px;overflow: auto;">
-                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0" cellpadding="0">
+                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0"
+                           cellspacing="0" cellpadding="0">
                         <caption>所选批量审批信息</caption>
                         <thead>
                         <tr>
@@ -399,6 +435,87 @@
         </div>
     </div>
 </div>
+
+
+<%--快速归还弹窗--%>
+<div class="modal fade" id="myModal" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速归还
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="barCodeReturnTable">
+                    <div class="form-group">
+                        <label class="col-form-label">归还人:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeName">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeReturn">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyForm()">取消</button>
+                <button type="button" class="btn btn-primary" onclick="updateReturn()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<%--快速借阅弹窗--%>
+<div class="modal fade" id="myBorrowing" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速借阅
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="borrowingTable">
+                    <div class="form-group">
+                        <label class="col-form-label">申请天数:</label>
+                        <input type="text" autofocus class="form-control" id="effeDaysBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请类型：</label>
+                        <select class="form-control" id="applyTypeBorrowing" name="applyTypeBorrowing">
+                        </select>
+                        <div class="col-sm-1"></div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请理由:</label>
+                        <input type="text" autofocus class="form-control" id="applyReasonBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请人工号:</label>
+                        <input type="text" autofocus class="form-control" id="applyUserName">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeBorrowing">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyBorrowingForm()">取消
+                </button>
+                <button type="button" class="btn btn-primary" onclick="fastBorrowing()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
     $(function () {
         $(".modal-dialog").draggable();//为模态对话框添加拖拽

src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp

@@ -173,7 +173,7 @@
                 </h4>
             </div>
             <div class="modal-body">
-                <form>
+                <form id="borrowingTable">
                     <div class="form-group">
                         <label for="batchName" class="col-form-label">批次名称:</label>
                         <input type="text" autofocus class="form-control" id="batchNotes">
@@ -185,7 +185,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyBorrowingForm()">取消</button>
                 <button type="button" class="btn btn-primary" onclick="insertBatch()">确定</button>
             </div>
         </div>

src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp

@@ -2,6 +2,7 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
 <%@ include file="/WEB-INF/jspf/common.jspf" %>
+<%@taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
 <html lang="en">
 <head>
     <meta charset="utf-8"/>
@@ -136,7 +137,9 @@
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
                 <button type="button" class="btn btn-sm btn-primary" onclick="empty()">清空</button>
-                <button class="btn btn-sm btn-warning btns" id="borrowings" data-toggle="modal" data-target="#borrowingModal" onclick="addApprovesMore()">批量添加</button>
+                <button class="btn btn-sm btn-warning btns" id="borrowings" data-toggle="modal"
+                        data-target="#borrowingModal" onclick="addApprovesMore()">批量添加
+                </button>
             </div>
         </div>
         <div class="searchDiv1">
@@ -158,7 +161,8 @@
 </div>
 
 <!-- 模态框1（Modal）借阅申请 -->
-<div class="modal fade" id="borrowingModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="borrowingModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -202,7 +206,8 @@
                     </div>
                 </form>
                 <div id="tabDiv" style="height: 490px;overflow: auto;">
-                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0" cellpadding="0">
+                    <table id="moreApproveTable" class="table table-striped" bgcolor="#FFFAFA" border="0"
+                           cellspacing="0" cellpadding="0">
                         <caption>所选批量申请借阅信息</caption>
                         <thead>
                         <tr>
@@ -230,23 +235,8 @@
     </div>
 </div>
 
-<!--申请借阅列表-->
-<%--<div class="main">--%>
-<%--    <div class="headDiv">--%>
-<%--        <div class="headSpanDiv">--%>
-<%--             <span class="headspan">--%>
-<%--                申请借阅列表--%>
-<%--            </span>--%>
-<%--        </div>--%>
-<%--    </div>--%>
-<%--    <div class="mainDiv">--%>
-<%--        --%>
-<%--        <div id="borrowingDiv" class="table-responsive tableDiv">--%>
-<%--            <table id="borrowingTab" class="table text-nowrap table-bordered">--%>
-<%--            </table>--%>
-<%--        </div>--%>
-<%--    </div>--%>
-<%--</div>--%>
+
+<%--------------------------------------------------------------------------<申请借阅列表>-------------------------------------------------------%>
 
 
 <div class="main">
@@ -272,7 +262,17 @@
             <div class="btnsDiv">
                 <button type="button" class="btn btn-sm btn-primary" onclick="refreshBorrowingTab()">查询</button>
                 <button type="button" class="btn btn-sm btn-primary" onclick="borrowingEmpty()">清空</button>
-                <button class="btn btn-sm btn-warning btns" id="addApprove" data-toggle="modal" data-target="#approveModal" onclick="batchApprove()">批量审核</button>
+                <shiro:hasPermission name="/approve/updateReturn">
+                    <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myModal">快速归还
+                    </button>
+                </shiro:hasPermission>
+                <shiro:hasPermission name="/approve/updateReturn">
+                    <button class="btn btn-sm btn-warning btns" data-toggle="modal" data-target="#myBorrowing">快速借阅
+                    </button>
+                </shiro:hasPermission>
+                <button class="btn btn-sm btn-warning btns" id="addApprove" data-toggle="modal"
+                        data-target="#approveModal" onclick="batchApprove()">批量审核
+                </button>
             </div>
         </div>
         <div id="borrowingDiv" class="table-responsive tableDiv">
@@ -297,7 +297,8 @@
             </div>
             <div class="modal-body">
                 <div id="approveTabDiv" style="height: 490px;overflow: auto;">
-                    <table id="approveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0" cellpadding="0">
+                    <table id="approveTable" class="table table-striped" bgcolor="#FFFAFA" border="0" cellspacing="0"
+                           cellpadding="0">
                         <caption>所选批量审核信息</caption>
                         <thead>
                         <tr>
@@ -326,6 +327,84 @@
 </div>
 
 
+<%--快速归还弹窗--%>
+<div class="modal fade" id="myModal" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速归还
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="barCodeReturnTable">
+                    <div class="form-group">
+                        <label class="col-form-label">归还人:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeName">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeReturn">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyForm()">取消</button>
+                <button type="button" class="btn btn-primary" onclick="updateReturn()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<%--快速借阅弹窗--%>
+<div class="modal fade" id="myBorrowing" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <font size="30">&times;</font>
+                </button>
+                <h4 class="modal-title" style="font-weight: bold">
+                    快速借阅
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form onsubmit="return false;" id="borrowingTable">
+                    <div class="form-group">
+                        <label class="col-form-label">申请天数:</label>
+                        <input type="text" autofocus class="form-control" id="effeDaysBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请类型：</label>
+                        <input type="text" class="form-control input-sm input" id="applyTypeBorrowing"
+                               name="applyTypeBorrowing" ovalue="2" placeholder="纸质申请" readonly="readonly">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请理由:</label>
+                        <input type="text" autofocus class="form-control" id="applyReasonBorrowing">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">申请人工号:</label>
+                        <input type="text" autofocus class="form-control" id="applyUserName">
+                    </div>
+                    <div class="form-group">
+                        <label class="col-form-label">条形码:</label>
+                        <input type="text" autofocus class="form-control" id="barCodeBorrowing">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="emptyBorrowingForm()">取消
+                </button>
+                <button type="button" class="btn btn-primary" onclick="fastBorrowing()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 
 <script src="${path}/static/js/batchApply/batchApplyDetails.js?t=2021-08-20"></script>

src/main/webapp/static/js/approveManage/approveList/approveList174.js

@@ -7,6 +7,8 @@ $(function () {
     loadSelect(path + '/approve/loadType', 'searchApplyType', 'applyType');
     //加载申请类型
     loadSelect(path + '/approve/loadType', 'applyType5', '');
+    //加载申请类型
+    loadSelect(path + '/approve/loadType', 'applyTypeBorrowing', '');
 })
 
 var pageNumber;
@@ -40,7 +42,7 @@ $('#mytab').bootstrapTable({
     paginationPreText: '上一页',
     paginationNextText: '下一页',
     pageNumber: 1,                       //初始化加载第一页，默认第一页
-    pageSize: 5,                       //每页的记录行数（*）
+    pageSize: 10,                       //每页的记录行数（*）
     pageList: [5, 10, 15, 20, 30, 50],//可供选择的每页的行数（*）
     height: $(window).height() - 134,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns: [
@@ -126,7 +128,12 @@ $('#mytab').bootstrapTable({
             title: '审批状态',
             field: 'approveState',
             formatter: function (value, row, index) {
+                var returnState = row.returnState;
                 var spanValue;
+                if (returnState == '1') {
+                    spanValue = '<p class="text-success">已归还</p>';
+                    return spanValue;
+                }
                 if (value == '已过期') {
                     spanValue = '<p class="text-danger">已过期</p>';
                 } else if (value == '待审批') {
@@ -143,10 +150,18 @@ $('#mytab').bootstrapTable({
             title: '批注内容',
             field: 'approveNotes',
         },
+        {
+            title: '归还人',
+            field: 'returnNameString',
+        },
+        {
+            title: '归还时间',
+            field: 'returnTime',
+        },
         {
             title: '操作',
             formatter: function (value, row, index) {
-                var patientId = "'" + row.patientId + "'";
+                var returnState = row.returnState;
                 var editanddrop = '';
                 var addOper = row.addOper;
                 var updateOper = row.updateOper;
@@ -165,7 +180,7 @@ $('#mytab').bootstrapTable({
                         }
                     }
                     if (row.applyState == '已提交') {
-                        if(row.approveState == '审核通过'){
+                        if (row.approveState == '审核通过' && returnState !== "1") {
                             editanddrop += '<a type="button" href="' + path + '/commom/showRecord174?patientId=' + row.patientId + '" class="btn btn-danger TableView btn-sm" target="_blank">查看详情</a>';
                         } else {
                             //已提交，提供查看
@@ -224,8 +239,7 @@ $('#mytab').bootstrapTable({
     onCheckAll: function (rows) {
         $("#checks").val("");
         var checks = '';
-        for(var i=0;i<rows.length;i++)
-        {
+        for (var i = 0; i < rows.length; i++) {
             checks += "'" + rows[i].id + "',"
         }
         $("#checks").val(checks);
@@ -491,3 +505,103 @@ function exportExcel(){
         })
     }
 }
+
+//快速归还
+function updateReturn() {
+    var barCode = $("#barCodeReturn").val();
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/updateReturn',
+        data: {barCode: barCode},
+        dataType: 'json',
+        success: function (data) {
+            if (data == 0) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.warning("归还失败,查询不到病历!");
+            }
+            if (data == 2) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.warning("查询不到需要归还病历!");
+            }
+            if (data == 1) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.success("归还成功!");
+            }
+        }
+    })
+}
+//清空快速归还、快速借阅表单
+function  emptyForm(){
+    $('#barCodeReturnTable')[0].reset();
+    $('#borrowingTable')[0].reset();
+}
+
+
+//清空快速归还、快速借阅表单
+function  emptyBorrowingForm(){
+    $('#borrowingTable')[0].reset();
+}
+
+//快速借阅
+function fastBorrowing() {
+    var effeDays = $("#effeDaysBorrowing").val()
+    var applyType = $("#applyTypeBorrowing").val()
+    var applyReason = $("#applyReasonBorrowing").val()
+    var barCode = $("#barCodeBorrowing").val()
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/fastBorrowing',
+        data: {effeDays: effeDays, applyType: applyType, applyReason: applyReason, barCode: barCode},
+        dataType: 'json',
+        success: function (data) {
+            if (data.code==100){
+                document.getElementById("barCodeBorrowing").value = "";
+                refreshTable();
+                return toastr.warning(data.msg);
+            }
+            if (data.code==200){
+                document.getElementById("barCodeBorrowing").value = "";
+                refreshTable();
+                return toastr.success(data.msg)
+            }
+        }
+    })
+
+}
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#barCodeReturnTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        updateReturn();
+    }
+});
+
+
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#borrowingTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        fastBorrowing();
+    }
+});
+
+
+
+

src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js

@@ -1,3 +1,9 @@
+$(function () {
+    //加载申请类型
+    loadSelect(path + '/approve/loadType', 'applyTypeBorrowing', '');
+})
+
+
 var pageNumber;
 var tabChecks;
 //申请原因模板级联内容
@@ -96,7 +102,12 @@ $('#mytab').bootstrapTable({
             title:'审批状态',
             field:'approveState',
             formatter: function (value, row, index) {
+                var returnState = row.returnState;
                 var spanValue;
+                if (returnState == '1') {
+                    spanValue = '<p class="text-success">已归还</p>';
+                    return spanValue;
+                }
                 if(value == '已过期'){
                     spanValue = '<p class="text-danger">已过期</p>';
                 }else if(value == '待审批'){
@@ -142,6 +153,14 @@ $('#mytab').bootstrapTable({
             title:'审批人',
             field:'approver',
         },
+        {
+            title: '归还人',
+            field: 'returnNameString',
+        },
+        {
+            title: '归还时间',
+            field: 'returnTime',
+        },
         {
             title:'批注内容',
             field:'approveNotes',
@@ -479,3 +498,117 @@ $(function () {
 	initDateInput(1);
 	initDateInput(2);
 })
+
+
+
+//清空快速归还、快速借阅表单
+function  emptyForm(){
+    $('#barCodeReturnTable')[0].reset();
+    $('#borrowingTable')[0].reset();
+}
+
+
+//清空快速归还、快速借阅表单
+function  emptyBorrowingForm(){
+    $('#borrowingTable')[0].reset();
+}
+
+
+
+//快速归还
+function updateReturn() {
+    var barCode = $("#barCodeReturn").val();
+    var barCodeName = $("#barCodeName").val();
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/updateReturn',
+        data: {barCode: barCode,barCodeName:barCodeName},
+        dataType: 'json',
+        success: function (data) {
+            if (data == 0) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.warning("归还失败,查询不到病历!");
+            }
+            if (data == 2) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.warning("查询不到需要归还病历!");
+            }
+            if (data == 1) {
+                refreshTable();
+                document.getElementById("barCodeReturn").value = "";
+                return toastr.success("归还成功!");
+            }
+        }
+    })
+}
+
+
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#barCodeReturnTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        updateReturn();
+    }
+});
+
+
+//快速借阅
+function fastBorrowing() {
+    var effeDays = $("#effeDaysBorrowing").val()
+    var applyType = $("#applyTypeBorrowing").val()
+    var applyReason = $("#applyReasonBorrowing").val()
+    var barCode = $("#barCodeBorrowing").val()
+    var applyUserName = $("#applyUserName").val()
+    if (applyUserName == "") {
+        return toastr.warning("申请人工号不能为空");
+    }
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/fastBorrowing',
+        data: {
+            effeDays: effeDays,
+            applyType: applyType,
+            applyReason: applyReason,
+            barCode: barCode,
+            userName: applyUserName
+        },
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 100) {
+                document.getElementById("barCodeBorrowing").value = "";
+                refreshTable();
+                return toastr.warning(data.msg);
+            }
+            if (data.code == 200) {
+                document.getElementById("barCodeBorrowing").value = "";
+                refreshTable();
+                return toastr.success(data.msg)
+            }
+        }
+    })
+
+}
+
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#borrowingTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        fastBorrowing();
+    }
+});

src/main/webapp/static/js/batchApply/batchApply.js

@@ -60,7 +60,7 @@ $('#mytab').bootstrapTable({
         },
         {
             title: '已审批数量',
-            field: 'readNum',
+            field: 'readNums',
         },
         {
             title: '申请人工号',
@@ -258,3 +258,8 @@ $(function () {
     initDateInput(1);
     initDateInput(2);
 })
+
+//清空表单
+function  emptyBorrowingForm(){
+    $('#borrowingTable')[0].reset();
+}

src/main/webapp/static/js/batchApply/batchApplyDetails.js

@@ -1,3 +1,4 @@
+
 //------------------------------------------查询结果---------------------------------------------------------
 let bomIds = []
 $('#mytab').bootstrapTable({
@@ -125,6 +126,7 @@ $('#mytab').bootstrapTable({
         $("#checks").val("");
     }
 })
+
 function crtTimeFtt(val) {
     if (val != null) {
         var date = new Date(val);
@@ -155,10 +157,24 @@ function refreshTable() {
     $.ajax({
         type: 'post',
         url: path + '/applyDetails/getCommomVo',
-        data:{inpatientNo:inpatientNo,startTime:startTime,endTime:endTime,admissTimes:admissTimes,disDept:disDept,batchId:batchId,refreshTable:1,applyName:applyName},
+        data: {
+            inpatientNo: inpatientNo,
+            startTime: startTime,
+            endTime: endTime,
+            admissTimes: admissTimes,
+            disDept: disDept,
+            batchId: batchId,
+            refreshTable: 1,
+            applyName: applyName
+        },
         dataType: 'json',
         success: function (data) {
             if (data.size == 1) {
+                var applyStatc = data.list[0].applyStatc;
+                if (applyStatc != "") {
+                    reLoadBorrowingTab();
+                    return toastr.success(applyStatc);
+                }
                 reLoadBorrowingTab();
                 toastr.success("当前查询只有一条记录已自动帮你添加到批次中!");
             }
@@ -241,12 +257,11 @@ function add() {
         },
         dataType: 'json',
         success: function (data) {
-            console.log(data.code)
-            if (data.code == 200) {
-                return toastr.warning("批量借阅申请失败!");
-            }
             if (data.code == 100) {
-                toastr.success("批量借阅申请成功!");
+                return toastr.warning(data.msg);
+            }
+            if (data.code == 200) {
+                toastr.success(data.msg);
                 $('#borrowingModal').modal('hide');
                 //刷新申请借阅列表
                 reLoadBorrowingTab();
@@ -318,6 +333,7 @@ function clearContent() {
 borrowingTab()
 
 let borrowingIds = []
+
 function borrowingTab() {
     $('#borrowingTab').bootstrapTable({
         height: $(window).height,
@@ -434,29 +450,52 @@ function borrowingTab() {
                         spanValue = '<p style="color:red">驳回</p>';
                     } else if (value == 4) {
                         spanValue = '<p style="color:royalblue">已过期</p>';
+                    }else if (value == 5){
+                        spanValue = '<p style="color:green">已归还</p>';
                     }
                     return spanValue;
                 }
             },
             {
-                title: '经办人',
+                title: '经办人工号',
                 field: 'handlingName',
             },
             {
-                title: '审批人姓名',
+                title: '经办人姓名',
+                field: 'handlingNameString',
+            },
+            {
+                title: '审批人工号',
                 field: 'examineName',
             },
+            {
+                title: '审批人姓名',
+                field: 'examineNameString',
+            },
             {
                 title: '审批时间',
                 field: 'examineTime',
                 formatter: crtTimeFtt
             },
+            {
+                title: '归还人工号',
+                field: 'returnName',
+            },
+            {
+                title: '归还人',
+                field: 'returnNameString',
+            },
+            {
+                title: '归还时间',
+                field: 'returnTime',
+                formatter: crtTimeFtt
+            },
             {
                 title: '操作',
                 formatter: function (value, row, index) {
                     var applyStatc = row.applyStatc;
                     var editanddrop = '';
-                    if (applyStatc != 1 && applyStatc != 4&& applyStatc != 3) {
+                    if (applyStatc != 1 && applyStatc != 4 && applyStatc != 3 && applyStatc != 5) {
                         editanddrop += '&nbsp&nbsp&nbsp<button type="button" onclick="approveById(' + row.id + ',' + row.effectiveDay + ')" class="btn btn-sm  btn-danger">借阅审批</button>';
                     }
                     editanddrop += '&nbsp&nbsp&nbsp<button type="button" onclick="deleteById(' + row.id + ')" class="btn btn-sm  btn-danger">删除</button>';
@@ -535,7 +574,7 @@ function getUrlParam(name) {
     return null; //返回参数值
 }
 
-//删除分配
+//删除
 function deleteById(id) {
     Common.confirm({
         title: "提示",
@@ -649,7 +688,6 @@ function insertApproveContent(inpatientNoArray, admissTimesArray, nameArray,effe
 }
 
 
-
 //清楚内容方法
 function clearContentApprove() {
     $('#batchApprove').removeAttr("data-target", "#approveModal");
@@ -659,6 +697,7 @@ function clearContentApprove() {
         table.removeChild(table.childNodes[i]);
     }
 }
+
 //驳回
 function rejectById(id) {
     Common.confirm({
@@ -687,7 +726,7 @@ function rejectById(id) {
     })
 }
 
-//情况
+//清空
 function borrowingEmpty() {
     $(":input").val("")
     refreshBorrowingTab();
@@ -703,7 +742,6 @@ function refreshBorrowingTab() {
 }
 
 
-
 //保存批量审批
 function addApprove() {
     var batchId = getUrlParam('batchId');
@@ -740,3 +778,107 @@ function reLoadBorrowingTab() {
     $("#borrowingTab").bootstrapTable('refresh', path + '/applyDetails/getBatchApplyDetails');//排序方式
 }
 
+
+//清空快速归还、快速借阅表单
+function emptyForm() {
+    $('#barCodeReturnTable')[0].reset();
+    $('#borrowingTable')[0].reset();
+}
+
+
+//清空快速归还、快速借阅表单
+function emptyBorrowingForm() {
+    $('#borrowingTable')[0].reset();
+}
+
+
+//快速归还
+function updateReturn() {
+    var barCode = $("#barCodeReturn").val();
+    var barCodeName = $("#barCodeName").val();
+    var batchId = getUrlParam('batchId');
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/updateBatchApply',
+        data: {barCode: barCode, barCodeName: barCodeName,batchId:batchId},
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 100) {
+                return toastr.warning(data.msg);
+            }
+            if (data.code == 200) {
+                document.getElementById("barCodeReturn").value = "";
+                reLoadBorrowingTab();
+                return toastr.success(data.msg);
+            }
+        }
+    })
+}
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#barCodeReturnTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        updateReturn();
+    }
+});
+
+
+//快速借阅
+function fastBorrowing() {
+    var effeDays = $("#effeDaysBorrowing").val()
+    var applyType = $("#applyTypeBorrowing").val()
+    var applyReason = $("#applyReasonBorrowing").val()
+    var barCode = $("#barCodeBorrowing").val()
+    var applyUserName = $("#applyUserName").val()
+    var batchId = getUrlParam('batchId');
+    if (applyUserName == "") {
+        return toastr.warning("申请人工号不能为空");
+    }
+    $.ajax({
+        type: 'post',
+        url: path + '/applyDetails/fastBatchApply',
+        data: {
+            effeDays: effeDays,
+            applyType: 2,
+            applyReason: applyReason,
+            barCode: barCode,
+            userName: applyUserName,
+            batchId:batchId
+        },
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 100) {
+                document.getElementById("barCodeBorrowing").value = "";
+                return toastr.warning(data.msg);
+            }
+            if (data.code == 200) {
+                document.getElementById("barCodeBorrowing").value = "";
+                reLoadBorrowingTab();
+                return toastr.success(data.msg)
+            }
+        }
+    })
+
+}
+
+
+//监听回车立即搜索
+//键盘回车查询
+$("#borrowingTable").bind("keypress", function (e) {
+    // 兼容FF和IE和Opera
+    var theEvent = e || window.event;
+    var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+    if (code == 13) {
+        e.preventDefault();
+        //回车执行查询
+        fastBorrowing();
+    }
+});
+

src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js

@@ -15,12 +15,7 @@ $(function () {
     loadDept();
     //加载转归情况
     loadDiagStatus();
-    //加载诊断编码和诊断名称字典
-    //loadDiag();
-    //加载手术字典
-    //loadOperate();
-    //加载inpatientNo
-    //loadInpatientNo();
+ ;
     //权限控制按钮
     permissionControlButton();
 });