From 31a10f3cd967aee27ffef0ce9acfc20d17803e51 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:54:53 +0800
Subject: [PATCH] 【市一】湖滨单独发送
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 8840645..0e34fb3 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
@@ -20,6 +20,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.quartz.service.ICollectHISService;
import com.ruoyi.quartz.task.RyTask;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserDeptService;
@@ -79,14 +80,17 @@
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private RyTask ryTask;
+
+ @Autowired
+ private ICollectHISService collectHISService;
+
@Value("${spring.profiles.active}")
private String active;
@Autowired
private RedisCache redisCache;
-
- @Autowired
- private RyTask ryTask;
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
@@ -397,6 +401,7 @@
ivrTaskVO.setCreateBy(user.getNickName());
ivrTaskVO.setUpdateBy(user.getNickName());
ivrTaskVO.setOrgid(user.getOrgid());
+ ivrTaskVO.setCampusid(user.getCampusid());
return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
}
@@ -408,12 +413,21 @@
return toAjax(serviceSubtaskService.updateServiceSubtask(serviceSubtask));
}
+ @ApiOperation("淇敼瀛愪换鍔℃ā鏉�")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/updateTemplate")
+ public AjaxResult updateTemplate(@RequestBody ServiceSubtaskTemplateVO serviceSubtaskTemplateVO) {
+ serviceSubtaskTemplateVO.setUpdateBy(getLoginUser().getUser().getNickName());
+ return toAjax(serviceSubtaskService.updateTemplate(serviceSubtaskTemplateVO));
+ }
+
@ApiOperation("鏂板瀛愪换鍔�")
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/addSubTask")
public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) {
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));
}
@@ -423,6 +437,7 @@
public AjaxResult addSubTaskAgain(@RequestBody ServiceSubtask serviceSubtask) {
SysUser user = getLoginUser().getUser();
if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid());
+ if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setCampusid(user.getCampusid());
return success(serviceSubtaskService.addSubTaskAgain(serviceSubtask));
}
@@ -741,9 +756,14 @@
return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO);
}
+
@PostMapping("/test")
public void test() {
ryTask.dealOutHospInfo();
}
+ @PostMapping("/syncMedInhospForShiyi")
+ public void syncMedInhospForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
+ collectHISService.syncMedInhosp(startTime, endTime);
+ }
}
--
Gitblit v1.9.3