From 4f1618f0df5c8ac19970f3bf0efa218b770cfb61 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 05 六月 2026 10:14:05 +0800
Subject: [PATCH] 【丽水】随访统计全部-修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 29 +++++++++++++++++++++++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 1 -
2 files changed, 29 insertions(+), 1 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 6f829f4..5d702d7 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
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.smartor;
import com.github.pagehelper.ISelect;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
@@ -546,6 +548,33 @@
Integer offset = PageUtils.getOffset(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
serviceSubtaskCountReq.setPageNum(offset);
+ Integer statisticaltype = serviceSubtaskCountReq.getStatisticaltype();
+
+ if(ObjectUtils.isNotEmpty(statisticaltype)){
+ SysUser user = getLoginUser().getUser();
+ if(statisticaltype==1){
+ if(CollectionUtils.isEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())){
+ //鍏ㄩ儴鐥呭尯
+ String hospInfo = user.getHospInfo();
+ Gson gson = new Gson();
+ // 3. 瀹氫箟 List 绫诲瀷锛堟牳蹇冿級
+ TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
+ List<String> leavehospitaldistrictcodes = gson.fromJson(hospInfo, typeToken.getType());
+ serviceSubtaskCountReq.setLeavehospitaldistrictcodes(leavehospitaldistrictcodes);
+ }
+ }else if(statisticaltype==2){
+ if(CollectionUtils.isEmpty(serviceSubtaskCountReq.getDeptcodes())){
+ //鍏ㄩ儴绉戝
+ String deptInfo = user.getDeptInfo();
+ Gson gson = new Gson();
+ // 3. 瀹氫箟 List 绫诲瀷锛堟牳蹇冿級
+ TypeToken<List<String>> typeToken = new TypeToken<List<String>>() {};
+ List<String> deptCodes = gson.fromJson(deptInfo, typeToken.getType());
+ serviceSubtaskCountReq.setDeptcodes(deptCodes);
+ }
+ }
+ }
+
String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", serviceSubtaskCountReq.getOrgid());
if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c09a81c..57723af 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -2343,7 +2343,6 @@
AND endtime >= #{startDate}
AND endtime <= DATE_ADD(#{endDate}, INTERVAL 1 DAY)
</if>
- AND service_type IN (2, 13)
AND inhospstate=1
<if test="orgid != null">
AND orgid = #{orgid}
--
Gitblit v1.9.3