From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
index 61584b5..04595fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PersonWorkbenchController.java
@@ -33,17 +33,17 @@
*/
@ApiOperation("褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌")
@GetMapping("/getPatCount")
- public TableDataInfo getPatCount(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
+ public TableDataInfo getPatCount(@RequestParam("deptcodes") String deptcodes, @RequestParam("dcCodes") String dcCodes) {
//鑾峰彇褰撳墠鐧婚檰浜�
Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
- if (StringUtils.isEmpty(detpIds)) {
- detpIds = deptAndDocID.get("deptId");
+ if (StringUtils.isEmpty(deptcodes)) {
+ deptcodes = deptAndDocID.get("deptcodes");
}
if (StringUtils.isEmpty(dcCodes)) {
dcCodes = deptAndDocID.get("userName");
}
- List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
+ List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(deptcodes, dcCodes);
return getDataTable(patCount);
}
@@ -53,17 +53,17 @@
@ApiOperation("褰撳墠鐧诲綍鐢ㄦ埛鐨勯棬璇娿�佸湪闄€�佸嚭闄㈢梾浜虹殑缁熻鎯呭喌")
//@PreAuthorize("@ss.hasPermi('system:tag:list')")
@GetMapping("/getTaskInfo")
- public TableDataInfo getTaskInfo(@RequestParam("deptIds") String detpIds, @RequestParam("dcCodes") String dcCodes) {
+ public TableDataInfo getTaskInfo(@RequestParam("deptcode") String deptcode, @RequestParam("dcCodes") String dcCodes) {
//鑾峰彇褰撳墠鐧婚檰浜�
Map<String, String> deptAndDocID = DeptUtils.getDeptAndDocID();
- if (StringUtils.isEmpty(detpIds)) {
- detpIds = deptAndDocID.get("deptId");
+ if (StringUtils.isEmpty(deptcode)) {
+ deptcode = deptAndDocID.get("deptcode");
}
if (StringUtils.isEmpty(dcCodes)) {
dcCodes = deptAndDocID.get("userName");
}
- List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(detpIds, dcCodes);
+ List<PerSonWorkbenchDto> patCount = personWorkbenchService.getPatCount(deptcode, dcCodes);
return getDataTable(patCount);
}
--
Gitblit v1.9.3