From 41ac1512f52f7670fff3200168b8bdd23c0b6489 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 20 十一月 2026 09:12:22 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 321 insertions(+), 23 deletions(-)
diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
index 857be70..b016e06 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.ImportFlagEnum;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.satisfaction.api.SatisfactionFacade;
@@ -279,6 +280,14 @@
/** 浜屾闅忚鐢熸垚閿佸墠缂�锛岄槻姝㈠悓涓�鍘熶换鍔″苟鍙戠敓鎴愬鏉′簩娆¢殢璁� */
private static final String AGAIN_LOCK_KEY_PREFIX = "smartor:again:lock:";
private static final long AGAIN_LOCK_SECONDS = 30L;
+
+ /**
+ * /getSfStatisticsHyperlink 涓嬮捇绫诲瀷鍚庣紑锛氥�屽嚭闄汉娆�/鏃犻渶闅忚/搴旈殢璁裤�嶆寜銆屾櫘閫�/鏃ラ棿銆嶇粏鍒嗗悗鐨勫垪锛�
+ * 鍓嶇浼� {@code <鍒楀悕>DaytimeInfo} / {@code <鍒楀悕>NormalInfo}锛堣
+ * {@code applyDaytimeHyperLinkInfoType}锛夈�傛敼杩欓噷绛変簬鏀瑰墠鍚庣绾﹀畾銆�
+ */
+ private static final String HYPERLINK_DAYTIME_SUFFIX = "Daytime";
+ private static final String HYPERLINK_NORMAL_SUFFIX = "Normal";
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
@@ -1599,6 +1608,61 @@
}
/**
+ * 鍙栭�楀彿涓查噷鐨勭涓�涓�硷紙浠诲姟涓婄瀹�/鐥呭尯鏄閫夛紝鑰� {@code service_subtask} 涓婇兘鏄崟鍊煎垪锛夈��
+ */
+ private String firstValue(String value) {
+ if (StringUtils.isEmpty(value)) {
+ return null;
+ }
+ for (String item : value.split(",")) {
+ if (StringUtils.isNotEmpty(item.trim())) {
+ return item.trim();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 浠诲姟閰嶇疆锛坽@link ServiceTaskVO}锛夆啋 瀛愪换鍔★紙{@link ServiceSubtask}锛夌殑瀛楁鎼繍銆�
+ * <p>
+ * <b>涓轰粈涔堜笉鑳界洿鎺� {@code DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class)}锛�</b>
+ * 瀹冩槸绾悓鍚嶆嫹璐濓紝鑰屼袱杈瑰悓鍚嶇殑 {@code deptcode / deptname} <b>璇箟涓嶅悓</b>锛�
+ * <ul>
+ * <li>{@code ServiceTaskVO.deptcode / deptname} = 浠诲姟鐨勩�岄�傜敤绉戝銆嶏紝
+ * 鍑洪櫌闅忚锛坰erviceType=2锛�/ 鍑洪櫌瀹f暀锛�4锛�/ 闂ㄨ瘖闅忚锛�3锛夌瓑鍦烘櫙涓嬪氨鏄�<b>绂婚櫌绉戝</b>锛�</li>
+ * <li>{@code ServiceSubtask.deptcode / deptname} = <b>鍦ㄩ櫌绉戝</b>
+ * 锛�2026-11 鐢卞師 sendlimitpbegin/pend 澶嶇敤鑰屾潵锛岃 {@code ServiceSubtask} 瀛楁娉ㄩ噴锛夈��</li>
+ * </ul>
+ * 浜庢槸绾悓鍚嶆嫹璐濅細鎶娿�岀闄㈢瀹ゃ�嶅啓杩涖�屽湪闄㈢瀹ゃ�嶅垪锛屽悗鏋滄湁涓や釜锛�
+ * <ol>
+ * <li>鎸夊湪闄㈢淮搴︾瓫锛坽@code deptcodes} 鈫� {@code service_subtask.deptcode}锛変細璇懡涓繖浜涘瓙浠诲姟锛�</li>
+ * <li>鎸夌闄㈢淮搴︾瓫锛坽@code leaveldeptcodes} 鈫� {@code service_subtask.leaveldeptcode}锛夋椂锛�
+ * 鎮h�呰嚜宸辨病甯︾瀹ょ殑閭d簺锛堝墠绔墜鍔ㄥ嬀閫夋偅鑰呭緢甯歌锛変細鍥犱负 {@code leaveldeptcode} 涓虹┖鑰屾煡涓嶅埌銆�</li>
+ * </ol>
+ * 鍥犳杩欓噷鎸夐」鐩棦瀹氬彛寰勶紙{@code doc/service_subtask_瀛楁鏀瑰悕_鏀瑰姩娓呭崟.md} 搂8锛氳繖鍑犳潯
+ * 銆岄暱鏈熶换鍔� / 浠诲姟缁� / 鎵嬪姩寤轰换鍔°�嶈矾寰�<b>涓嶅~鍦ㄩ櫌缁村害</b>锛夌粺涓�澶勭悊锛�
+ * <b>鍦ㄩ櫌缁村害 4 鍒楁竻绌�</b>锛堝湪闄㈢瀹�/鍦ㄩ櫌鐥呭尯鍙湁 HIS 閾捐矾鑳戒粠 {@code pat_med_inhosp} 鎷垮埌锛夛紝
+ * <b>绉戝 / 鐥呭尯涓�寰嬭惤绂婚櫌缁村害</b>锛坽@code leaveldeptcode/name}銆亄@code leavehospitaldistrictcode/name}锛夈��
+ *
+ * @param serviceTaskVO 寤轰换鍔″叆鍙�
+ * @return 宸叉寜绂婚櫌缁村害褰掍綅鐨勫瓙浠诲姟瀵硅薄锛堝湪闄㈢淮搴︿负绌猴級
+ */
+ private ServiceSubtask toSubtaskFromTaskVO(ServiceTaskVO serviceTaskVO) {
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
+ // 鈶� 鍦ㄩ櫌缁村害蹇呴』娓呯┖锛氫换鍔¢厤缃殑绉戝涓嶆槸鎮h�呮湰浜虹殑鍦ㄩ櫌绉戝
+ serviceSubtask.setDeptcode(null);
+ serviceSubtask.setDeptname(null);
+ serviceSubtask.setHospitaldistrictcode(null);
+ serviceSubtask.setHospitaldistrictname(null);
+ // 鈶� 绉戝 / 鐥呭尯 鈫� 绂婚櫌缁村害锛堝閫変覆鍙栫涓�涓紝瀛愪换鍔℃槸鍗曞�煎垪锛�
+ serviceSubtask.setLeaveldeptcode(firstValue(serviceTaskVO.getDeptcode()));
+ serviceSubtask.setLeaveldeptname(firstValue(serviceTaskVO.getDeptname()));
+ serviceSubtask.setLeavehospitaldistrictcode(firstValue(serviceTaskVO.getLeavehospitaldistrictcode()));
+ serviceSubtask.setLeavehospitaldistrictname(firstValue(serviceTaskVO.getLeavehospitaldistrictname()));
+ return serviceSubtask;
+ }
+
+ /**
* 鍗曚竴浠诲姟
*
* @return 缁撴灉
@@ -1815,6 +1879,25 @@
serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
}
}
+ // 鐐逛綅琛岋紙2026-11锛宎ppltype=7锛夛細绉戝 / 鐥呭尯 / 鐐逛綅鍦� service_taskdept 閲屾槸
+ // **鍚勮嚜鐙珛鐨勮**锛屽彲浠ュ叡瀛樹篃鍙互涓嶅叡瀛� 鈥斺�� 鎵�浠ョ偣浣嶈鏄�"棰濆杩藉姞"锛�
+ // 涓嶆浛鎹笂闈㈢殑绉戝/鐥呭尯琛屻�傜偣浣嶈鐨� dept_code/dept_name 鐣欑┖锛岀紪鐮佸彧钀� point_location銆�
+ if ("7".equals(serviceTaskVO.getAppltype())) {
+ String pointLocation = firstNonBlank(serviceTaskVO.getPointLocation(),
+ serviceTask.getPointLocation());
+ if (StringUtils.isNotEmpty(pointLocation)) {
+ ServiceTaskdept pointDept = new ServiceTaskdept();
+ pointDept.setTaskId(serviceTask.getTaskid());
+ pointDept.setTaskName(serviceTask.getTaskName());
+ pointDept.setOrgid(serviceTask.getOrgid());
+ pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+ : Long.valueOf(serviceTask.getLongTask()));
+ pointDept.setServiceType(serviceTaskVO.getServiceType());
+ pointDept.setDeptType("3");
+ pointDept.setPointLocation(pointLocation);
+ serviceTaskdeptService.insertServiceTaskdept(pointDept);
+ }
+ }
}
}
//闀挎湡浠诲姟锛屼篃鍏佽鍔犱汉浜�
@@ -1825,7 +1908,8 @@
// }
//灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
- ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
+ // 绉戝/鐥呭尯鎸夈�岀闄㈢淮搴︺�嶅綊浣嶏紙鍑洪櫌闅忚鐨勭瀹ょ梾鍖哄氨鏄闄㈢瀹�/鐥呭尯锛夛紝瑙� toSubtaskFromTaskVO
+ ServiceSubtask serviceSubtask = toSubtaskFromTaskVO(serviceTaskVO);
serviceSubtask.setTaskid(serviceTask.getTaskid().longValue());
serviceSubtask.setTemplatename(ObjectUtils.isNotEmpty(tempid) ? tempName : serviceTask.getTemplatename());
serviceSubtask.setTemplateid(ObjectUtils.isNotEmpty(tempid) ? tempid : serviceTask.getTemplateid());
@@ -1846,15 +1930,18 @@
serviceSubtask.setInhospid(patTaskRelevance.getHospid());
//鏂板缓瀹屾垚灏辨槸寰呭彂閫佺姸鎬�
serviceSubtask.setSendstate(2L);
- String subtaskDeptCode = patTaskRelevance.getDeptcode();
- if (StringUtils.isEmpty(subtaskDeptCode) && StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
- // service_subtask.leaveldeptcode 涓哄崟鍊煎瓧娈碉紝涓嶈兘鍐欏叆浠诲姟鐨勫绉戝鎷兼帴涓诧紝鍙栫涓�涓瀹ゅ厹搴�
- subtaskDeptCode = serviceTaskVO.getDeptcode().split(",")[0].trim();
- }
- serviceSubtask.setLeaveldeptcode(subtaskDeptCode);
- serviceSubtask.setLeaveldeptname(StringUtils.isNotEmpty(patTaskRelevance.getDeptName()) ? patTaskRelevance.getDeptName() : serviceTaskVO.getDeptname());
- serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
- serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
+ // 绂婚櫌缁村害锛堝嚭闄㈤殢璁� = 鍑洪櫌绉戝 / 鍑洪櫌鐥呭尯锛夛細
+ // 鎮h�呰嚜甯︾殑鍑洪櫌绉戝/鐥呭尯浼樺厛锛屾偅鑰呬晶娌″甫锛堝墠绔墜鍔ㄥ嬀閫夊緢甯歌锛夋椂鍥為��鍒颁换鍔¢厤缃紝
+ // 涓嶈兘鏃犳潯浠惰鐩� 鈥斺�� 鍚﹀垯浼氭妸 toSubtaskFromTaskVO 鎸変换鍔¢厤缃厹濂界殑绂婚櫌缁村害鎶规垚 null锛�
+ // 缁撴灉銆屼换鍔¢厤浜嗙瀹ょ梾鍖恒�佺敓鎴愬嚭鏉ョ殑瀛愪换鍔$闄㈢瀹�/鐥呭尯鍗存槸绌恒�嶃��
+ serviceSubtask.setLeaveldeptcode(firstNonBlank(patTaskRelevance.getDeptcode(),
+ firstValue(serviceTaskVO.getDeptcode())));
+ serviceSubtask.setLeaveldeptname(firstNonBlank(patTaskRelevance.getDeptName(),
+ firstValue(serviceTaskVO.getDeptname())));
+ serviceSubtask.setLeavehospitaldistrictcode(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictcode(),
+ firstValue(serviceTaskVO.getLeavehospitaldistrictcode())));
+ serviceSubtask.setLeavehospitaldistrictname(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictname(),
+ firstValue(serviceTaskVO.getLeavehospitaldistrictname())));
serviceSubtask.setType(serviceTaskVO.getType());
serviceSubtask.setHospType(patTaskRelevance.getHospType());
serviceSubtask.setOpenid(patTaskRelevance.getOpenid());
@@ -2190,6 +2277,27 @@
scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
scheduleVO.setCreateBy(serviceTask.getUpdateBy());
serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
+ } else if (serviceTaskVO.getAppltype().equals("7")) {
+ // 鎸夌偣浣嶏紙鍚屽痉闇�姹傦級锛氬厛杞垹璇ヤ换鍔℃棫鐨� dept_type='3' 琛岋紝鍐嶆寜鍏ュ弬閲嶅缓
+ // 锛堜笌绉戝/鐥呭尯銆屽厛鍒犲悗鎻掋�嶅悓鍙e緞锛涚偣浣嶈 dept_code/dept_name 鐣欑┖锛�
+ ServiceTaskdept oldPoint = new ServiceTaskdept();
+ oldPoint.setTaskId(serviceTask.getTaskid());
+ oldPoint.setDeptType("3");
+ serviceTaskdeptService.deleteServiceTaskdeptByTaskId(oldPoint);
+ String pointLocation = StringUtils.isNotEmpty(serviceTaskVO.getPointLocation())
+ ? serviceTaskVO.getPointLocation() : serviceTask.getPointLocation();
+ if (StringUtils.isNotEmpty(pointLocation)) {
+ ServiceTaskdept pointDept = new ServiceTaskdept();
+ pointDept.setTaskId(serviceTask.getTaskid());
+ pointDept.setTaskName(serviceTask.getTaskName());
+ pointDept.setOrgid(serviceTaskVO.getOrgid());
+ pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+ : Long.valueOf(serviceTask.getLongTask()));
+ pointDept.setServiceType(serviceTaskVO.getServiceType());
+ pointDept.setDeptType("3");
+ pointDept.setPointLocation(pointLocation);
+ serviceTaskdeptService.insertServiceTaskdept(pointDept);
+ }
}
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -2212,7 +2320,8 @@
}
if (CollectionUtils.isNotEmpty(serviceTaskVO.getPatTaskRelevances())) {
for (PatTaskRelevance patTaskRelevance : serviceTaskVO.getPatTaskRelevances()) {
- ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
+ // 绉戝/鐥呭尯鎸夈�岀闄㈢淮搴︺�嶅綊浣嶏紙鍑洪櫌闅忚鐨勭瀹ょ梾鍖哄氨鏄闄㈢瀹�/鐥呭尯锛夛紝瑙� toSubtaskFromTaskVO
+ ServiceSubtask serviceSubtask = toSubtaskFromTaskVO(serviceTaskVO);
serviceSubtask.setLibtemplateid(ObjectUtils.isEmpty(serviceTaskVO.getLibtemplateid()) ? null : Long.valueOf(serviceTaskVO.getLibtemplateid()));
serviceSubtask.setLibtemplatename(serviceTaskVO.getLibtemplatename());
serviceSubtask.setTemplateid(serviceTask.getTemplateid());
@@ -2224,10 +2333,16 @@
serviceSubtask.setAddr(patTaskRelevance.getAddr());
serviceSubtask.setPatid(patTaskRelevance.getPatid());
serviceSubtask.setOpenid(patTaskRelevance.getOpenid());
- serviceSubtask.setLeaveldeptcode(patTaskRelevance.getDeptcode());
- serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
- serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
- serviceSubtask.setLeaveldeptname(patTaskRelevance.getDeptName());
+ // 绂婚櫌缁村害锛氭偅鑰呰嚜甯︾殑鍑洪櫌绉戝/鐥呭尯浼樺厛锛屾病甯︽椂鍥為��鍒颁换鍔¢厤缃紙鍚﹀垯浼氭妸
+ // toSubtaskFromTaskVO 鎸変换鍔¢厤缃厹濂界殑鍊兼姽鎴� null锛屽嚭闄㈤殢璁垮氨鎴愩�岀闄㈢瀹�/鐥呭尯涓虹┖銆嶏級
+ serviceSubtask.setLeaveldeptcode(firstNonBlank(patTaskRelevance.getDeptcode(),
+ firstValue(serviceTaskVO.getDeptcode())));
+ serviceSubtask.setLeaveldeptname(firstNonBlank(patTaskRelevance.getDeptName(),
+ firstValue(serviceTaskVO.getDeptname())));
+ serviceSubtask.setLeavehospitaldistrictcode(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictcode(),
+ firstValue(serviceTaskVO.getLeavehospitaldistrictcode())));
+ serviceSubtask.setLeavehospitaldistrictname(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictname(),
+ firstValue(serviceTaskVO.getLeavehospitaldistrictname())));
serviceSubtask.setType(serviceTaskVO.getType());
serviceSubtask.setCreateTime(DateUtils.getNowDate());
serviceSubtask.setDrname(patTaskRelevance.getDrname());
@@ -2766,6 +2881,8 @@
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+ applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3062,6 +3179,47 @@
}
/**
+ * 鎶娿�屽嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆°�嶆寜銆屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗙疮鍔犮��
+ * <p>
+ * 鍒ゅ畾渚濇嵁锛歿@code service_subtask.importance_flag_code}锛堝缓浠诲姟鏃朵粠 {@code pat_med_inhosp}
+ * 鎷锋潵鐨勫揩鐓э紝鐜板満瀛樹腑鏂囨弿杩般�屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶏紝涔熸湁鐜瀛� {@code FH0165.01/02}锛夛紝
+ * 鍙e緞闆嗕腑鍦� {@link ImportFlagEnum#isDaytime(String)}銆�
+ * <p>
+ * 涓変釜鏂规硶锛坽@link #getStatistic}銆亄@link #getStatisticFirst}銆亄@link #getStatisticAgain}锛�
+ * 鐨勫師濮嬬疮鍔犺鍒欏畬鍏ㄤ竴鑷达紝鎵�浠ヨ繖閲屽彧鍐欎竴浠斤紝涓夊寰幆浣撳悇璋冧竴琛屽嵆鍙��
+ * 淇濊瘉鎭掔瓑寮忥細鏅�� + 鏃ラ棿 == 鍘熸�婚噺瀛楁銆�
+ *
+ * @param statistic 褰撳墠鍒嗙粍鐨勭粺璁$粨鏋滐紙绱姞鐩爣锛�
+ * @param serviceSubtask 褰撳墠鏄庣粏琛�
+ */
+ private void applyDaytimeSplit(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
+ if (statistic == null || serviceSubtask == null) {
+ return;
+ }
+ boolean daytime = ImportFlagEnum.isDaytime(serviceSubtask.getImportanceFlagCode());
+ //鍑洪櫌浜烘锛氭瘡涓�琛屾槑缁嗛兘绠� 1 浜烘锛堜笌 statistic.setDischargeCount(list.size()) 鍚屽彛寰勶級
+ if (daytime) {
+ statistic.setDischargeCountDaytime(statistic.getDischargeCountDaytime() + 1);
+ } else {
+ statistic.setDischargeCountNormal(statistic.getDischargeCountNormal() + 1);
+ }
+ //鏃犻渶闅忚浜烘锛坰endstate = 4锛�/ 搴旈殢璁夸汉娆★紙sendstate != 4锛夛細涓庡師鎬婚噺瀛楁瀹屽叏鍚屼竴鍒ゅ畾
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
+ if (daytime) {
+ statistic.setNonFollowUpDaytime(statistic.getNonFollowUpDaytime() + 1L);
+ } else {
+ statistic.setNonFollowUpNormal(statistic.getNonFollowUpNormal() + 1L);
+ }
+ } else if (serviceSubtask.getSendstate() != null) {
+ if (daytime) {
+ statistic.setFollowUpNeededDaytime(statistic.getFollowUpNeededDaytime() + 1L);
+ } else {
+ statistic.setFollowUpNeededNormal(statistic.getFollowUpNeededNormal() + 1L);
+ }
+ }
+ }
+
+ /**
* 鏄惁灞炰簬銆屽強鏃堕殢璁裤�嶏細闅忚宸插畬鎴愪笖瀹屾垚鏃剁姸鎬佷负姝e父瀹屾垚锛堟湭瓒呮椂锛夈��
* <p>
* finish_state锛�1-姝e父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚锛屽彧鏈� 1 璁″叆鍙婃椂闅忚銆�
@@ -3157,6 +3315,8 @@
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
applyFirstFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
+ //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+ applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3331,6 +3491,8 @@
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
applyAgainFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
+ //鏅��/鏃ラ棿缁嗗垎锛堝嚭闄汉娆°�佹棤闇�闅忚浜烘銆佸簲闅忚浜烘锛�
+ applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3801,6 +3963,14 @@
serviceSubtaskCountReq.setFinishState(null);
serviceSubtaskCountReq.setSuggest(null);
+ //2026-11 鏂板锛氬嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆� 鎸夈�屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗗悗鐨勪笅閽汇��
+ //鏀惧湪娓呯┖鍔ㄤ綔涔嬪悗銆佽�� switch 涔嬪墠锛歨elper 鑷繁浼氭妸 sendstates 璁惧洖鍘汇��
+ Boolean daytimeResult = applyDaytimeHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
+ if (daytimeResult != null) {
+ //true-宸叉寜銆屾櫘閫�/鏃ラ棿銆嶆嫾濂芥潯浠讹紱false-璁ゅ嚭鏄櫘閫�/鏃ラ棿涓嬮捇浣嗕笉璁よ瘑鏄摢涓�鍒� 鈫� 杩斿洖绌烘槑缁�
+ return daytimeResult;
+ }
+
switch (hyperLinkInfoType) {
case "dischargeCountInfo":
break;
@@ -4019,6 +4189,75 @@
break;
}
return true;
+ }
+
+ /**
+ * 銆屽嚭闄汉娆� / 鏃犻渶闅忚浜烘 / 搴旈殢璁夸汉娆°�嶆寜銆屾櫘閫� / 鏃ラ棿銆嶇粏鍒嗗悗鐨勪笅閽荤被鍨嬭В鏋愩��
+ * <p>
+ * 鍓嶇浼犵殑 {@code hyperLinkInfoType} 褰㈠ {@code <鍒楀悕><Daytime|Normal>Info}锛屽疄娴嬩緥濡傦細
+ * <ul>
+ * <li>{@code dischargeCountDaytimeInfo} 鈥斺�� 鍑洪櫌浜烘-鏃ラ棿</li>
+ * <li>{@code dischargeCountNormalInfo} 鈥斺�� 鍑洪櫌浜烘-鏅��</li>
+ * <li>{@code nonFollowUpDaytimeInfo} / {@code nonFollowUpNormalInfo} 鈥斺�� 鏃犻渶闅忚浜烘</li>
+ * <li>{@code followUpNeededDaytimeInfo} / {@code followUpNeededNormalInfo} 鈥斺�� 搴旈殢璁夸汉娆�</li>
+ * </ul>
+ * 鍚庣紑涔熸帴鍙椾笉甯� {@code Info} 鐨勫啓娉曪紙{@code ...Daytime} / {@code ...Normal}锛夛紝
+ * 鍓嶇紑棰濆鍏煎 {@code nonFollowUpAll} / {@code followUpNeededAll}锛堝榻愯�佺殑
+ * {@code nonFollowUpInfo} / {@code followUpNeededAllInfo} 鍛藉悕涔犳儻锛夈��
+ * <p>
+ * 涓夊垪涓庢眹鎬诲彛寰勪竴涓�瀵瑰簲锛�
+ * <ul>
+ * <li>鍑洪櫌浜烘 = 璇ュ垎缁勫叏閮ㄦ槑缁嗚锛堜笉闄� sendstate锛夛紝瀵瑰簲 {@code dischargeCountInfo}锛�</li>
+ * <li>鏃犻渶闅忚浜烘 = {@code sendstate = 4}锛屽搴� {@code nonFollowUpInfo}锛�</li>
+ * <li>搴旈殢璁夸汉娆� = {@code sendstate in (1,2,3,5,6,7)}锛屽搴� {@code followUpNeededAllInfo}銆�</li>
+ * </ul>
+ * 銆屾櫘閫�/鏃ラ棿銆嶆湰韬敱 {@link ServiceSubtaskCountReq#getDaytimeOnly()} 涓嬫帹鍒� SQL
+ * 锛堣 {@code ServiceSubtaskMapper.xml#getSfStatisticsHyperlink}锛夛紝鍒ゅ畾鍙e緞涓庢眹鎬讳晶
+ * {@link ImportFlagEnum#isDaytime(String)} 瀹屽叏涓�鑷淬��
+ * <p>
+ * 娉ㄦ剰锛氳�� switch 鐨� {@code default} 鏄�"浠�涔堥兘涓嶈"鈥斺�斿嵆璁や笉鍑虹殑 type 浼氶��鍖栨垚"鏃犳潯浠跺叏閲忔槑缁�"锛�
+ * 鍓嶇鐐规柊鍒楀嵈鎷垮埌鍏ㄩ噺鏁版嵁灏辨槸杩欎箞鏉ョ殑銆傛墍浠ヨ繖閲屼竴鏃﹁鍑烘槸鏅��/鏃ラ棿涓嬮捇銆佷絾鍒楀悕瀵逛笉涓婏紝
+ * 鐩存帴杩斿洖 {@code false}锛堟槑缁嗕负绌� + 鍛婅鏃ュ織锛夛紝涓嶅啀璁╁畠鎺夎繘 default銆�
+ *
+ * @return {@code null}-涓嶆槸鏅��/鏃ラ棿绫诲瀷鐨勪笅閽伙紝浜ゅ洖鑰� switch 澶勭悊锛�
+ * {@code true}-鏉′欢宸叉嫾濂斤紱{@code false}-涓嶈璇嗚鍒楋紝搴旇繑鍥炵┖鏄庣粏
+ */
+ private Boolean applyDaytimeHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
+ //缁熶竴鍘绘帀缁撳熬鐨� Info锛岃繖鏍� xxxDaytimeInfo / xxxDaytime 涓ょ鍐欐硶閮借兘璁�
+ String type = hyperLinkInfoType.endsWith("Info")
+ ? hyperLinkInfoType.substring(0, hyperLinkInfoType.length() - "Info".length())
+ : hyperLinkInfoType;
+ boolean daytime;
+ String base;
+ if (type.endsWith(HYPERLINK_DAYTIME_SUFFIX)) {
+ daytime = true;
+ base = type.substring(0, type.length() - HYPERLINK_DAYTIME_SUFFIX.length());
+ } else if (type.endsWith(HYPERLINK_NORMAL_SUFFIX)) {
+ daytime = false;
+ base = type.substring(0, type.length() - HYPERLINK_NORMAL_SUFFIX.length());
+ } else {
+ return null;
+ }
+ Integer daytimeOnly = daytime ? 1 : 0;
+ if ("dischargeCount".equals(base)) {
+ //鍑洪櫌浜烘锛氫笉闄� sendstate锛屼笌 getStatistic 鐨� dischargeCount 鍙e緞涓�鑷�
+ serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+ return true;
+ }
+ if ("nonFollowUp".equals(base) || "nonFollowUpAll".equals(base)) {
+ //鏃犻渶闅忚浜烘锛歴endstate = 4锛屼笌 nonFollowUpInfo 鍙e緞涓�鑷�
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+ serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+ return true;
+ }
+ if ("followUpNeeded".equals(base) || "followUpNeededAll".equals(base)) {
+ //搴旈殢璁夸汉娆★細sendstate != 4锛屼笌 followUpNeededAllInfo 鍙e緞涓�鑷�
+ serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
+ serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
+ return true;
+ }
+ log.warn("getSfStatisticsHyperlink-鏅��/鏃ラ棿涓嬮捇鐨勫垪鍚嶆棤娉曡瘑鍒紝杩斿洖绌烘槑缁嗭細hyperLinkInfoType={}", hyperLinkInfoType);
+ return false;
}
/**
@@ -4482,6 +4721,13 @@
total.setNonFollowUp(0L);
total.setFilterCount(0L);
total.setFollowUpNeeded(0L);
+ //2026-11锛氭櫘閫�/鏃ラ棿缁嗗垎锛堜笌涓婃柟涓変釜鎬婚噺瀛楁鎴愬绱姞锛�
+ total.setDischargeCountNormal(0);
+ total.setDischargeCountDaytime(0);
+ total.setNonFollowUpNormal(0L);
+ total.setNonFollowUpDaytime(0L);
+ total.setFollowUpNeededNormal(0L);
+ total.setFollowUpNeededDaytime(0L);
total.setNeedFollowUp(0L);
total.setPendingFollowUp(0L);
total.setFollowUpSuccess(0L);
@@ -4527,6 +4773,13 @@
total.setNonFollowUp(total.getNonFollowUp() + (stat.getNonFollowUp() != null ? stat.getNonFollowUp() : 0L));
total.setFilterCount(total.getFilterCount() + (stat.getFilterCount() != null ? stat.getFilterCount() : 0L));
total.setFollowUpNeeded(total.getFollowUpNeeded() + (stat.getFollowUpNeeded() != null ? stat.getFollowUpNeeded() : 0L));
+ //2026-11锛氭櫘閫�/鏃ラ棿缁嗗垎锛屼笌涓婃柟涓変釜鎬婚噺瀛楁鍚屾簮绱姞锛堟櫘閫� + 鏃ラ棿 == 鎬婚噺锛�
+ total.setDischargeCountNormal(total.getDischargeCountNormal() + (stat.getDischargeCountNormal() != null ? stat.getDischargeCountNormal() : 0));
+ total.setDischargeCountDaytime(total.getDischargeCountDaytime() + (stat.getDischargeCountDaytime() != null ? stat.getDischargeCountDaytime() : 0));
+ total.setNonFollowUpNormal(total.getNonFollowUpNormal() + (stat.getNonFollowUpNormal() != null ? stat.getNonFollowUpNormal() : 0L));
+ total.setNonFollowUpDaytime(total.getNonFollowUpDaytime() + (stat.getNonFollowUpDaytime() != null ? stat.getNonFollowUpDaytime() : 0L));
+ total.setFollowUpNeededNormal(total.getFollowUpNeededNormal() + (stat.getFollowUpNeededNormal() != null ? stat.getFollowUpNeededNormal() : 0L));
+ total.setFollowUpNeededDaytime(total.getFollowUpNeededDaytime() + (stat.getFollowUpNeededDaytime() != null ? stat.getFollowUpNeededDaytime() : 0L));
total.setNeedFollowUp(total.getNeedFollowUp() + (stat.getNeedFollowUp() != null ? stat.getNeedFollowUp() : 0L));
total.setPendingFollowUp(total.getPendingFollowUp() + (stat.getPendingFollowUp() != null ? stat.getPendingFollowUp() : 0L));
total.setFollowUpSuccess(total.getFollowUpSuccess() + (stat.getFollowUpSuccess() != null ? stat.getFollowUpSuccess() : 0L));
@@ -5390,16 +5643,46 @@
String ip = localIP;
ServiceTask serviceTask = new ServiceTask();
serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTaskVo.getTaskid());
+ if (ObjectUtils.isEmpty(serviceTask)) {
+ // 浠诲姟涓嶅瓨鍦� 鈫� 涓嶅彲鑳芥湁 data锛岀洿鎺ユ姏涓氬姟寮傚父锛堟帴鍙e眰浼氳浆鎴� code=500锛�
+ throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氫换鍔′笉瀛樺湪鎴栧凡鍒犻櫎锛坱askid=" + serviceTaskVo.getTaskid() + "锛�");
+ }
if (ObjectUtils.isNotEmpty(serviceTask)) {
try {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
- serviceTaskdept.setDeptType("1");
- serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
- }
- if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+ // 缁村害锛堢瀹�/鐥呭尯/鐐逛綅锛夌敱浠诲姟鐨� appltype 鍐冲畾锛�1=绉戝銆�2=鐥呭尯銆�7=鐐逛綅銆�
+ // 涓夌缁村害鍦� service_taskdept 閲屾槸**鍚勮嚜鐙珛鐨勮**锛堝悇鑷殑鍒楋級锛屽彲浠ュ叡瀛樸�佷篃鍙互涓嶅叡瀛橈紱
+ // 浣嗘煡琛屾椂蹇呴』鍙甫涓�涓淮搴� 鈥斺�� 鍚﹀垯浼氱敤 A 缁村害鐨勭紪鐮佸幓鎾� B 缁村害鐨勮锛�
+ // 鑰岀偣浣嶈鐨� dept_code 鏈潵灏辨槸绌虹殑銆�
+ String appltype = serviceTask.getAppltype();
+ if ("7".equals(appltype)) {
+ serviceTaskdept.setDeptType("3");
+ serviceTaskdept.setPointLocation(firstNonBlank(serviceTaskVo.getPointLocation(),
+ serviceTask.getPointLocation()));
+ } else if ("2".equals(appltype)) {
serviceTaskdept.setDeptType("2");
- serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+ // 浠诲姟涓婄殑绉戝/鐥呭尯鍙兘鏄�楀彿澶氶�夛紝鏌� service_taskdept 瑕佺敤鍗曞�硷紙鍙栫涓�涓級
+ serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getLeavehospitaldistrictcode(),
+ firstValue(serviceTask.getLeavehospitaldistrictcode())));
+ } else if ("1".equals(appltype)) {
+ serviceTaskdept.setDeptType("1");
+ serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getDeptcode(),
+ firstValue(serviceTask.getDeptcode())));
+ } else {
+ // appltype 涓虹┖鐨勫巻鍙蹭换鍔★細娌跨敤鏀归�犲墠鐨勫彛寰勶紙绉戝 鈫� 鐥呭尯锛屽悗鍐欑殑瑕嗙洊鍏堝啓鐨勶級锛�
+ // 鐐逛綅浣滀负绗笁缁达紝鍙湪浼犱簡鐐逛綅鏃惰ˉ涓娿��
+ if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
+ serviceTaskdept.setDeptType("1");
+ serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
+ }
+ if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+ serviceTaskdept.setDeptType("2");
+ serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+ }
+ if (ObjectUtils.isNotEmpty(serviceTaskVo.getPointLocation())) {
+ serviceTaskdept.setDeptType("3");
+ serviceTaskdept.setPointLocation(serviceTaskVo.getPointLocation());
+ }
}
serviceTaskdept.setServiceType(serviceTask.getServiceType());
serviceTaskdept.setOrgid(serviceTask.getOrgid());
@@ -5410,6 +5693,7 @@
PatArchive patArchive = new PatArchive();
patArchive.setId(999999999L);
patArchive.setName("铏氭嫙鎮h��");
+ patArchive.setTelcode(serviceTaskVo.getPhone());
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, serviceTaskdepts.get(0), patArchive);
int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -5436,10 +5720,21 @@
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
}
+ } else {
+ // 閰嶇疆缂哄け灞炪�屼笟鍔″彲棰勬湡銆嶆儏鍐碉細甯︿笂鎺掓煡淇℃伅鎶涘嚭鍘伙紙涓嶅悶锛夛紝
+ // 鎺ュ彛灞傛嵁姝よ繑鍥� code=500 + 鏄庣‘ msg锛岄伩鍏嶃��200 + 绌� data銆嶃��
+ throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氭湭鍖归厤鍒颁换鍔$淮搴﹂厤缃紙taskid=" + serviceTaskVo.getTaskid()
+ + "锛宎ppltype=" + appltype
+ + "锛宒eptType=" + serviceTaskdept.getDeptType()
+ + "锛宒eptCode=" + serviceTaskdept.getDeptCode()
+ + "锛宲ointLocation=" + serviceTaskdept.getPointLocation() + "锛�");
}
+ } catch (BaseException be) {
+ // 鈿狅笍 蹇呴』鎺掑湪 catch (Exception) 涔嬪墠锛欱aseException 鏄� RuntimeException锛�
+ // 鍚﹀垯鍒氭姏鍑虹殑涓氬姟寮傚父浼氳涓嬮潰鏁存鍚炴帀锛屾帴鍙e張鍙樻垚 200 + 绌� data銆�
+ throw be;
} catch (Exception e) {
- e.printStackTrace();
- log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細{}", e.getMessage());
+ log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細taskid={}锛寋}", serviceTaskVo.getTaskid(), e.getMessage(), e);
}
}
return content;
@@ -5457,6 +5752,9 @@
if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")) {
serviceSubtask.setLeaveldeptcode(serviceTaskdept.getDeptCode());
serviceSubtask.setLeaveldeptname(serviceTaskdept.getDeptName());
+ } else if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("3")) {
+ // 鐐逛綅琛岋紙dept_type='3'锛夛細dept_code/dept_name 涓虹┖锛岀偣浣嶅彧钀� point_location
+ serviceSubtask.setPointLocation(serviceTaskdept.getPointLocation());
} else {
serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());
--
Gitblit v1.9.3