From 0c1f8c479065739f3c7a5126de8e667035d00b58 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 12 十月 2026 14:21:52 +0800
Subject: [PATCH] 【丽水】满意度模块化：新增 ruoyi-satisfaction 独立模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 49f7537..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;
@@ -12,6 +13,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;
@@ -69,10 +71,28 @@
SysUser user = getLoginUser().getUser();
patMedInhosp.setOrgid(user.getOrgid());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
+ // startPage 涔嬪悗 PageHelper 宸茬粡鑷姩鎵ц杩囦竴娆� count 鏌ヨ锛岀洿鎺ュ鐢� Page 閲岀殑 total锛�
+ // 閬垮厤鐢� PageUtils.count 鎶婂甫 JOIN 鐨勭粺璁¤鍙ュ啀璺戜竴閬�
+ long count = new PageInfo<>(list).getTotal();
+ 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.selectPatMedInhospList(patMedInhosp);
+ patMedInhospService.selectPatMedInhospByApplication(patMedInhosp);
}
});
return getDataTable2(count, list);
@@ -237,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