diff --git a/src/main/java/com/emr/controller/BatchApplyController.java b/src/main/java/com/emr/controller/BatchApplyController.java new file mode 100644 index 0000000..5980155 --- /dev/null +++ b/src/main/java/com/emr/controller/BatchApplyController.java @@ -0,0 +1,115 @@ +package com.emr.controller; + +import com.emr.entity.BatchApply; +import com.emr.entity.Power_User; +import com.emr.service.batchApply.BatchApplyService; +import com.emr.util.ExceptionPrintUtil; +import com.emr.vo.BatchApplyVo; +import com.emr.vo.Msg; +import com.emr.vo.commomSearch.CommomVo; +import com.github.pagehelper.IPage; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @ClassName BatchApplyController + * @Description 批量申请借阅控制层 + * @Author linjj + * @Date 2023/8/28 15:56 + * @Version 1.0 + */ +@Controller +@RequestMapping("batchApply/") +public class BatchApplyController { + + @Autowired + BatchApplyService batchApplyService; + + + @RequestMapping(value = "batchApplication") + public String batchApply(Model model) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + if (user != null) { + Integer roleId = user.getRoleId(); + if (roleId == 0 || roleId == -100) { + model.addAttribute("createNameFlag", "0"); + } + } + return "batchApply/batchApply"; + } + + + /** + * @description: 查看批量借阅审批数据 + * @author linjj + * @date: 2023/8/28 17:02 + */ + @RequestMapping("selectBatchApply") + @ResponseBody + public PageInfo selectBatchApply(Integer page, Integer limit, BatchApplyVo batchApplyVo) { + if (null != page && null != limit) { + PageHelper.startPage(page, limit); + } + try { + //查询 + List list = batchApplyService.selectBatchApply(batchApplyVo); + return new PageInfo<>(list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + /** + * @description: 新增批次 + * @params: batchApplyVo + * @return: int + * @author linjj + * @date: 2023/8/31 14:29 + */ + @RequestMapping("insertBatch") + @ResponseBody + public int insertBatch(BatchApplyVo batchApplyVo) { + return batchApplyService.insertBatch(batchApplyVo); + } + + /** + * @description: 修改批次 + * @params: batchApplyVo + * @author linjj + * @date: 2023/9/1 14:40 + */ + @RequestMapping("updateBatch") + @ResponseBody + public int updateBatch(BatchApplyVo batchApplyVo) { + return batchApplyService.updateBatch(batchApplyVo); + } + + /** + * @description: 删除批次 + * @params: id + * @return: int + * @author linjj + * @date: 2023/9/18 15:30 + */ + @RequestMapping("deleteById") + @ResponseBody + public int deleteById(int id){ + return batchApplyService.deleteById(id); + } + +} diff --git a/src/main/java/com/emr/controller/BatchApplyDetailsController.java b/src/main/java/com/emr/controller/BatchApplyDetailsController.java new file mode 100644 index 0000000..38f692d --- /dev/null +++ b/src/main/java/com/emr/controller/BatchApplyDetailsController.java @@ -0,0 +1,145 @@ +package com.emr.controller; + +import com.emr.entity.BatchApplyDetails; +import com.emr.service.BatchApplyDetails.BatchApplyDetailsService; +import com.emr.util.ExceptionPrintUtil; +import com.emr.vo.BatchBorrowingVo; +import com.emr.vo.Msg; +import com.emr.vo.commomSearch.CommomVo; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @ClassName BatchApplyController + * @Description 批量申请借阅控制层 + * @Author linjj + * @Date 2023/8/28 15:56 + * @Version 1.0 + */ +@Controller +@RequestMapping("applyDetails/") +public class BatchApplyDetailsController { + + @Autowired + BatchApplyDetailsService batchApplyDetailsService; + + + @RequestMapping(value = "batchApplyDetails") + public String batchApplyDetails(Model model) { + return "batchApply/batchApplyDetails"; + } + + + /** + * @description: 借阅详情接口 + * @params: CommomVo + * @author linjj + * @date: 2023/9/4 9:02 + */ + @RequestMapping("getCommomVo") + @ResponseBody + public PageInfo getCommomVo(Integer page, Integer limit, CommomVo commomVo) { + if (null != page && null != limit) { + PageHelper.startPage(page, limit); + } + try { + //查询 + List list = batchApplyDetailsService.addCommomVo(commomVo); + return new PageInfo<>(list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + /** + * @description: 申请借阅列表 + * @params: batchId + * @return: BatchApplyDetails + * @author linjj + * @date: 2023/9/4 15:16 + */ + @RequestMapping("getBatchApplyDetails") + @ResponseBody + public PageInfo getBatchApplyDetails(Integer page, Integer limit, int batchId,String inpatientNo) { + if (null != page && null != limit) { + PageHelper.startPage(page, limit); + } + try { + //查询 + List list = batchApplyDetailsService.getBatchApplyDetails(batchId,inpatientNo); + return new PageInfo<>(list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + /** + * @description: 批量借阅接口 + * @params: BatchBorrowingVo + * @author linjj + * @date: 2023/9/6 15:15 + */ + @RequestMapping("addBatchBorrowing") + @ResponseBody + public Msg addBatchBorrowing(BatchBorrowingVo batchBorrowingVo) { + if (StringUtils.isBlank(batchBorrowingVo.getPatientIds())) { + return Msg.fail("病案主键为空"); + } + int i = batchApplyDetailsService.addBatchBorrowing(batchBorrowingVo); + if (i == 0) { + return Msg.fail("批量申请保存失败"); + } + return Msg.success("批量申请保存成功"); + } + + /** + * @description: 删除申请记录 + * @params: id + * @return: int + * @author linjj + * @date: 2023/9/18 16:38 + */ + @RequestMapping("deleteById") + @ResponseBody + public int deleteById(int id,int batchId) { + return batchApplyDetailsService.deleteById(id,batchId); + } + + /** + * @description: 驳回申请记录 + * @params: id + * @return: int + * @author linjj + * @date: 2023/9/18 16:38 + */ + @RequestMapping("rejectById") + @ResponseBody + public int rejectById(int id) { + return batchApplyDetailsService.rejectById(id); + } + + /** + * @description: 审批接口 + * @params: + * @return: + * @author linjj + * @date: 2023/9/20 14:54 + */ + @RequestMapping("agreeById") + @ResponseBody + public int agreeById(String ids) { + return batchApplyDetailsService.agreeById(ids); + } +} diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 4eb2398..3d89c10 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -9,11 +9,15 @@ import com.emr.entity.Zd_Assort; import com.emr.entity.recordType.Emr_Type; import com.emr.service.FontService; import com.emr.service.Zd_AssortServiceImpl; +import com.emr.service.pushRcvBasic.PushRcvBasicService; import com.emr.service.recordType.EmrTypeService; +import com.emr.service.tScanAssort.T_Scan_AssortService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.Jpg2PdfUtil; import com.emr.vo.FontVo.*; import com.emr.vo.Msg; +import com.emr.vo.PushRcvBasicDTO; +import com.emr.vo.ZhFyImageVo; import com.emr.vo.commomSearch.CommomVo; import com.lowagie.text.Document; import com.lowagie.text.Image; @@ -70,6 +74,10 @@ public class FontController { private Zd_AssortServiceImpl assortService; @Autowired private Emr_Apply_ApproveMapper apply_approveMapper; + @Autowired + private T_Scan_AssortService tScanAssortService; + @Autowired + private PushRcvBasicService pushRcvBasicService; /** @@ -471,4 +479,60 @@ public class FontController { model.addAttribute("flag", flag); return "recordManage/commomSearch/showRecordIframeBlood"; } + /** + * @description: 珠海妇幼根据住院号住院次数返回患者病案信息 + * @params: inpatientNo + * @params: admissTimes + * @author linjj + * @date: 2023/9/8 10:40 + */ + @RequestMapping(value = "getPathListByInpatientNo", method = RequestMethod.POST) + @ResponseBody + public Msg getPathListByInpatientNo(String inpatientNo,String admissTimes){ + if (StringUtils.isBlank(inpatientNo)){ + return Msg.fail("inpatientNo住院号不得为空"); + } + if (StringUtils.isBlank(admissTimes)){ + return Msg.fail("admissTimes住院次数不得为空"); + } + List list = tScanAssortService.getPathListByInpatientNo(inpatientNo, admissTimes); + return Msg.successData(list); + } + + + /** + * @description: 珠海妇幼根据患者出院时间返回患者病案信息 + * @params: startTime + * @params: endTime + * @author linjj + * @date: 2023/9/8 10:40 + */ + @RequestMapping(value = "getPathListByDisDate", method = RequestMethod.POST) + @ResponseBody + public Msg getPathListByDisDate(String startTime,String endTime){ + if (StringUtils.isBlank(startTime)){ + return Msg.fail("startTime开始时间范围不得为空"); + } + if (StringUtils.isBlank(endTime)){ + return Msg.fail("endTime结束时间范围不得为空"); + } + List list = tScanAssortService.getPathListByDisDate(startTime,endTime); + return Msg.successData(list); + } + /** + * @description: 病案回收存储调用接口 + * @params: + * @return: + * @author linjj + * @date: 2023/9/26 11:09 + */ + @RequestMapping(value = "addRcvBasic", method = RequestMethod.POST) + @ResponseBody + public Msg addRcvBasic(List pushRcvBasicDTOList){ + int i = pushRcvBasicService.addRcvBasic(pushRcvBasicDTOList); + if (i==1){ + return Msg.success(); + } + return Msg.fail(); + } } diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index e89734d..d0575da 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -132,7 +132,7 @@ public class FontShowRecordController { * @params: * @return: * @author linjj - * @date: 2023/7/31 8:53 + * @date: 2023/7/31 8 */ @RequestMapping(value = "showRecordList") public String showRecordList(String inpatientNo, String idCard, Model model, HttpServletRequest request) { diff --git a/src/main/java/com/emr/dao/BatchApplyDetailsMapper.java b/src/main/java/com/emr/dao/BatchApplyDetailsMapper.java new file mode 100644 index 0000000..7b75b8d --- /dev/null +++ b/src/main/java/com/emr/dao/BatchApplyDetailsMapper.java @@ -0,0 +1,35 @@ +package com.emr.dao; + +import com.emr.entity.BatchApplyDetails; +import com.emr.entity.EffectiveTimeVo; +import com.emr.vo.BatchApplyDetailsVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @InterfaceName BatchApplyDetailsMapper + * @Description 借阅申请列表接口 + * @Author linjj + * @Date 2023/9/4 11:19 + * @Version 1.0 + */ +@Mapper +public interface BatchApplyDetailsMapper { + + int addBatchApplyDetails(@Param("list")List list); + + List getBatchApplyDetails(@Param("batchId")int batchId, @Param("inpatientNo")String inpatientNo); + + int deleteByBatchId(int batchId); + + int deleteById(int id); + + + int upadteApplyDetails(BatchApplyDetailsVo batchApplyDetailsVo); + + int upadteApplyDetailsList(@Param("list") List list); + + String getEffectiveTime(@Param("ids") Integer ids,@Param("examineTimes") String examineTimes); +} diff --git a/src/main/java/com/emr/dao/BatchApplyMapper.java b/src/main/java/com/emr/dao/BatchApplyMapper.java new file mode 100644 index 0000000..f1c8b8b --- /dev/null +++ b/src/main/java/com/emr/dao/BatchApplyMapper.java @@ -0,0 +1,36 @@ +package com.emr.dao; + +import com.emr.entity.BatchApply; +import com.emr.vo.BatchApplyVo; +import com.emr.vo.commomSearch.CommomVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @InterfaceName BatchApplyMapper + * @Description 批量借阅申请接口 + * @Author linjj + * @Date 2023/8/28 17:13 + * @Version 1.0 + */ +public interface BatchApplyMapper { + + List selectBatchApply(BatchApplyVo batchApplyVo); + + int insertBatch(BatchApplyVo batchApplyVo); + + int updateBatch(BatchApplyVo batchApplyVo); + + + List getCommomVo(CommomVo commomVo); + + List getCommomVoByPatientIds(@Param(value = "patientIds")String patientIds); + + BatchApplyVo getBorrowingNum(int batchId); + + int updateBorrowingNum(@Param("borrowingNum") int borrowingNum, @Param("batchId") int batchId); + + int deleteById(int id); + +} diff --git a/src/main/java/com/emr/dao/PushRcvBasicMapper.java b/src/main/java/com/emr/dao/PushRcvBasicMapper.java new file mode 100644 index 0000000..770fb9e --- /dev/null +++ b/src/main/java/com/emr/dao/PushRcvBasicMapper.java @@ -0,0 +1,18 @@ +package com.emr.dao; + +import com.emr.vo.PushRcvBasicDTO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @InterfaceName PushRcvBasicMaooer + * @Description + * @Author linjj + * @Date 2023/9/26 11:29 + * @Version 1.0 + */ +public interface PushRcvBasicMapper { + + int addRcvBasic(@Param(value = "pushRcvBasicDTOList") List pushRcvBasicDTOList); +} diff --git a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java index 5f15b80..da6073b 100644 --- a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java +++ b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java @@ -3,6 +3,7 @@ package com.emr.dao.tScanAssort; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.FontCommom; import com.emr.vo.FontVo.ScanAssortVo; +import com.emr.vo.ZhFyImageVo; import com.emr.vo.commomSearch.CommomVo; import org.apache.ibatis.annotations.Param; @@ -40,4 +41,9 @@ public interface T_Scan_AssortMapper { void selectPicPaths(CommomVo commomVo, String scanPages); void recoverPic(@Param("patientId") String patientId, @Param("scanPages") String scanPages); + + List getPathListByInpatientNo(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") String admissTimes); + + + List getPathListByDisDate(@Param("startTime")String startTime,@Param("endTime")String endTime); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/BatchApply.java b/src/main/java/com/emr/entity/BatchApply.java new file mode 100644 index 0000000..21a8a21 --- /dev/null +++ b/src/main/java/com/emr/entity/BatchApply.java @@ -0,0 +1,31 @@ +package com.emr.entity; + +import lombok.Data; + +/** + * @ClassName BatchApply + * @Description 批量申请实体 + * @Author linjj + * @Date 2023/8/28 17:03 + * @Version 1.0 + */ +@Data +public class BatchApply { + private int id; + //批次名称 + private String batchName; + //借阅数量 + private Integer borrowingNum; + //0.未审批，1.已审批，3.审批中 + private Integer statc; + //已审批数量 + private Integer readNum; + //创建人 + private String createName; + + //创建时间 + private String createDate; + + //创建时间 + private String applyName; +} diff --git a/src/main/java/com/emr/entity/BatchApplyDetails.java b/src/main/java/com/emr/entity/BatchApplyDetails.java new file mode 100644 index 0000000..68d9986 --- /dev/null +++ b/src/main/java/com/emr/entity/BatchApplyDetails.java @@ -0,0 +1,53 @@ +package com.emr.entity; + +import lombok.Data; + +/** + * @ClassName AatchApplyDetailsVo + * @Description 借阅申请列表实体 + * @Author linjj + * @Date 2023/9/4 11:13 + * @Version 1.0 + */ + +@Data +public class BatchApplyDetails { + + private int id; + //批次id + private int batchId; + //申请者 + private String applyName; + //申请时间 + private String applyTime; + //有效日期 + private String effectiveTime; + //申请理由 + private String applyReason; + + //申请类型：1.借阅申请，2.纸质申请 + private int applyFlag; + + //经办人 + private String handlingName; + + //申请科室 + private String applyDate; + //申请状态:1.已通过2.申请中，3.驳回 + private int applyStatc; + //出院时间 + private String disTime; + //申请天数 + private int effectiveDay; + //住院号 + private String inpatientNo; + //住院次数 + private String admissTimes; + //患者姓名 + private String patientName; + //审批人姓名 + private String examineName; + //审批时间 + private String examineTime; + +} diff --git a/src/main/java/com/emr/entity/EffectiveTimeVo.java b/src/main/java/com/emr/entity/EffectiveTimeVo.java new file mode 100644 index 0000000..bd6528a --- /dev/null +++ b/src/main/java/com/emr/entity/EffectiveTimeVo.java @@ -0,0 +1,18 @@ +package com.emr.entity; + +import lombok.Data; + +/** + * @ClassName effectiveTimeVo + * @Description 有效日期计算vo + * @Author linjj + * @Date 2023/9/20 16:46 + * @Version 1.0 + */ +@Data +public class EffectiveTimeVo { + + private int id; + + private String effectiveTime; +} diff --git a/src/main/java/com/emr/entity/Power_User.java b/src/main/java/com/emr/entity/Power_User.java index 5d816d1..f205f40 100644 --- a/src/main/java/com/emr/entity/Power_User.java +++ b/src/main/java/com/emr/entity/Power_User.java @@ -90,6 +90,18 @@ public class Power_User extends UserVo { */ private Set menus; + private String powerDepts; + + @Override + public String getPowerDepts() { + return powerDepts; + } + + @Override + public void setPowerDepts(String powerDepts) { + this.powerDepts = powerDepts; + } + public Integer getUserId() { return userId; } diff --git a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java new file mode 100644 index 0000000..fc3d47c --- /dev/null +++ b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsService.java @@ -0,0 +1,31 @@ +package com.emr.service.BatchApplyDetails; + +import com.emr.entity.BatchApplyDetails; +import com.emr.vo.BatchBorrowingVo; +import com.emr.vo.commomSearch.CommomVo; + +import java.util.List; + +/** + * @InterfaceName BatchApplyService + * @Description 批量借阅接口 + * @Author linjj + * @Date 2023/8/28 17:10 + * @Version 1.0 + */ +public interface BatchApplyDetailsService { + + + + List addCommomVo(CommomVo commomVo) throws Exception; + + List getBatchApplyDetails(int batchId,String inpatientNo); + + int addBatchBorrowing(BatchBorrowingVo batchBorrowingVo); + + int deleteById(int id,int batchId); + + int rejectById(int id); + + int agreeById(String ids); +} diff --git a/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java new file mode 100644 index 0000000..a171e24 --- /dev/null +++ b/src/main/java/com/emr/service/BatchApplyDetails/BatchApplyDetailsServiceImpl.java @@ -0,0 +1,249 @@ +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.entity.*; +import com.emr.util.ExceptionPrintUtil; +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.commomSearch.CommomVo; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @ClassName BatchApplyServiceImpl + * @Description 批量借阅实现类 + * @Author linjj + * @Date 2023/8/28 17:10 + * @Version 1.0 + */ +@Service +public class BatchApplyDetailsServiceImpl implements BatchApplyDetailsService { + @Autowired + BatchApplyMapper batchApplyMapper; + @Autowired + Emr_DictionaryMapper emrDictionaryMapper; + @Autowired + BatchApplyDetailsMapper batchApplyDetailsMapper; + @Autowired + EmrComomSetMapper emrComomSetMapper; + + @Override + public List addCommomVo(CommomVo commomVo) { + List list = batchApplyMapper.getCommomVo(commomVo); + //转换科室 + convertDepartment(list); + //当查询集合中只有一条记录时直接插入申请列表 + if (commomVo.getRefreshTable() == 1) { + addApplyDetails(list, commomVo.getBatchId(),commomVo.getApplyName()); + } + return list; + } + + @Override + public List getBatchApplyDetails(int batchId,String inpatientNo) { + //获取系统当前时间 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + String format = fmt.format(new Date()); + List batchApplyDetails = batchApplyDetailsMapper.getBatchApplyDetails(batchId,inpatientNo); + for (BatchApplyDetails list : batchApplyDetails) { + //判断是否过期如果过期状态为4 + String effectiveTime = list.getEffectiveTime(); + if (StringUtils.isNotBlank(effectiveTime) ) { + if ((effectiveTime.compareTo(format)) == -1) { + list.setApplyStatc(4); + } + } + } + return batchApplyDetails; + } + + @Override + public int addBatchBorrowing(BatchBorrowingVo batchBorrowingVo) { + //查询患者基础数据 + List commomList = batchApplyMapper.getCommomVoByPatientIds(batchBorrowingVo.getPatientIds()); + return addApplyDetailsList(commomList, batchBorrowingVo); + } + + @Override + public int deleteById(int id,int batchId) { + //更新批次数量 + delBorrowingNum(batchId); + return batchApplyDetailsMapper.deleteById(id); + } + + @Override + public int rejectById(int id) { + //获取系统当前时间 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + //获取登录用户信息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); + batchApplyDetailsVo.setExamineName(user.getUserPosition()); + batchApplyDetailsVo.setExamineTime(fmt.format(new Date())); + batchApplyDetailsVo.setId(id); + batchApplyDetailsVo.setApplyStatc(3); + return batchApplyDetailsMapper.upadteApplyDetails(batchApplyDetailsVo); + } + + @Override + public int agreeById(String ids) { + //获取系统当前时间 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + //获取登录用户信息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + //声明一个BatchApplyDetailsVo对象 + BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); + //声明一个BatchApplyDetailsVo集合 + List list = Collections.synchronizedList(new ArrayList<>()); + //将字符串转为List在转成List + List idsList = Arrays.asList(ids.split(",")).stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toList()); + //遍历审核信息 + for (Integer id : idsList) { + batchApplyDetailsVo.setExamineName(user.getUserPosition()); + batchApplyDetailsVo.setExamineTime(fmt.format(new Date())); + batchApplyDetailsVo.setApplyStatc(1); + batchApplyDetailsVo.setId(id); + list.add(batchApplyDetailsVo); + } + //给有效时间赋值 + upDateEffectiveTimeList(list); + return batchApplyDetailsMapper.upadteApplyDetailsList(list); + } + + + private void upDateEffectiveTimeList(List batchApplyDetailsVolist) { + for (BatchApplyDetailsVo list : batchApplyDetailsVolist) { + String effectiveTime = batchApplyDetailsMapper.getEffectiveTime(list.getId(), list.getExamineTime()); + list.setEffectiveTime(effectiveTime); + } + } + + private int addApplyDetailsList(List commomList, BatchBorrowingVo batchBorrowingVo) { + //获取系统当前时间 + 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 list = Collections.synchronizedList(new ArrayList<>()); + for (CommomVo commomInfoList : commomList) { + //插入申请借阅详情集合 + BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); + batchApplyDetailsVo.setBatchId(batchBorrowingVo.getBatchId()); + batchApplyDetailsVo.setApplyName(batchBorrowingVo.getApplyName()); + batchApplyDetailsVo.setApplyDate(user.getRemark()); + batchApplyDetailsVo.setApplyTime(fmt.format(new Date())); + batchApplyDetailsVo.setEffectiveDay(batchBorrowingVo.getEffectiveDay()); + batchApplyDetailsVo.setInpatientNo(commomInfoList.getInpatientNo()); + batchApplyDetailsVo.setAdmissTimes(commomInfoList.getAdmissTimes()); + batchApplyDetailsVo.setPatientName(commomInfoList.getName()); + batchApplyDetailsVo.setDisTime(commomInfoList.getDisDate()); + batchApplyDetailsVo.setApplyReason(batchBorrowingVo.getApplyReason()); + batchApplyDetailsVo.setApplyFlag(batchBorrowingVo.getApplyFlag()); + batchApplyDetailsVo.setApplyStatc(2); + batchApplyDetailsVo.setHandlingName(user.getUserName()); + //将对象传入集合 + list.add(batchApplyDetailsVo); + } + //同步数量 + updateNum(batchBorrowingVo.getBatchId(), list.size()); + return batchApplyDetailsMapper.addBatchApplyDetails(list); + } + + /** + * @description: 转换科室方法 + * @author linjj + * @date: 2023/9/4 14:18 + */ + private void convertDepartment(List list) { + //获取科室列表 + List dicList = emrDictionaryMapper.selectDictionaryByTypeCode("dept_code"); + //转换科室 + Map codeMap = ListUtils.toMap(dicList, Emr_Dictionary::getCode); + Setters.instance().list(list).cycleSetProperties(p -> { + String deptCode = p.getDisDept(); + if (StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)) { + String deptName = codeMap.get(deptCode).getName(); + p.setDisDept(deptName); + } + }); + } + + + private void addApplyDetails(List list, int batchId,String ApplyName) { + //获取系统设置的默认参数 + EmrComomSet emrComomSet = emrComomSetMapper.selectByPrimaryKey(1); + //获取登录用户信息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + if (list.size() == 1) { + BatchApplyDetailsVo batchApplyDetailsVo = new BatchApplyDetailsVo(); + batchApplyDetailsVo.setBatchId(batchId); + batchApplyDetailsVo.setApplyName(ApplyName); + batchApplyDetailsVo.setApplyDate(user.getRemark()); + //获取系统当前时间 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + batchApplyDetailsVo.setApplyTime(fmt.format(new Date())); + batchApplyDetailsVo.setEffectiveDay(emrComomSet.getDefaultDay()); + batchApplyDetailsVo.setInpatientNo(list.get(0).getInpatientNo()); + batchApplyDetailsVo.setAdmissTimes(list.get(0).getAdmissTimes()); + batchApplyDetailsVo.setPatientName(list.get(0).getName()); + batchApplyDetailsVo.setHandlingName(user.getUserName()); + batchApplyDetailsVo.setDisTime(list.get(0).getDisDate()); + batchApplyDetailsVo.setApplyReason("需要借阅这份病历"); + batchApplyDetailsVo.setApplyFlag(1); + batchApplyDetailsVo.setApplyStatc(2); + List batchApplyDetailsList = Arrays.asList(batchApplyDetailsVo); + batchApplyDetailsMapper.addBatchApplyDetails(batchApplyDetailsList); + //新增时同步批次数量先获取原先数量 + updateBorrowingNum(batchId); + } + } + + private void updateBorrowingNum(int batchId) { + BatchApplyVo batchApplyVo = batchApplyMapper.getBorrowingNum(batchId); + Integer borrowingNum = batchApplyVo.getBorrowingNum(); + int i = borrowingNum + 1; + batchApplyMapper.updateBorrowingNum(i, batchId); + } + + + private void delBorrowingNum(int batchId) { + BatchApplyVo batchApplyVo = batchApplyMapper.getBorrowingNum(batchId); + Integer borrowingNum = batchApplyVo.getBorrowingNum(); + int i = borrowingNum - 1; + batchApplyMapper.updateBorrowingNum(i, batchId); + } + + + private void updateNum(int batchId, int listNum) { + BatchApplyVo batchApplyVo = batchApplyMapper.getBorrowingNum(batchId); + Integer borrowingNum = batchApplyVo.getBorrowingNum(); + int i = borrowingNum + listNum; + batchApplyMapper.updateBorrowingNum(i, batchId); + } + + +} diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index e63c7e7..1de712a 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -219,7 +219,8 @@ public class CommomService { if (StringUtils.isNotBlank(flag)) { CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId); if (commomVo != null) { - if (StringUtils.isNotBlank(commomVo.getFilePath())) { + String filePath = commomVo.getFilePath(); + if (StringUtils.isNotBlank(filePath)) { //flag = home_addr取home_addr字段，path_file取home_addr字段 String root1 = ""; if ("home_addr".equals(flag)) { @@ -594,6 +595,10 @@ public class CommomService { * @return */ public List selectPrintPic(HttpServletResponse response, String patientId, String rootPaths, String names, String sources, String mapKey) { + //获取登录用户信息 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); List outs = new LinkedList<>(); if (StringUtils.isNotBlank(names)) { String[] rootPathList = rootPaths.split(","); @@ -607,6 +612,7 @@ public class CommomService { Short printIsImg = emrPdfWaterSet.getPrintIsImg(); //获取是否打印用户信息 Short userEffective = emrPdfWaterSet.getUserEffective(); + Integer roleId = user.getRoleId(); for (int i = 0; i < nameList.length; i++) { //定义图片根目录地址 String rootPath = ""; @@ -629,8 +635,8 @@ public class CommomService { //定义输出地址 String outSrc = ""; //获取项目上下文地址 - if ((printEffective != null && printEffective == 1) || - (printIsImg != null && printIsImg == 1)) { + if ((printEffective != null && printEffective == 1 && roleId == 8) || + (printIsImg != null && printIsImg == 1) && roleId == 8) { if ("99".equals(sourceList[i])) { String rootSrcPath = selectRootByNotWater(srcPath); String str2 = srcPath.substring(0, srcPath.indexOf(File.separator)); diff --git a/src/main/java/com/emr/service/batchApply/BatchApplyService.java b/src/main/java/com/emr/service/batchApply/BatchApplyService.java new file mode 100644 index 0000000..cd20a14 --- /dev/null +++ b/src/main/java/com/emr/service/batchApply/BatchApplyService.java @@ -0,0 +1,28 @@ +package com.emr.service.batchApply; + +import com.emr.entity.BatchApply; +import com.emr.vo.BatchApplyVo; +import com.emr.vo.commomSearch.CommomVo; + + +import java.util.List; + +/** + * @InterfaceName BatchApplyService + * @Description 批量借阅接口 + * @Author linjj + * @Date 2023/8/28 17:10 + * @Version 1.0 + */ +public interface BatchApplyService { + + List selectBatchApply(BatchApplyVo batchApplyVo); + + int insertBatch(BatchApplyVo batchApplyVo); + + int updateBatch(BatchApplyVo batchApplyVo); + + int deleteById(int id); + + +} diff --git a/src/main/java/com/emr/service/batchApply/BatchApplyServiceImpl.java b/src/main/java/com/emr/service/batchApply/BatchApplyServiceImpl.java new file mode 100644 index 0000000..d8b4102 --- /dev/null +++ b/src/main/java/com/emr/service/batchApply/BatchApplyServiceImpl.java @@ -0,0 +1,91 @@ +package com.emr.service.batchApply; + +import com.emr.dao.BatchApplyDetailsMapper; +import com.emr.dao.BatchApplyMapper; +import com.emr.dao.Emr_DictionaryMapper; +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.ListUtils; +import com.emr.util.Setters; +import com.emr.vo.BatchApplyDetailsVo; +import com.emr.vo.BatchApplyVo; +import com.emr.vo.commomSearch.CommomVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @ClassName BatchApplyServiceImpl + * @Description 批量借阅实现类 + * @Author linjj + * @Date 2023/8/28 17:10 + * @Version 1.0 + */ +@Service +@Transactional +public class BatchApplyServiceImpl implements BatchApplyService { + @Autowired + BatchApplyMapper batchApplyMapper; + @Autowired + Emr_DictionaryMapper emrDictionaryMapper; + @Autowired + BatchApplyDetailsMapper batchApplyDetailsMapper; + @Override + public List selectBatchApply(BatchApplyVo batchApplyVo) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + if (user != null) { + Integer roleId = user.getRoleId(); + if (roleId != 0 || roleId != -100) { + batchApplyVo.setCreateName(user.getUserName()); + } + } + return batchApplyMapper.selectBatchApply(batchApplyVo); + } + + @Override + public int insertBatch(BatchApplyVo batchApplyVo) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + // 从session获取用户名 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + if (user != null) { + //初始化批量申请 + String username = user.getUserName(); + batchApplyVo.setCreateName(username); + batchApplyVo.setStatc(0); + batchApplyVo.setReadNum(0); + batchApplyVo.setBorrowingNum(0); + //获取系统当前时间 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + batchApplyVo.setCreateDate(fmt.format(new Date())); + } + return batchApplyMapper.insertBatch(batchApplyVo); + } + + @Override + public int updateBatch(BatchApplyVo batchApplyVo) { + return batchApplyMapper.updateBatch(batchApplyVo); + } + + @Override + public int deleteById(int id) { + batchApplyDetailsMapper.deleteByBatchId(id); + return batchApplyMapper.deleteById(id); + } + +} diff --git a/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicService.java b/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicService.java new file mode 100644 index 0000000..0d38f16 --- /dev/null +++ b/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicService.java @@ -0,0 +1,18 @@ +package com.emr.service.pushRcvBasic; + +import com.emr.vo.Msg; +import com.emr.vo.PushRcvBasicDTO; + +import java.util.List; + +/** + * @InterfaceName PushRcvBasicService + * @Description 病案回收 + * @Author linjj + * @Date 2023/9/26 11:28 + * @Version 1.0 + */ +public interface PushRcvBasicService { + + int addRcvBasic(List pushRcvBasicDTOList); +} diff --git a/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicServiceImpl.java b/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicServiceImpl.java new file mode 100644 index 0000000..d5f0f4b --- /dev/null +++ b/src/main/java/com/emr/service/pushRcvBasic/PushRcvBasicServiceImpl.java @@ -0,0 +1,28 @@ +package com.emr.service.pushRcvBasic; + +import com.emr.dao.PushRcvBasicMapper; +import com.emr.vo.PushRcvBasicDTO; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @ClassName PushRcvBasicServiceImpl + * @Description 病案回收 + * @Author linjj + * @Date 2023/9/26 11:28 + * @Version 1.0 + */ +@Service +@Transactional +public class PushRcvBasicServiceImpl implements PushRcvBasicService { + @Autowired + PushRcvBasicMapper pushRcvBasicMapper; + @Override + public int addRcvBasic(List pushRcvBasicDTOList) { + return pushRcvBasicMapper.addRcvBasic(pushRcvBasicDTOList); + } +} diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java index 7a0ac10..df9d833 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java @@ -2,7 +2,7 @@ package com.emr.service.tScanAssort; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.ScanAssortVo; -import com.emr.vo.commomSearch.CommomVo; +import com.emr.vo.ZhFyImageVo; import java.util.List; @@ -16,4 +16,8 @@ public interface T_Scan_AssortService { List selectPicPaths(String patientId,String scanPages,String flag); void recoverPic(String patientId, String scanPages); + + List getPathListByInpatientNo(String inpatientNo, String admissTimes); + + List getPathListByDisDate(String startTime,String endTime); } diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java index 6c84a1c..d013fa1 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java @@ -2,17 +2,20 @@ package com.emr.service.tScanAssort; import com.emr.dao.CommomMapper; import com.emr.dao.tScanAssort.T_Scan_AssortMapper; -import com.emr.entity.recordLock.Emr_Lock; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.ScanAssortVo; -import com.emr.vo.commomSearch.CommomVo; +import com.emr.vo.ZhFyImageVo; +import com.emr.vo.PicListVo; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -34,6 +37,8 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ private T_Scan_AssortMapper scanAssortMapper; @Autowired private CommomMapper commomMapper; + @Value("${NEW_EMR_RECORD_JSP}") + private String NEW_EMR_RECORD_JSP; @Override public void updateByPrimaryKeySelective(T_Scan_Assort newAssort, T_Scan_Assort oldAssort) { scanAssortMapper.updateByPrimaryKeySelective(newAssort,oldAssort); @@ -85,4 +90,68 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ public void recoverPic(String patientId, String scanPages) { scanAssortMapper.recoverPic(patientId, scanPages); } + + @Override + public List getPathListByInpatientNo(String inpatientNo, String admissTimes) { + List list = scanAssortMapper.getPathListByInpatientNo(inpatientNo, admissTimes); + for (ZhFyImageVo scanAssortList:list){ + List picList = scanAssortList.getPicList(); + for (PicListVo picPathList:picList){ + //获取盘符并转换映射地址的头部地址 + String root = selectRootByNotWater(picPathList.getPicUrl()); + //获取盘符后面的地址 + String str1 = picPathList.getPicUrl().substring(0, picPathList.getPicUrl().indexOf(File.separator)); + String picPath = picPathList.getPicUrl().substring(str1.length() + 1, picPathList.getPicUrl().length()); + String fileUrl = NEW_EMR_RECORD_JSP+ File.separator + root + picPath; + picPathList.setPicUrl(fileUrl); + } + } + return list; + } + + @Override + public List getPathListByDisDate(String startTime,String endTime) { + List list = scanAssortMapper.getPathListByDisDate(startTime, endTime); + for (ZhFyImageVo scanAssortList:list){ + List picList = scanAssortList.getPicList(); + for (PicListVo picPathList:picList){ + //获取盘符并转换映射地址的头部地址 + String root = selectRootByNotWater(picPathList.getPicUrl()); + //获取盘符后面的地址 + String str1 = picPathList.getPicUrl().substring(0, picPathList.getPicUrl().indexOf(File.separator)); + String picPath = picPathList.getPicUrl().substring(str1.length() + 1, picPathList.getPicUrl().length()); + String fileUrl = NEW_EMR_RECORD_JSP+ File.separator + root + picPath; + picPathList.setPicUrl(fileUrl); + } + } + return list; + } + + private String selectRootByNotWater(String srcPath) { + //获取盘符 + String str = srcPath.substring(0, 1).toUpperCase(); + switch (str) { + case "C": + return "reloadC\\"; + case "D": + return "reloadD\\"; + case "E": + return "reloadE\\"; + case "F": + return "reloadF\\"; + case "G": + return "reloadG\\"; + case "H": + return "reloadH\\"; + case "I": + return "reloadI\\"; + case "J": + return "reloadJ\\"; + case "K": + return "reloadK\\"; + default: + ; + } + return null; + } } diff --git a/src/main/java/com/emr/util/FieldSelector.java b/src/main/java/com/emr/util/FieldSelector.java new file mode 100644 index 0000000..077c034 --- /dev/null +++ b/src/main/java/com/emr/util/FieldSelector.java @@ -0,0 +1,12 @@ +package com.emr.util; + +/** + * @InterfaceName FieldSelector + * @Description + * @Author linjj + * @Date 2023/6/29 16:41 + * @Version 1.0 + */ +public interface FieldSelector { + FieldType select(Type type); +} diff --git a/src/main/java/com/emr/util/ListPropertySetter.java b/src/main/java/com/emr/util/ListPropertySetter.java new file mode 100644 index 0000000..20eb1dd --- /dev/null +++ b/src/main/java/com/emr/util/ListPropertySetter.java @@ -0,0 +1,22 @@ +package com.emr.util; + +import java.util.List; + +public class ListPropertySetter { + + private final List values; + + public ListPropertySetter(List values) { + this.values = values; + } + + public List cycleSetProperties(PropertySetter setter) { + + if (null == values) return values; + + for (T value : values) { + setter.apply(value); + } + return values; + } +} diff --git a/src/main/java/com/emr/util/ListUtils.java b/src/main/java/com/emr/util/ListUtils.java new file mode 100644 index 0000000..17cceea --- /dev/null +++ b/src/main/java/com/emr/util/ListUtils.java @@ -0,0 +1,73 @@ +package com.emr.util; + +import org.springframework.util.CollectionUtils; + +import java.util.*; + +public final class ListUtils { + public static Map toMap(List list, FieldSelector selector) { + if (CollectionUtils.isEmpty(list)) return Collections.emptyMap(); + Map 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 Map> groupBy(List list, FieldSelector selector) { + if (CollectionUtils.isEmpty(list)) return Collections.emptyMap(); + Map> 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()); + } + map.get(key).add(t); + } + return map; + } + + public static List select(List list, FieldSelector selector) { + if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); + List filedList = new ArrayList<>(list.size()); + for (T t : list) { + K key = selector.select(t); + if (key != null) filedList.add(key); + } + return filedList; + } + + public static List distinctSelect(List list, FieldSelector selector) { + if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); + Set 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 List unionWithoutDuplicate(List... values) { + if (null == values || values.length <= 0) return Collections.emptyList(); + Set unionFiledSet = new HashSet<>(); + for (List value : values) { + if (!CollectionUtils.isEmpty(value)) { + unionFiledSet.addAll(value); + } + } + return new ArrayList<>(unionFiledSet); + } + + public static List skipDuplicateKey(List list, FieldSelector selector) { + if (CollectionUtils.isEmpty(list)) return Collections.emptyList(); + List filedList = new ArrayList<>(list.size()); + Map map = toMap(list, selector); + for (K key : map.keySet()) { + filedList.add(map.get(key)); + } + return filedList; + } +} diff --git a/src/main/java/com/emr/util/PropertySetter.java b/src/main/java/com/emr/util/PropertySetter.java new file mode 100644 index 0000000..714c4ed --- /dev/null +++ b/src/main/java/com/emr/util/PropertySetter.java @@ -0,0 +1,7 @@ +package com.emr.util; + +public interface PropertySetter { + + void apply(T t); + +} diff --git a/src/main/java/com/emr/util/Setters.java b/src/main/java/com/emr/util/Setters.java new file mode 100644 index 0000000..db1b600 --- /dev/null +++ b/src/main/java/com/emr/util/Setters.java @@ -0,0 +1,14 @@ +package com.emr.util; + +import java.util.List; + +public class Setters { + + public static Setters instance() { + return new Setters<>(); + } + + public ListPropertySetter list(List values) { + return new ListPropertySetter<>(values); + } +} diff --git a/src/main/java/com/emr/vo/BatchApplyDetailsVo.java b/src/main/java/com/emr/vo/BatchApplyDetailsVo.java new file mode 100644 index 0000000..f394d27 --- /dev/null +++ b/src/main/java/com/emr/vo/BatchApplyDetailsVo.java @@ -0,0 +1,52 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName AatchApplyDetailsVo + * @Description 借阅申请列表实体 + * @Author linjj + * @Date 2023/9/4 11:13 + * @Version 1.0 + */ + +@Data +public class BatchApplyDetailsVo { + + private int id; + //批次id + private int batchId; + //申请者 + private String applyName; + //申请时间 + private String applyTime; + //有效日期 + private String effectiveTime; + //申请理由 + private String applyReason; + + //申请类型：1.借阅申请，2.纸质申请 + private int applyFlag; + + //经办人 + private String handlingName; + + //申请科室 + private String applyDate; + //申请状态:1.已通过2.申请中，3.驳回 + private int applyStatc; + //出院时间 + private String disTime; + //申请天数 + private int effectiveDay; + //住院号 + private String inpatientNo; + //住院次数 + private Short admissTimes; + //患者姓名 + private String patientName; + //审批人姓名 + private String examineName; + //审批时间 + private String examineTime; +} diff --git a/src/main/java/com/emr/vo/BatchApplyVo.java b/src/main/java/com/emr/vo/BatchApplyVo.java new file mode 100644 index 0000000..31878dc --- /dev/null +++ b/src/main/java/com/emr/vo/BatchApplyVo.java @@ -0,0 +1,35 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName BatchApplyVo + * @Description 批量申请实体 + * @Author linjj + * @Date 2023/8/28 17:03 + * @Version 1.0 + */ +@Data +public class BatchApplyVo { + private int id; + //批次名称 + private String batchName; + //借阅数量 + private Integer borrowingNum; + //0.未审批，1.已审批，2.审批中 + private Integer statc; + //已审批数量 + private Integer readNum; + //创建人 + private String createName; + //开始时间 + private String startTime1; + //结束时间 + private String endTime1; + + //创建时间 + private String createDate; + //申请人工号 + private String applyName; + +} diff --git a/src/main/java/com/emr/vo/BatchBorrowingVo.java b/src/main/java/com/emr/vo/BatchBorrowingVo.java new file mode 100644 index 0000000..166dc89 --- /dev/null +++ b/src/main/java/com/emr/vo/BatchBorrowingVo.java @@ -0,0 +1,28 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName batchBorrowingVo + * @Description 批量接口借阅申请接受实体 + * @Author linjj + * @Date 2023/9/6 15:13 + * @Version 1.0 + */ +@Data +public class BatchBorrowingVo { + //patientId主键 + private String patientIds; + //申请理由 + private String applyReason; + //申请类型：1.借阅申请，2.纸质申请 + private int applyFlag; + //申请天数 + private int effectiveDay; + //批次id + private int batchId; + //申请人姓名 + private String applyName; + +} + diff --git a/src/main/java/com/emr/vo/Msg.java b/src/main/java/com/emr/vo/Msg.java index 7a86cba..18f24c4 100644 --- a/src/main/java/com/emr/vo/Msg.java +++ b/src/main/java/com/emr/vo/Msg.java @@ -18,6 +18,8 @@ public class Msg { private int code; //提示信息 private String msg; + //数据 + private Object data; //用户要返回给浏览器的数据 private Map extend=new HashMap(); @@ -27,6 +29,25 @@ public class Msg { result.setMsg("success"); return result; } + + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public static Msg successData(Object data){ + Msg result=new Msg(); + result.setCode(100); + result.setMsg("success"); + result.setData(data); + return result; + } + + public static Msg fail(){ Msg result=new Msg(); @@ -35,6 +56,8 @@ public class Msg { return result; } + + public static Msg fail(String msg){ Msg result=new Msg(); result.setCode(200); @@ -42,6 +65,13 @@ public class Msg { return result; } + public static Msg success(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; diff --git a/src/main/java/com/emr/vo/PicListVo.java b/src/main/java/com/emr/vo/PicListVo.java new file mode 100644 index 0000000..b361c9a --- /dev/null +++ b/src/main/java/com/emr/vo/PicListVo.java @@ -0,0 +1,27 @@ +package com.emr.vo; + +import lombok.Data; + + +/** + * @ClassName picListVo + * @Description 珠海妇幼返回图片信息实体 + * @Author linjj + * @Date 2023/9/8 10:48 + * @Version 1.0 + */ +@Data +public class PicListVo { + + //图片路径 + private String picUrl; + + + //分段id + private String assortId; + + + //分段名称 + private String assortName; + +} diff --git a/src/main/java/com/emr/vo/PushRcvBasicDTO.java b/src/main/java/com/emr/vo/PushRcvBasicDTO.java new file mode 100644 index 0000000..d91d9f9 --- /dev/null +++ b/src/main/java/com/emr/vo/PushRcvBasicDTO.java @@ -0,0 +1,81 @@ +package com.emr.vo; + +import lombok.Data; + + +import java.util.Date; + +@Data +public class PushRcvBasicDTO { + + + + private Long id; + + + private String patientId; + + + private Integer admissTimes; + + + private String inpatientNo; + + + private String jzh; + + + private String admissId; + + + private String name; + + + private String serialNumber; + + + private Date admissDate; + + + private String admissDept; + + + private String admissDeptName; + + + private Date disDate; + + + private String disDept; + + + private String disDeptName; + + + private Integer admissDays; + + + private String attendingName; + + + private Integer fileSource; + + + private RecoveryStateEnum recoveryState; + + + private PushStateEnum pushState; + + + private Date revoveryTime; + + + private String revoveryUser; + + + private Date updateTime; + + + private Date createTime; + +} diff --git a/src/main/java/com/emr/vo/PushStateEnum.java b/src/main/java/com/emr/vo/PushStateEnum.java new file mode 100644 index 0000000..96243b4 --- /dev/null +++ b/src/main/java/com/emr/vo/PushStateEnum.java @@ -0,0 +1,19 @@ +package com.emr.vo; + + +/** + * 回收状态 + */ +public enum PushStateEnum { + PUSH_WAITING(0, "待发布"), + PUSH_ALREADY(1, "已发布"); + + private Integer value; + private String display; + + PushStateEnum(Integer value, String display) { + this.value = value; + this.display = display; + } + +} diff --git a/src/main/java/com/emr/vo/RcvBasic.java b/src/main/java/com/emr/vo/RcvBasic.java new file mode 100644 index 0000000..2515338 --- /dev/null +++ b/src/main/java/com/emr/vo/RcvBasic.java @@ -0,0 +1,92 @@ +package com.emr.vo; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +/** + * 患者信息表 + * + * @author AutoGenerator + * @since 2023-09-13 + */ +@Data +public class RcvBasic implements Serializable { + + + private Long id; + + + private String patientId; + + + private Integer admissTimes; + + + private String inpatientNo; + + + private String jzh; + + + private String admissId; + + + private String name; + + + private String serialNumber; + + + private Date admissDate; + + + private String admissDept; + + + private String admissDeptName; + + + private Date disDate; + + + private String disDept; + + + private String disDeptName; + + + private Integer admissDays; + + + private String attendingName; + + + private Integer fileSource; + + + private RecoveryStateEnum recoveryState; + + + private PushStateEnum pushState; + + + private Date revoveryTime; + + + private String revoveryUser; + + + private Date updateTime; + + + private Date createTime; + + +} diff --git a/src/main/java/com/emr/vo/RecoveryStateEnum.java b/src/main/java/com/emr/vo/RecoveryStateEnum.java new file mode 100644 index 0000000..dc33975 --- /dev/null +++ b/src/main/java/com/emr/vo/RecoveryStateEnum.java @@ -0,0 +1,21 @@ +package com.emr.vo; + + + +/** + * 回收状态 + */ +public enum RecoveryStateEnum { + RECYCLED_WAITING(0, "待回收"), + RECYCLED_ALREADY(1, "已回收"); + + private Integer value; + private String display; + + RecoveryStateEnum(Integer value, String display) { + this.value = value; + this.display = display; + } + + +} diff --git a/src/main/java/com/emr/vo/ZhFyImageVo.java b/src/main/java/com/emr/vo/ZhFyImageVo.java new file mode 100644 index 0000000..4b41834 --- /dev/null +++ b/src/main/java/com/emr/vo/ZhFyImageVo.java @@ -0,0 +1,29 @@ +package com.emr.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @ClassName ZhFyimageVo + * @Description 珠海妇幼接口返回实体 + * @Author linjj + * @Date 2023/9/8 10:46 + * @Version 1.0 + */ + +@Data +public class ZhFyImageVo { + + //住院号 + private String inpatientNo; + //住院次数 + private int admissTimes; + + //出院时间 + private String disDate; + //图片信息集合 + private List picList; + + +} diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java index 2231b14..b3b9598 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java @@ -37,6 +37,14 @@ public class CommomVo { private String attending;//主治医师 + public String getApplyName() { + return applyName; + } + + public void setApplyName(String applyName) { + this.applyName = applyName; + } + private String mainDiagCode;//主要诊断编码 private String mainDiagName;//主要诊断名称 @@ -45,6 +53,8 @@ public class CommomVo { private String memo;//病案备注 + private String applyName; + private String country;//国籍 private String birthAddr;//出生地 @@ -95,6 +105,25 @@ public class CommomVo { private String clinicName;//门诊诊断名称 + private int refreshTable; + + public int getRefreshTable() { + return refreshTable; + } + + public void setRefreshTable(int refreshTable) { + this.refreshTable = refreshTable; + } + + public int getBatchId() { + return batchId; + } + + public void setBatchId(int batchId) { + this.batchId = batchId; + } + + private int batchId; private String admissThing;//入院病情(暂无用) private String pathologyCode;//病理诊断编码 diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 60d35d9..8127ebc 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -51,3 +51,6 @@ fullTextSearchUrl = http://172.16.11.90:57777/AppEngine3?wsdl fullTextSearchMethod = SearchFulltext #\u5168\u6587\u68C0\u7D22\u5173\u952E\u5B57\u4FDD\u7559\u5929\u6570 fullTextDays = 90 + + +NEW_EMR_RECORD_JSP : http://192.168.16.122:8083/emr_record \ No newline at end of file diff --git a/src/main/resources/mapper/BatchApplyDetailsMapper.xml b/src/main/resources/mapper/BatchApplyDetailsMapper.xml new file mode 100644 index 0000000..3c1a951 --- /dev/null +++ b/src/main/resources/mapper/BatchApplyDetailsMapper.xml @@ -0,0 +1,108 @@ + + + + + + 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 + ) + values + (#{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} + ) + + + + update batch_apply_details + + + effective_time = #{effectiveTime}, + + + handling_name = #{handlingName}, + + + examine_name = #{examineName}, + + + examine_time = #{examineTime}, + + + apply_statc=#{applyStatc}, + + + where id = #{id} + + + + UPDATE batch_apply_details + + + effective_time = #{item.effectiveTime}, + + + handling_name = #{item.handlingName}, + + + examine_name = #{item.examineName}, + + + examine_time = #{item.examineTime}, + + + apply_statc = #{item.applyStatc}, + + + where id = #{item.id} + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from batch_apply_details where batch_id=#{batchId} + + + delete from batch_apply_details where id=#{id} + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/BatchApplyMapper.xml b/src/main/resources/mapper/BatchApplyMapper.xml new file mode 100644 index 0000000..afd6637 --- /dev/null +++ b/src/main/resources/mapper/BatchApplyMapper.xml @@ -0,0 +1,114 @@ + + + + + insert into batch_apply + + + batch_name, + + + borrowing_num, + + + statc, + + + read_num, + + + create_name, + + + create_date, + + + apply_name, + + + + + #{batchName}, + + + #{borrowingNum}, + + + #{statc}, + + + #{readNum}, + + + #{createName}, + + + #{createDate}, + + + #{applyName}, + + + + + update batch_apply set batch_name=#{batchName} where id=#{id} + + + update batch_apply set borrowing_num=#{borrowingNum} where id=#{batchId} + + + DELETE FROM batch_apply WHERE id =#{id} + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index 0e75635..6daa30b 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -2,65 +2,6 @@ - @@ -1287,14 +1228,14 @@ + + + + update t_scan_assort set is_del = 0 where patient_id = #{patientId} diff --git a/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp b/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp new file mode 100644 index 0000000..f88907a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/batchApply/batchApply.jsp @@ -0,0 +1,235 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +<%@ include file="/WEB-INF/jspf/common.jspf" %> + + + + 批量申请借阅 + + + + + + + + +
+
+
+ + 批量申请借阅 + +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+ +<%--新增批次弹窗--%> + + + + + + + + +<%--修改批次弹窗--%> + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp b/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp new file mode 100644 index 0000000..023f10d --- /dev/null +++ b/src/main/webapp/WEB-INF/views/batchApply/batchApplyDetails.jsp @@ -0,0 +1,336 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +<%@ include file="/WEB-INF/jspf/common.jspf" %> + + + + 借阅详情 + + + + + + + + + + +
+
+
+ + 借阅详情 + +
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ + + + + +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- 申请借阅列表--%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%--
--%> + + +
+
+
+ + 申请借阅列表 + +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+ + + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp index 44d36fb..e7bff39 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -279,19 +279,12 @@
+<%-- +<%-- class="glyphicon glyphicon-question-sign" rel="drevil"--%> +<%-- data-container="body" data-toggle="popover" data-placement="bottom"--%> +<%-- data-content="精准查询，病案号要求8位">--%> +<%-- --%>
- <%--
- -
- - -
-
-
--%>
@@ -720,7 +713,7 @@
+ name="effeDays" oninput="if(value.length>3)value=value.slice(0,3)">
@@ -751,9 +744,9 @@ -<%-- --%> + <%-- --%> @@ -868,8 +861,10 @@ $(".modal-dialog").draggable();//为模态对话框添加拖拽 }) - - + + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp index 7070889..22f6b5a 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp @@ -91,11 +91,11 @@
- -
- -
- +<%-- --%> +<%--
--%> +<%-- --%> +<%--
--%> +<%-- --%>
'; + editanddrop += '   '; + return editanddrop; + } + } + ], + locale: 'zh-CN',//中文支持, + url: path + '/batchApply/selectBatchApply',//排序方式 + queryParams: function (params) { + return { + limit: params.limit, // 每页显示数量 + offset: params.offset, // SQL语句起始索引 + page: (params.offset / params.limit) + 1, //当前页码, + applyer: $("#applyerSearch").val(), + startTime1: $("#startTime1").val(), + endTime1: $("#endTime1").val(), + batchName: $("#batchName").val(), + createName: $("#createName").val() + } + }, + responseHandler: function (res) { + //在ajax获取到数据，渲染表格之前，修改数据源 + var nres = []; + nres.push({total: res.total, rows: res.list}); + return nres[0]; + }, + onLoadSuccess: function () { + $(".page-list").show(); + $(".fixed-table-body").css("overflow", "auto"); + }, + //监听分页点击事件 + onPageChange: function (num, type) { + pageNumber = num; + }, + //选中单个复选框 + onCheck: function (row) { + var checks = $("#checks").val(); + $("#checks").val(checks += "'" + row.id + "',"); + }, + //取消单个复选框 + onUncheck: function (row) { + var checks = $("#checks").val(); + checks = checks.replace("'" + row.id + "',", ""); + $("#checks").val(checks); + }, + //全选 + onCheckAll: function (rows) { + $("#checks").val(""); + var checks = ''; + for (var i = 0; i < rows.length; i++) { + checks += "'" + rows[i].id + "'," + } + $("#checks").val(checks); + }, + //全不选 + onUncheckAll: function (rows) { + $("#checks").val(""); + } +}) + +function crtTimeFtt(val) { + if (val != null) { + var date = new Date(val); + return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); + } +} + + +//删除分配 +function deleteById(id){ + Common.confirm({ + title: "提示", + message: "请确认是否删除此批次?", + operate: function (reselt) { + if (reselt) { + $.ajax({ + type: 'post', + url: path + '/batchApply/deleteById/', + data:{id:id}, + dataType: 'json', + success: function (data) { + console + if (data == 1) { + toastr.success("删除成功!"); + refreshTable(); + $('#mytab').bootstrapTable('selectPage', pageNumber); + } else { + toastr.warning("删除失败"); + } + } + }) + } + } + }) +} + +//修改批次给隐藏的id赋值 +function updateBatch(id){ + $("#updateId").val(id); +} +//修改批次 +function saveBatch(){ + var batchName = $("#updateBatchName").val(); + var updateId = $("#updateId").val(); + if (batchName == '') { + return toastr.warning("批次名称不能为空!"); + } + $.ajax({ + type:'post', + url:path+'/batchApply/updateBatch', + data:{id:updateId,batchName:batchName}, + dataType:'json', + success:function(data){ + if (data==0){ + return toastr.warning("修改批次失败!"); + } + if (data==1){ + toastr.success("修改批次成功!"); + $('#myModal1').modal('hide'); + reLoadTable(); + } + } + }) + +} + +//查询按钮 +function refreshTable() { + $("#checks").val(""); + $('#mytab').bootstrapTable('refresh', { + url: path + '/batchApply/selectBatchApply',//排序方式 + }) +} + +function empty() { + $(":input").val("") + refreshTable(); +} +//新增批次 +function insertBatch() { + var batchName = $("#batchNotes").val(); + var applyName = $("#applyName").val(); + if (batchName == '') { + return toastr.warning("批次名称不能为空!"); + } + if (applyName == '') { + return toastr.warning("申请人工号不能为空!"); + } + $.ajax({ + type:'post', + url:path+'/batchApply/insertBatch', + data:{batchName:batchName,applyName:applyName}, + dataType:'json', + success:function(data){ + if (data==0){ + return toastr.warning("新增批次失败!"); + } + if (data==1){ + toastr.success("新增批次成功!"); + $('#myModal').modal('hide'); + reLoadTable(); + } + } + }) +} + + +function reLoadTable(){ + $("#batchNotes").val(""); + $("#mytab").bootstrapTable('refresh',path + '/batchApply/selectBatchApply');//排序方式 +} + +$(function () { + initDateInput(1); + initDateInput(2); +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/batchApply/batchApplyDetails.js b/src/main/webapp/static/js/batchApply/batchApplyDetails.js new file mode 100644 index 0000000..6ca4548 --- /dev/null +++ b/src/main/webapp/static/js/batchApply/batchApplyDetails.js @@ -0,0 +1,735 @@ +//------------------------------------------查询结果--------------------------------------------------------- +let bomIds = [] +$('#mytab').bootstrapTable({ + height: $(window).height, + toolbar: '#toolbar', //工具按钮用哪个容器 + striped: true, //是否显示行间隔色 + cache: false, //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） + pagination: true, //是否显示分页（*） + checkboxHeader: true, + sidePagination: "server", //分页方式：client客户端分页，server服务端分页（*） + paginationPreText: '上一页', + paginationNextText: '下一页', + fixedColumns: true, + uniqueId: "patientId", + fixedNumber: 4, + pageNumber: 1, //初始化加载第一页，默认第一页 + pageSize: 20, //每页的记录行数（*） + pageList: [5, 10, 15, 20, 30, 50],//可供选择的每页的行数（*） + height: 300, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 + columns: [ + { + width: 25, + title: '全选', + field: 'check', + checkbox: true, + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + if (bomIds.indexOf(row['patientId']) >= 0) { + return {checked: true}; + } + } + }, + { + field: 'no', + title: '序号', + sortable: true, + formatter: function (value, row, index) { + //获取每页显示的数量 + var pageSize = $('#mytab').bootstrapTable('getOptions').pageSize; + //获取当前是第几页 + var pageNumber = $('#mytab').bootstrapTable('getOptions').pageNumber; + //返回序号，注意index是从0开始的，所以要加上1 + return pageSize * (pageNumber - 1) + index + 1; + } + }, + { + title: '住院号', + field: 'inpatientNo', + }, + { + title: '住院次数', + field: 'admissTimes', + }, + { + title: '出院科室', + field: 'disDept', + }, + { + title: '出院时间', + field: 'disDate', + formatter: crtTimeFtt + } + ], + locale: 'zh-CN',//中文支持, + url: path + '/applyDetails/getCommomVo',//排序方式 + queryParams: function (params) { + return { + limit: params.limit, // 每页显示数量 + offset: params.offset, // SQL语句起始索引 + page: (params.offset / params.limit) + 1, //当前页码, + inpatientNo: $("#inpatientNo").val(), + startTime: $("#startTime1").val(), + endTime: $("#endTime1").val(), + admissTimes: $("#admissTimes").val(), + disDept: $("#dis_dept").val(), + batchId: getUrlParam('batchId'), + applyName: getUrlParam('applyName') + } + }, + responseHandler: function (res) { + //在ajax获取到数据，渲染表格之前，修改数据源 + var nres = []; + nres.push({total: res.total, rows: res.list}); + return nres[0]; + }, + onLoadSuccess: function () { + $(".page-list").show(); + $(".fixed-table-body").css("overflow", "auto"); + }, + //监听分页点击事件 + onPageChange: function (num, type) { + pageNumber = num; + }, + //选中单个复选框 + onCheck: function (row) { + bomIds.push(row.patientId) + var checks = $("#checks").val(); + $("#checks").val(checks += "'" + row.id + "',"); + }, + //取消单个复选框 + onUncheck: function (row) { + const findIndex = bomIds.findIndex(rowIndex => rowIndex == row.patientId) + if (findIndex != -1) { + bomIds.splice(findIndex, 1) + } + var checks = $("#checks").val(); + checks = checks.replace("'" + row.id + "',", ""); + $("#checks").val(checks); + }, + //全选 + onCheckAll: function (rows) { + bomIds = rows.map(rowData => rowData.patientId) + + $("#checks").val(""); + var checks = ''; + for (var i = 0; i < rows.length; i++) { + checks += "'" + rows[i].id + "'," + } + $("#checks").val(checks); + }, + //全不选 + onUncheckAll: function (rows) { + bomIds = [] + $("#checks").val(""); + } +}) +function crtTimeFtt(val) { + if (val != null) { + var date = new Date(val); + return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); + } +} + +//键盘回车查询 +$(document).keyup(function(event){ + if(event.keyCode ==13){ + refreshTable(); + } +}); + +//查询按钮 +function refreshTable() { + $("#checks").val(""); + $('#mytab').bootstrapTable('refresh', { + url: path + '/applyDetails/getCommomVo', + }) + var inpatientNo = $("#inpatientNo").val(); + var startTime= $("#startTime1").val(); + var endTime= $("#endTime1").val(); + var admissTimes= $("#admissTimes").val(); + var disDept= $("#dis_dept").val(); + var batchId=getUrlParam('batchId'); + var applyName=getUrlParam('applyName') + $.ajax({ + type:'post', + url:path+'/applyDetails/getCommomVo', + 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){ + reLoadBorrowingTab(); + toastr.success("当前查询只有一条记录已自动帮你添加到批次中!"); + } + } + }) +} + +function empty() { + $(":input").val("") + refreshTable(); +} + + +$(function () { + initDateInput(1); + initDateInput(2); +}) + +//加载科室 +loadDept(); + +//加载科室 +function loadDept() { + $.ajax({ + type: 'get', + url: path + '/commom/getDept', + dataType: 'json', + success: function (data) { + if (null != data) { + $("#dis_dept").empty(); + var html = ''; + for (var i = 0; i < data.length; i++) { + if (data[i].name != '') { + var name = data[i].name; + var code = data[i].code; + html += ''; + } + } + $("#dis_dept").append(html); + } + } + }) +} + +//批量添加 +function addApprovesMore() { + //先清除上次数据 + clearContent(); + //批量添加选择信息 + tabChecks = getChecked(); +} + +//保存批量申请 +function add() { + var effeDays = $("#effeDays").val(); + var applyReason = $("#applyReason").val(); + var applyName = $("#applyName").val(); + var patientIds = bomIds.join(); + var batchId = getUrlParam('batchId'); + var applyName = getUrlParam('applyName') + if (bomIds.length == 0) { + return toastr.warning("至少选择一条以上"); + } + if (effeDays == "") { + return toastr.warning("申请天数不能为空"); + } + if (applyReason == "") { + return toastr.warning("申请理由不能为空"); + } + $.ajax({ + type: 'post', + url: path + '/applyDetails/addBatchBorrowing', + data: { + effectiveDay: effeDays, + applyReason: applyReason, + applyName: applyName, + applyFlag: 1, + patientIds: patientIds, + batchId: batchId + }, + dataType: 'json', + success: function (data) { + console.log(data.code) + if (data.code == 200) { + return toastr.warning("批量借阅申请失败!"); + } + if (data.code == 100) { + toastr.success("批量借阅申请成功!"); + $('#borrowingModal').modal('hide'); + //刷新申请借阅列表 + reLoadBorrowingTab(); + } + } + }) +} + + +//获取选中行信息 +function getChecked() { + tabChecks = ""; + var inpatientNoArray = new Array(); + var admissTimesArray = new Array(); + var nameArray = new Array(); + var disDeptArray = new Array(); + var idlist = $('#mytab').bootstrapTable('getAllSelections'); + if (idlist.length > 0) { + for (var i = 0; i < idlist.length; i++) { + tabChecks += idlist[i].id + ","; + inpatientNoArray.push(idlist[i].inpatientNo); + admissTimesArray.push(idlist[i].admissTimes); + nameArray.push(idlist[i].name); + disDeptArray.push(idlist[i].disDept); + } + $("#checks").val(checks); + } + insertContent(inpatientNoArray, admissTimesArray, nameArray, disDeptArray); + if (null != tabChecks) { + tabChecks = tabChecks.substring(0, tabChecks.length - 1); + } + return tabChecks; +} + + +//添加内容，tr td +function insertContent(inpatientNoArray, admissTimesArray, nameArray, disDeptArray) { + for (var i = 0; i < inpatientNoArray.length; i++) { + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + var td2 = document.createElement("td"); + var td3 = document.createElement("td"); + var td4 = document.createElement("td"); + td1.innerHTML = inpatientNoArray[i]; + td2.innerHTML = nameArray[i]; + td3.innerHTML = admissTimesArray[i]; + td4.innerHTML = disDeptArray[i]; + tr.appendChild(td1); + tr.appendChild(td2); + tr.appendChild(td3); + tr.appendChild(td4); + document.getElementById("moreApproveBody").appendChild(tr); + } +} + + +//清楚内容方法 +function clearContent() { + $('#addApprovesMore').removeAttr("data-target", "#borrowingModal"); + var table = document.getElementById("moreApproveBody"); + var len = table.childNodes.length; + for (var i = len - 1; i >= 0; i--) { + table.removeChild(table.childNodes[i]); + } +} + + +//------------------------------------------申请借阅列表--------------------------------------------------------- +borrowingTab() + +let borrowingIds = [] +function borrowingTab() { + $('#borrowingTab').bootstrapTable({ + height: $(window).height, + toolbar: '#toolbar', //工具按钮用哪个容器 + striped: true, //是否显示行间隔色 + cache: false, //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） + pagination: true, //是否显示分页（*） + sidePagination: "server", //分页方式：client客户端分页，server服务端分页（*） + paginationPreText: '上一页', + paginationNextText: '下一页', + fixedColumns: true, + fixedNumber: 4, + pageNumber: 1, //初始化加载第一页，默认第一页 + pageSize: 20, //每页的记录行数（*） + pageList: [5, 10, 15, 20, 30, 50],//可供选择的每页的行数（*） + height: 350, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 + columns: [ + { + title: '全选', + field: 'select', + checkbox: true, + width: 25, + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + if (borrowingIds.indexOf(row['id']) >= 0) { + return {checked: true}; + } + var applyStatc = row.applyStatc; + if (applyStatc == 1 || applyStatc == 4 || applyStatc === 3) { + return { disabled : true} + } + } + }, + { + field: 'no', + title: '序号', + sortable: true, + formatter: function (value, row, index) { + //获取每页显示的数量 + var pageSize = $('#borrowingTab').bootstrapTable('getOptions').pageSize; + //获取当前是第几页 + var pageNumber = $('#borrowingTab').bootstrapTable('getOptions').pageNumber; + //返回序号，注意index是从0开始的，所以要加上1 + return pageSize * (pageNumber - 1) + index + 1; + } + }, + { + title: '申请日期', + field: 'applyTime', + formatter: crtTimeFtt + }, + { + title: '申请天数', + field: 'effectiveDay', + }, + { + title: '有效日期', + field: 'effectiveTime', + formatter: crtTimeFtt + }, + { + title: '病案号', + field: 'inpatientNo', + + }, + { + title: '住院次数', + field: 'admissTimes', + + }, + { + title: '患者姓名', + field: 'patientName', + + }, + { + title: '出院日期', + field: 'disTime', + formatter: crtTimeFtt + }, + { + title: '申请理由', + field: 'applyReason', + + }, + { + title: '申请类型', + field: 'applyFlag', + formatter: function (value, row, index) { + var spanValue; + if (value == 1) { + spanValue = '

借阅申请

'; + } else if (value == 2) { + spanValue = '

纸质申请

'; + } + return spanValue; + } + }, + { + title: '申请状态', + field: 'applyStatc', + formatter: function (value, row, index) { + var spanValue; + if (value == 1) { + spanValue = '

已通过

'; + } else if (value == 2) { + spanValue = '

申请中

'; + } else if (value == 3) { + spanValue = '

驳回

'; + }else if (value == 4) { + spanValue = '

已过期

'; + } + return spanValue; + } + }, + { + title: '经办人', + field: 'handlingName', + }, + { + title: '审批人姓名', + field: 'examineName', + }, + { + title: '审批时间', + field: 'examineTime', + formatter: crtTimeFtt + }, + { + title: '操作', + formatter: function (value, row, index) { + var applyStatc = row.applyStatc; + var editanddrop = ''; + if (applyStatc != 1 && applyStatc != 4&& applyStatc != 3) { + editanddrop += '   '; + } + editanddrop += '   '; + if (applyStatc != 3 && applyStatc != 4) { + editanddrop += '   '; + } + return editanddrop; + } + } + + ], + locale: 'zh-CN',//中文支持, + url: path + '/applyDetails/getBatchApplyDetails',//排序方式 + queryParams: function (params) { + return { + limit: params.limit, // 每页显示数量 + offset: params.offset, // SQL语句起始索引 + page: (params.offset / params.limit) + 1, //当前页码, + batchId: getUrlParam('batchId'), + inpatientNo: $("#inpatientNo1").val(), + } + }, + responseHandler: function (res) { + //在ajax获取到数据，渲染表格之前，修改数据源 + var nres = []; + nres.push({total: res.total, rows: res.list}); + return nres[0]; + }, + onLoadSuccess: function () { + $(".page-list").show(); + $(".fixed-table-body").css("overflow", "auto"); + }, + //监听分页点击事件 + onPageChange: function (num, type) { + pageNumber = num; + }, + //选中单个复选框 + onCheck: function (row) { + borrowingIds.push(row.id) + var checks = $("#checks").val(); + $("#checks").val(checks += "'" + row.id + "',"); + }, + //取消单个复选框 + onUncheck: function (row) { + const findIndex = borrowingIds.findIndex(rowIndex => rowIndex == row.id) + if (findIndex != -1) { + borrowingIds.splice(findIndex, 1) + } + var checks = $("#checks").val(); + checks = checks.replace("'" + row.id + "',", ""); + $("#checks").val(checks); + }, + //全选 + onCheckAll: function (rows) { + borrowingIds = rows.map(rowData => rowData.id) + $("#checks").val(""); + var checks = ''; + for (var i = 0; i < rows.length; i++) { + checks += "'" + rows[i].id + "'," + } + $("#checks").val(checks); + }, + //全不选 + onUncheckAll: function (rows) { + borrowingIds = [] + $("#checks").val(""); + } + }) +} + +//截取路径后参数 +function getUrlParam(name) { + var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象 + var r = window.location.search.substr(1).match(reg); //匹配目标参数 + if (r != null) return unescape(r[2]); + return null; //返回参数值 +} + +//删除分配 +function deleteById(id) { + Common.confirm({ + title: "提示", + message: "请确认是否删除此申请?", + operate: function (reselt) { + if (reselt) { + $.ajax({ + type: 'post', + url: path + '/applyDetails/deleteById', + data: {id: id,batchId: getUrlParam('batchId'),}, + dataType: 'json', + success: function (data) { + console + if (data == 1) { + toastr.success("删除成功!"); + reLoadBorrowingTab(); + $('#mytab').bootstrapTable('selectPage', pageNumber); + } else { + toastr.warning("删除失败"); + } + } + }) + } + } + }) +} + + +//借阅审批 +function approveById(id,effectiveDay) { + console.log(id,effectiveDay) + Common.confirm({ + title: "提示", + message: "请确认是否通过此申请?", + operate: function (reselt) { + if (reselt) { + $.ajax({ + type: 'post', + url: path + '/applyDetails/agreeById/', + data: {ids: id,effectiveDay:effectiveDay}, + dataType: 'json', + success: function (data) { + console + if (data == 1) { + toastr.success("通过成功!"); + reLoadBorrowingTab(); + $('#mytab').bootstrapTable('selectPage', pageNumber); + } else { + toastr.warning("通过失败"); + } + } + }) + } + } + }) +} + + +//批量审核 +function batchApprove() { + //先清除上次数据 + clearContentApprove(); + //批量添加选择信息 + tabChecks = getApproveChecked(); +} + + +//获取申请借阅列表选中行信息 +function getApproveChecked() { + tabChecks = ""; + var inpatientNoArray = new Array(); + var admissTimesArray = new Array(); + var nameArray = new Array(); + var effectiveDayArray = new Array(); + var idlist = $('#borrowingTab').bootstrapTable('getAllSelections'); + if (idlist.length > 0) { + for (var i = 0; i < idlist.length; i++) { + tabChecks += idlist[i].id + ","; + inpatientNoArray.push(idlist[i].inpatientNo); + admissTimesArray.push(idlist[i].admissTimes); + nameArray.push(idlist[i].patientName); + effectiveDayArray.push(idlist[i].effectiveDay); + } + $("#checks").val(checks); + } + insertApproveContent(inpatientNoArray, admissTimesArray, nameArray,effectiveDayArray); + if (null != tabChecks) { + tabChecks = tabChecks.substring(0, tabChecks.length - 1); + } + return tabChecks; +} + +//添加内容，tr td +function insertApproveContent(inpatientNoArray, admissTimesArray, nameArray,effectiveDayArray) { + for (var i = 0; i < inpatientNoArray.length; i++) { + var tr = document.createElement("tr"); + var td1 = document.createElement("td"); + var td2 = document.createElement("td"); + var td3 = document.createElement("td"); + var td5 = document.createElement("td"); + td1.innerHTML = inpatientNoArray[i]; + td2.innerHTML = nameArray[i]; + td3.innerHTML = admissTimesArray[i]; + td5.innerHTML = effectiveDayArray[i]; + tr.appendChild(td1); + tr.appendChild(td2); + tr.appendChild(td3); + tr.appendChild(td5); + document.getElementById("approveBody").appendChild(tr); + } +} + + + +//清楚内容方法 +function clearContentApprove() { + $('#batchApprove').removeAttr("data-target", "#approveModal"); + var table = document.getElementById("approveBody"); + var len = table.childNodes.length; + for (var i = len - 1; i >= 0; i--) { + table.removeChild(table.childNodes[i]); + } +} +//驳回 +function rejectById(id) { + Common.confirm({ + title: "提示", + message: "请确认是否驳回此申请?", + operate: function (reselt) { + if (reselt) { + $.ajax({ + type: 'post', + url: path + '/applyDetails/rejectById/', + data: {id: id}, + dataType: 'json', + success: function (data) { + console + if (data == 1) { + toastr.success("驳回成功!"); + reLoadBorrowingTab(); + $('#mytab').bootstrapTable('selectPage', pageNumber); + } else { + toastr.warning("驳回失败"); + } + } + }) + } + } + }) +} + +//情况 +function borrowingEmpty() { + $(":input").val("") + refreshBorrowingTab(); +} + + +//申请借阅列表查询按钮 +function refreshBorrowingTab() { + $("#checks").val(""); + $('#borrowingTab').bootstrapTable('refresh', { + url: path + '/applyDetails/getBatchApplyDetails',//排序方式 + }) +} + + + +//保存批量申请 +function addApprove() { + var ids = borrowingIds.join(); + if (borrowingIds.length == 0) { + return toastr.warning("至少选择一条以上"); + } + $.ajax({ + type: 'post', + url: path + '/applyDetails/agreeById', + data: { + ids: ids, + }, + dataType: 'json', + success: function (data) { + if (data.code == 200) { + return toastr.warning("批量借阅申请失败!"); + } + if (data.code == 100) { + toastr.success("批量借阅申请成功!"); + // $('#borrowingModal').modal('hide'); + // //刷新申请借阅列表 + // reLoadBorrowingTab(); + } + } + }) +} + + +//批量申请确认提交后刷新页面 +function reLoadBorrowingTab() { + $("#borrowingTab").bootstrapTable('refresh', path + '/applyDetails/getBatchApplyDetails');//排序方式 +} + diff --git a/src/main/webapp/static/js/font/recordList.js b/src/main/webapp/static/js/font/recordList.js index 0e5ecc1..de0bf53 100644 --- a/src/main/webapp/static/js/font/recordList.js +++ b/src/main/webapp/static/js/font/recordList.js @@ -41,11 +41,18 @@ $('#mytab').bootstrapTable({ title:'姓名', field:'name', }, - { - title:'住院次数', - field:'admissTimes', + title:'性别', + field:'sex', }, + { + title:'身份证号', + field:'idCard', + }, + // { + // title:'住院次数', + // field:'admissTimes', + // }, { title:'出院日期', field:'disDate', @@ -54,6 +61,10 @@ $('#mytab').bootstrapTable({ title:'出院科室', field:'disDept', }, + { + title:'主要诊断', + field:'mainDiagName', + }, { title:'操作', formatter: function(value,row){ diff --git a/src/main/webapp/static/js/pinying.js b/src/main/webapp/static/js/pinying.js index ea766c7..26479c6 100644 --- a/src/main/webapp/static/js/pinying.js +++ b/src/main/webapp/static/js/pinying.js @@ -488,3 +488,4 @@ function arraySearch(l1) { } return false; } + diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 0bf575f..5a5fe3b 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -791,3 +791,26 @@ function setLocation(id) { +$(function () { $("[data-toggle='popover']").popover(); }); + +$("[rel=drevil]").popover({ + trigger:'manual', + html: 'true', + animation: false +}).on("mouseenter", function () { + var _this = this; + $(this).popover("show"); + $(this).siblings(".popover").on("mouseleave", function () { + $(_this).popover('hide'); + }); +}).on("mouseleave", function () { + var _this = this; + setTimeout(function () { + if (!$(".popover:hover").length) { + $(_this).popover("hide") + } + }, ); +});　 + + + diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js index c0bd3b2..542498f 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBlood.js @@ -136,21 +136,22 @@ function onloadPdf(scanPages, sources) { datType: 'json', success: function (data) { if (data.code == 0) { - var str = path + "/commom/getRecordContentBlood?patientId=" + patientId; - if (sources.includes("99")){ - $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer.html?file=" + encodeURIComponent(str)) - }else { - $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer2.html?file=" + encodeURIComponent(str)) - var rootPaths = parent.$("#rootPaths").val(); - var print = $("#print").val(); - if (print == 1){ - selectPrintPic(patientId, rootPaths, scanPages, sources); - } + var str = path + "/commom/getRecordContentBlood?patientId=" + patientId; + if (sources.includes("99") ||sources.includes("服务") ||sources.includes("null")||sources.includes("pacs")||sources.includes("扫描上传")) { + $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer.html?file=" + encodeURIComponent(str)) + } else { + $("#iframe1").attr("src", path + "/static/pdfjs/web/viewer2.html?file=" + encodeURIComponent(str)) + var rootPaths = parent.$("#rootPaths").val(); + var print = $("#print").val(); + if (print == 1) { + selectPrintPic(patientId, rootPaths, scanPages, sources); } } } + } }) } + /*function onloadPdf(scanPages, sources) { $("#iframeLoad").val(""); $("#printPicLoaded").val(""); @@ -309,14 +310,14 @@ if (iframe.attachEvent) { function onloadJpgForPdf() { var typeId = $("#typeId").val(); if (typeId == undefined) { - typeId = ''; + typeId = 1; } Common.confirm({ title: "提示", message: "确认将左侧树选中的图片下载pdf?", operate: function (reselt) { if (reselt) { - var patientId = $("#patientId").val(); + var patientId = $("#patientId").val(); var assortIds = $("#assortIds").val(); var flag = parent.$("#flag").val(); post(path + '/template/downloadPdfBlood', { @@ -400,9 +401,11 @@ function delPic() { } }) } -function printCurrent(){ + +function printCurrent() { PDFJS.workerSrc = '../static/pdfjs/viewer2.js';//加载核心库 } + //记录打印记录 function printInfoBlood() { var patientId = "'" + $("#patientId").val() + "'"; @@ -506,7 +509,7 @@ function search() { var inpatientNo = row.inpatientNo.replace(/\s+/g, ""); var name = row.name; var admissTimes = row.admissTimes; - var info = "'" + patientId+ "," + inpatientNo + "," + name + "," + admissTimes + "'"; + var info = "'" + patientId + "," + inpatientNo + "," + name + "," + admissTimes + "'"; var editanddrop = ''; return editanddrop; } @@ -590,7 +593,7 @@ function movePdf() { var newAssortId = $("#moveAssortId").val(); if (oldPatientId == '' || newPatientId == '' || assortIds == '' || newAssortId == '') { toastr.warning("程序出现错误,请联系管理员！"); - } else { + } else { $.ajax({ type: 'post', url: path + '/template/movePdfBlood', @@ -612,5 +615,4 @@ function movePdf() { } - }