From 879bc177f31717f6d4a4998840e786a668256e97 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 06 八月 2026 15:52:01 +0800
Subject: [PATCH] 【景宁】查询随访任务组科室关联列表、查询随访任务组疾病关联列表
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 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 f13ba40..c933413 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
@@ -113,6 +113,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 +457,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 +585,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 +599,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 +933,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,12 +953,6 @@
return AjaxResult.success(serviceSubtaskService.scanGenerateSubtask(serviceTask));
}
-
- @PostMapping("/test")
- public void test() {
- ryTask.dealOutHospInfo();
- }
-
@PostMapping("/syncMedInhospForShiyi")
public void syncMedInhospForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
collectHISService.syncMedInhosp(startTime, endTime);
@@ -966,12 +962,4 @@
public void syncMedOperForShiyi(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
collectHISService.syncOper(startTime, endTime);
}
-
- @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