From a2dd18982406d0b859ba8a6f3aa1696014faf966 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 15 十二月 2025 17:05:22 +0800
Subject: [PATCH] 【丽水】处理患者信息，进入子任务表定时任务 空指针异常修复
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 997d368..e6e0859 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
@@ -5,13 +5,16 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
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;
+import com.smartor.domain.PatServiceCount;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
import io.swagger.annotations.Api;
@@ -40,8 +43,9 @@
@Autowired
private IPatMedOuthospService iPatMedOuthospService;
- @Value("${visitHosp}")
- private Integer visitHosp;
+ //todo
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -52,6 +56,8 @@
@PostMapping("/selectPatMedInhospList")
public TableDataInfo selectPatMedInhosplist(@RequestBody PatMedInhosp patMedInhosp) {
PageUtils.startPageByPost(patMedInhosp.getPageNum(), patMedInhosp.getPageSize());
+ SysUser user = getLoginUser().getUser();
+ patMedInhosp.setOrgid(user.getOrgid());
List<PatMedInhosp> list = patMedInhospService.selectPatMedInhospList(patMedInhosp);
long count = PageUtils.count(new ISelect() {
@Override
@@ -60,6 +66,17 @@
}
});
return getDataTable2(count, list);
+ }
+
+ /**
+ * 鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級
+ */
+ @ApiOperation("鍑洪櫌銆侀棬璇婁汉鏁板拰闅忚閲忕粺璁★紙鍛紝鏈堬紝骞达級")
+ //@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
+ @PostMapping("/queryPersonCount")
+ public TableDataInfo queryPersonCount(@RequestBody PatServiceCount patServiceCount) {
+
+ return null;
}
/**
@@ -92,7 +109,9 @@
@PostMapping("/selectPatMedInhospListCount")
@ApiOperation("鏌ヨ鍑恒�佸叆闄㈢湅鐥呬汉娆″拰浜烘暟")
- public AjaxResult selectPatMedInhospListCount(PatMedReq patMedReq) {
+ public AjaxResult selectPatMedInhospListCount(@RequestBody PatMedReq patMedReq) {
+ SysUser user = getLoginUser().getUser();
+ patMedReq.setOrgid(user.getOrgid());
return success(patMedInhospService.selectPatMedInhospListCount(patMedReq));
}
@@ -193,4 +212,11 @@
// }
// }
+ @ApiOperation("娴嬭瘯瀹氭椂浠诲姟dealOutHospInfo")
+ @PostMapping("/dealOutHospInfo")
+ public void dealOutHospInfo() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ //鍑洪櫌琛�
+ patMedInhospService.dealOutHospInfo(config);
+ }
}
--
Gitblit v1.9.3