From 2e9b1bcc853cd3560091f081370cc881ae67729d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 20 八月 2026 17:07:12 +0800
Subject: [PATCH] 【市一】出院记录同步定时任务调整
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index f2a5c06..a7a1e45 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -27,6 +27,7 @@
import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.ServiceSubtaskVO;
+import com.smartor.domain.VO.TransferDeptVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
@@ -45,6 +46,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -102,6 +104,18 @@
@Autowired
private RedisCache redisCache;
+
+ /**
+ * 杞Щ绉戝鐥呭尯
+ */
+ @ApiOperation("杞Щ绉戝鐥呭尯")
+ @PostMapping("/transferDept")
+ public Map<String, Object> transferDept(@RequestBody TransferDeptVO transferDeptVO) {
+ Integer i = serviceSubtaskService.transferDept(transferDeptVO);
+ return success(i == 1 ? true : false);
+ }
+
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
@@ -113,6 +127,7 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
serviceSubtaskVO.setOrgid(user.getOrgid());
+ serviceSubtaskVO.setCampusid(user.getCampusid());
ServiceSubtaskEntity serviceSubtaskEntity = null;
if (serviceSubtaskVO != null) {
serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
@@ -456,7 +471,8 @@
SysUser user = getLoginUser().getUser();
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
- return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
+ serviceSubtask.setCampusid(user.getCampusid());
+ return success(serviceSubtaskService.insertServiceSubtask(serviceSubtask));
}
@ApiOperation("鎮ｈ�呭啀娆￠殢璁�")
@@ -583,7 +599,7 @@
sysUserWard.setOrgid(user.getOrgid());
sysUserWard.setDeptType("2");
List<SysUserDept> wardList = sysUserDeptService.selectSysUserDeptList(sysUserWard);
- if(CollectionUtils.isNotEmpty(wardList)) {
+ if (CollectionUtils.isNotEmpty(wardList)) {
leavehospitaldistrictcodes = wardList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
}
serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
@@ -597,7 +613,7 @@
sysUserDept.setOrgid(user.getOrgid());
sysUserDept.setDeptType("1");
List<SysUserDept> deptList = sysUserDeptService.selectSysUserDeptList(sysUserDept);
- if(CollectionUtils.isNotEmpty(deptList)){
+ if (CollectionUtils.isNotEmpty(deptList)) {
deptCodes = deptList.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList());
}
serviceSubtaskCountReq.setDeptcodes(deptCodes);
@@ -931,10 +947,10 @@
@PostMapping(value = "/goSfRelay")
public AjaxResult goSfRelay(@RequestParam("taskId") Long taskId, @RequestParam("deptcode") String deptcode, @RequestParam("leavehospitaldistrictcode") String leavehospitaldistrictcode) {
String url = localIP + ":" + req_path + "/SfRelay?taskid=" + taskId;
- if(StringUtils.isNotEmpty(deptcode)){
+ if (StringUtils.isNotEmpty(deptcode)) {
url = url + "&deptcode=" + deptcode;
}
- if(StringUtils.isNotEmpty(leavehospitaldistrictcode)){
+ if (StringUtils.isNotEmpty(leavehospitaldistrictcode)) {
url = url + "&leavehospitaldistrictcode=" + leavehospitaldistrictcode;
}
return AjaxResult.success(url);
@@ -951,37 +967,29 @@
return AjaxResult.success(serviceSubtaskService.scanGenerateSubtask(serviceTask));
}
-
- @PostMapping("/test")
- public void test() {
- ryTask.dealOutHospInfo();
- }
-
- @PostMapping("/compensateTasktest")
- public void compensateTasktest(@RequestParam("subId") Long subId) {
- ryTask.compensateTaskTest(subId);
- }
-
- @PostMapping("/longTaskSendtest")
- public void longTaskSendtest(@RequestParam("subId") Long subId) {
- ryTask.longTaskSendTest(subId);
- }
-
@PostMapping("/syncMedInhospForShiyi")
- public void syncMedInhospForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
- collectHISService.syncMedInhosp(startTime, endTime);
+ public AjaxResult syncMedInhospForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
+ // 绔嬪嵆杩斿洖锛屽悗鍙板紓姝ユ墽琛�
+ CompletableFuture.runAsync(() -> {
+ collectHISService.syncMedInhosp(startTime, endTime);
+ });
+ return AjaxResult.success("鍚屾浠诲姟宸插惎鍔紝璇风◢鍚庢煡鐪嬬粨鏋�");
}
+
+ @PostMapping("/syncMedInhospForShiyiYesterday")
+ public AjaxResult syncMedInhospForShiyiYesterday() {
+ // 绔嬪嵆杩斿洖锛屽悗鍙板紓姝ユ墽琛�
+ ryTask.collectHISYesterday();
+ return AjaxResult.success("鍚屾浠诲姟宸插惎鍔紝璇风◢鍚庢煡鐪嬬粨鏋�");
+ }
+
@PostMapping("/syncMedOperForShiyi")
- public void syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
- collectHISService.syncOper(startTime, endTime);
+ public AjaxResult syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
+ // 绔嬪嵆杩斿洖锛屽悗鍙板紓姝ユ墽琛�
+ CompletableFuture.runAsync(() -> {
+ collectHISService.syncOper(startTime, endTime);
+ });
+ return AjaxResult.success("鍚屾浠诲姟宸插惎鍔紝璇风◢鍚庢煡鐪嬬粨鏋�");
}
-
- @PostMapping("/qwenLLMTest")
- public int qwenLLMTest(@RequestParam("voiceText") String questionText, @RequestParam("voiceText") String voiceText, @RequestParam("value") String value, @RequestParam("regexText") String regexText) {
- int result = ryTask.qwenLLMTest(questionText, voiceText, value, regexText);
- return result;
- }
-
-
}
--
Gitblit v1.9.3