From 6381bb6b6422c23ee4801895019f1a432903fbe8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 七月 2025 14:58:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 7201cc7..fe63ae2 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,10 +12,13 @@
import com.smartor.domain.PatMedInhosp;
import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
+import com.smartor.domain.PatServiceCount;
import com.smartor.service.IPatMedInhospService;
+import com.smartor.service.IPatMedOuthospService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +38,13 @@
@Autowired
private IPatMedInhospService patMedInhospService;
+ @Autowired
+ private IPatMedOuthospService iPatMedOuthospService;
+
+ @Value("${visitHosp}")
+ private Integer visitHosp;
+
+
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@@ -51,6 +61,17 @@
}
});
return getDataTable2(count, list);
+ }
+
+ /**
+ * 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級
+ */
+ @ApiOperation("鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ @PostMapping("/queryPersonCount")
+ public TableDataInfo queryPersonCount(@RequestBody PatServiceCount patServiceCount) {
+
+ return null;
}
/**
@@ -83,7 +104,7 @@
@PostMapping("/selectPatMedInhospListCount")
@ApiOperation("鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟")
- public AjaxResult selectPatMedInhospListCount(PatMedReq patMedReq) {
+ public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) {
return success(patMedInhospService.selectPatMedInhospListCount(patMedReq));
}
@@ -177,6 +198,11 @@
// @GetMapping("/test")
// public void test() {
// patMedInhospService.dealOutHospInfo();
+//
+// //闂ㄨ瘖琛�
+// if (visitHosp != 1) {
+// iPatMedOuthospService.dealOutpatientInfo();
+// }
// }
}
--
Gitblit v1.9.3