From 3998703641edf236113f77f15c79561fd7f75c59 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 22 五月 2026 11:16:43 +0800
Subject: [PATCH] 【市一】短信发送

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 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 1c889c2..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,9 +20,12 @@
 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;
 import com.smartor.domain.*;
+import com.smartor.domain.VO.HeLibraryCountVO;
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
 import com.smartor.domain.VO.ServiceSubtaskVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -76,6 +79,12 @@
 
     @Autowired
     private ISysConfigService configService;
+
+    @Autowired
+    private RyTask ryTask;
+
+    @Autowired
+    private ICollectHISService collectHISService;
 
     @Value("${spring.profiles.active}")
     private String active;
@@ -242,13 +251,12 @@
     //@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
     @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
     @PostMapping("/patItemByCondition")
-    public TableDataInfo patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+    public Map<String, Object> patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
         List<ServiceSubtask> serviceSubtaskList = null;
         ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
         serviceSubtaskEntity.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
         if (serviceSubtaskEntity != null) {
-            PageUtils.startPageByPost(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize());
-
+            serviceSubtaskEntity.setPageNum(PageUtils.getOffset(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize()));
             serviceSubtaskList = serviceSubtaskService.patItem2(serviceSubtaskEntity);
         }
         for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -273,7 +281,7 @@
                 serviceSubtaskService.patItem2(serviceSubtaskEntity);
             }
         });
-        return getDataTable2(total, list);
+        return getDataTable3(total, list);
     }
 
     /**
@@ -393,6 +401,7 @@
         ivrTaskVO.setCreateBy(user.getNickName());
         ivrTaskVO.setUpdateBy(user.getNickName());
         ivrTaskVO.setOrgid(user.getOrgid());
+        ivrTaskVO.setCampusid(user.getCampusid());
         return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
     }
 
@@ -404,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));
     }
 
@@ -419,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));
     }
 
@@ -730,4 +749,21 @@
         return map;
     }
 
+    @ApiOperation("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻")
+    @PostMapping("/gethelibraryCount")
+    public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO) {
+        log.info("鑾峰彇褰撳墠鐢ㄦ埛瀹ｆ暀鏁伴噺缁熻鐨勫叆鍙備负锛歿}", heLibraryCountVO);
+        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