From ccf5fc76de48e6add5b325b93f2b0ea54efbf2b8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 23 九月 2026 18:24:26 +0800
Subject: [PATCH] 1.代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 e29195d..2a63d65 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.ISelect;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -70,12 +71,9 @@
SysUser user = getLoginUser().getUser();
patMedInhosp.setOrgid(user.getOrgid());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
- long count = PageUtils.count(new ISelect() {
- @Override
- public void doSelect() {
- patMedInhospService.selectPatMedInhospList(patMedInhosp);
- }
- });
+ // startPage 涔嬪悗 PageHelper 宸茬粡鑷姩鎵ц杩囦竴娆� count 鏌ヨ锛岀洿鎺ュ鐢� Page 閲岀殑 total锛�
+ // 閬垮厤鐢� PageUtils.count 鎶婂甫 JOIN 鐨勭粺璁¤鍙ュ啀璺戜竴閬�
+ long count = new PageInfo<>(list).getTotal();
return getDataTable2(count, list);
}
@@ -259,19 +257,28 @@
@PostMapping("/dealOutHospInfo")
public void dealOutHospInfo() {
String config = configService.selectConfigByKey("visit.early.day");
- if (port.equals("8095")) {
- //鍑洪櫌琛�
- iPatMedInhospService.dealOutHospInfo(config);
- //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
- if (!active.equals("xh")) {
- iPatMedOuthospService.dealOutpatientInfo();
- }
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfo(config);
+ //闂ㄨ瘖琛�(鏂板崕鐨勬殏鏃朵笉鍋氶棬璇婇殢璁�)
+ if (!active.equals("xh")) {
+ iPatMedOuthospService.dealOutpatientInfo();
}
}
/**
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
*/
+ @ApiOperation("dealOutHospInfoBySchedule")
+ @PostMapping("/dealOutHospInfoBySchedule")
+ public void dealOutHospInfoBySchedule() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ //鍑洪櫌琛�
+ iPatMedInhospService.dealOutHospInfoBySchedule(config);
+ }
+
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
@ApiOperation("addOperationSubTask")
@PostMapping("/addOperationSubTask")
public void addOperationSubTask() {
--
Gitblit v1.9.3