From 1f66eb9a6353d638f5b9cb33b934bd4705e4efed Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 29 七月 2026 17:35:56 +0800
Subject: [PATCH] Merge branch 'master-任务组'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 08f9db6..e29195d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysConfigService;
+import com.smartor.domain.DTO.PatMedInhospDTO;
import com.smartor.domain.PatMedInhosp;
import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
@@ -73,6 +74,27 @@
@Override
public void doSelect() {
patMedInhospService.selectPatMedInhospList(patMedInhosp);
+ }
+ });
+ return getDataTable2(count, list);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呬綇闄㈣褰曢�氳繃鍏ラ櫌鐢宠鍗曚俊鎭�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曢�氳繃鍏ラ櫌鐢宠鍗曚俊鎭�")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/selectPatMedInhospByApplication")
+ public TableDataInfo selectPatMedInhospByApplication(@RequestBody PatMedInhosp patMedInhosp) {
+ PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
+ SysUser user = getLoginUser().getUser();
+ patMedInhosp.setOrgid(user.getOrgid());
+ List<PatMedInhospDTO> list = patMedInhospService.selectPatMedInhospByApplication(patMedInhosp);
+ long count = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ patMedInhospService.selectPatMedInhospByApplication(patMedInhosp);
}
});
return getDataTable2(count, list);
@@ -196,6 +218,7 @@
* @return
*/
@ApiOperation("鍚勭瀹ゆ湇鍔′汉娆�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/getDeptRanking")
public TableDataInfo getDeptRanking(@RequestBody PatMedReq patMedReq) {
return getDataTable(patMedInhospService.getDeptRanking(patMedReq));
@@ -245,4 +268,14 @@
}
}
}
+
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ @ApiOperation("addOperationSubTask")
+ @PostMapping("/addOperationSubTask")
+ public void addOperationSubTask() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ iPatMedInhospService.addOperationSubTask(config);
+ }
}
--
Gitblit v1.9.3