From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index eb58c9a..47f3278 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.PatArchiveOthreInfo;
import com.smartor.domain.PatMedReq;
@@ -81,11 +82,6 @@
@ApiOperation("鏌ヨ闂ㄨ瘖鐪嬬梾浜烘鍜屼汉鏁�")
public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
SysUser user = getLoginUser().getUser();
-// List<String> deptCode = new ArrayList<>();
-// for (Map<String, Object> map : user.getBelongDepts()) {
-// if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
-// }
-// patMedReq.setDeptcodeList(deptCode);
patMedReq.setOrgid(user.getOrgid());
PatMedRes patMedRes = patMedOuthospService.selectPatMedOuthospCount(patMedReq);
return success(patMedRes);
@@ -110,16 +106,16 @@
util.exportExcel(response, list, "鎮ｈ�呴棬璇婅褰曟暟鎹�");
}
- /**
- * 鑾峰彇鎮ｈ�呴棬璇婅褰曡缁嗕俊鎭�
- */
- @ApiOperation("鑾峰彇鎮ｈ�呴棬璇婅褰曡缁嗕俊鎭�")
- @ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
- //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:query')")
- @GetMapping(value = "getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(patMedOuthospService.selectPatMedOuthospById(id));
- }
+// /**
+// * 鑾峰彇鎮ｈ�呴棬璇婅褰曡缁嗕俊鎭�
+// */
+// @ApiOperation("鑾峰彇鎮ｈ�呴棬璇婅褰曡缁嗕俊鎭�")
+// @ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
+// //@PreAuthorize("@ss.hasPermi('smartor:patouthosp:query')")
+// @GetMapping(value = "getInfo/{id}")
+// public AjaxResult getInfo(@PathVariable("id") Long id) {
+// return success(patMedOuthospService.selectPatMedOuthospById(id));
+// }
/**
* 鏂板鎮ｈ�呴棬璇婅褰�
--
Gitblit v1.9.3