From 91f8f35123a27c923e5006e0324829fbe3d9da65 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 19 一月 2026 17:52:29 +0800
Subject: [PATCH] 【丽水】smartor/servicetask/list 接口优化
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 1eb99d4..08f9db6 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.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,6 +11,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.PatMedInhosp;
import com.smartor.domain.PatMedInhospVO;
import com.smartor.domain.PatMedReq;
@@ -42,15 +44,25 @@
@Autowired
private IPatMedOuthospService iPatMedOuthospService;
- @Value("${visitHosp}")
- private Integer visitHosp;
+ @Autowired
+ private IPatMedInhospService iPatMedInhospService;
+ @Autowired
+ private ISysConfigService configService;
+
+ @Value("${server.port}")
+ private String port;
+
+
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
@ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedInhospList")
public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) {
PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
@@ -80,6 +92,7 @@
/**
* 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
*/
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@ApiOperation("鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�")
@PostMapping("/selectPatMedInhospListByCondition")
public TableDataInfo selectPatMedInhospListByCondition(@RequestBody PatMedInhospVO patMedInhospVO) {
@@ -105,9 +118,15 @@
return success(patMedInhospService.getDeptCodeByPatId(patMedInhosp));
}
+ /**
+ * 鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟锛堜汉鏁板垎涓洪娆℃湇鍔°�佸啀娆℃湇鍔°�佷笓鐥呮湇鍔★級
+ */
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectPatMedInhospListCount")
@ApiOperation("鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟")
public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) {
+ SysUser user = getLoginUser().getUser();
+ patMedReq.setOrgid(user.getOrgid());
return success(patMedInhospService.selectPatMedInhospListCount(patMedReq));
}
@@ -140,6 +159,7 @@
@ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody PatMedInhosp patMedInhosp) {
SysUser user = getLoginUser().getUser();
@@ -153,6 +173,7 @@
@ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody PatMedInhosp patMedInhosp) {
return toAjax(patMedInhospService.updatePatMedInhosp(patMedInhosp));
@@ -208,4 +229,20 @@
// }
// }
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ @ApiOperation("dealOutHospInfo")
+ @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();
+ }
+ }
+ }
}
--
Gitblit v1.9.3