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)
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java
index 42098e9..9358bf6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskmedicalServiceImpl.java
@@ -1,7 +1,9 @@
package com.smartor.service.impl;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.ServiceTaskmedical;
+import com.smartor.domain.VO.ServiceTaskmedicalVO;
import com.smartor.mapper.ServiceTaskmedicalMapper;
import com.smartor.service.IServiceTaskmedicalService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +18,7 @@
* @date 2026-07-29
*/
@Service
-public class ServiceTaskmedicalServiceImpl implements IServiceTaskmedicalService
-{
+public class ServiceTaskmedicalServiceImpl implements IServiceTaskmedicalService {
@Autowired
private ServiceTaskmedicalMapper serviceTaskmedicalMapper;
@@ -28,8 +29,7 @@
* @return 浠诲姟鑽搧鍏宠仈
*/
@Override
- public ServiceTaskmedical selectServiceTaskmedicalById(Long id)
- {
+ public ServiceTaskmedical selectServiceTaskmedicalById(Long id) {
return serviceTaskmedicalMapper.selectServiceTaskmedicalById(id);
}
@@ -40,8 +40,7 @@
* @return 浠诲姟鑽搧鍏宠仈
*/
@Override
- public List<ServiceTaskmedical> selectServiceTaskmedicalList(ServiceTaskmedical serviceTaskmedical)
- {
+ public List<ServiceTaskmedical> selectServiceTaskmedicalList(ServiceTaskmedical serviceTaskmedical) {
return serviceTaskmedicalMapper.selectServiceTaskmedicalList(serviceTaskmedical);
}
@@ -52,8 +51,7 @@
* @return 缁撴灉
*/
@Override
- public int insertServiceTaskmedical(ServiceTaskmedical serviceTaskmedical)
- {
+ public int insertServiceTaskmedical(ServiceTaskmedical serviceTaskmedical) {
serviceTaskmedical.setCreateTime(DateUtils.getNowDate());
return serviceTaskmedicalMapper.insertServiceTaskmedical(serviceTaskmedical);
}
@@ -65,8 +63,7 @@
* @return 缁撴灉
*/
@Override
- public int updateServiceTaskmedical(ServiceTaskmedical serviceTaskmedical)
- {
+ public int updateServiceTaskmedical(ServiceTaskmedical serviceTaskmedical) {
serviceTaskmedical.setUpdateTime(DateUtils.getNowDate());
return serviceTaskmedicalMapper.updateServiceTaskmedical(serviceTaskmedical);
}
@@ -78,8 +75,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteServiceTaskmedicalByIds(Long[] ids)
- {
+ public int deleteServiceTaskmedicalByIds(Long[] ids) {
return serviceTaskmedicalMapper.deleteServiceTaskmedicalByIds(ids);
}
@@ -90,8 +86,21 @@
* @return 缁撴灉
*/
@Override
- public int deleteServiceTaskmedicalById(Long id)
- {
+ public int deleteServiceTaskmedicalById(Long id) {
return serviceTaskmedicalMapper.deleteServiceTaskmedicalById(id);
}
+
+ /**
+ * 鍒犻櫎浠诲姟鑽搧鍏宠仈淇℃伅
+ *
+ * @param serviceTaskmedicalVO
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteServiceTaskmedical(ServiceTaskmedicalVO serviceTaskmedicalVO) {
+ if (StringUtils.isNotEmpty(serviceTaskmedicalVO.getMedicalCode()) && serviceTaskmedicalVO.getTaskId() != null) {
+ return serviceTaskmedicalMapper.deleteServiceTaskmedical(serviceTaskmedicalVO);
+ }
+ return 0;
+ }
}
--
Gitblit v1.9.3