From 8df388ede674abf94c0ba03995036d249f2a662d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 二月 2026 15:22:06 +0800
Subject: [PATCH] 【丽水】新增科室用户信息接口输入
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 370 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 230 insertions(+), 140 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 05c8767..96f9a1e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1993,6 +1993,7 @@
@Override
public Integer saveQuestionAnswerPhone(ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
int i = 0;
+ log.info("淇濆瓨鐢佃瘽鍥炶皟鍐呭 saveQuestionAnswerPhone锛歿}", serviceSubTaskDetailReq);
if (StringUtils.isNotEmpty(serviceSubTaskDetailReq.getParam1())) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskDetailReq.getParam1(), pri_key));
@@ -2229,32 +2230,85 @@
@Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
- List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
- List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
-
- // 鏍规嵁鏉′欢杩涜鍒嗙粍
- Map<String, List<ServiceSubtask>> collect = new HashMap<>();
-
- String groupKeyType = "";
-
+ String groupKey = "drcode";
if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- groupKeyType = "drCode";
- collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ groupKey = "drcode";
} else {
- groupKeyType = "leaveHospitalDistrictCode";
- collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+ groupKey = "leavehospitaldistrictcode";
}
} else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- groupKeyType = "drCode";
- collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ groupKey = "drcode";
} else {
- groupKeyType = "deptCode";
- collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+ groupKey = "deptcode";
}
}
+ List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
+ // 鏍规嵁鏉′欢杩涜鍒嗙粍
+ Map<String, List<ServiceSubtask>> collect = new HashMap<>();
+ serviceSubtaskCountReq.setGroupKey(groupKey);
+ List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
+ serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+ switch (groupKey)
+ {
+ case "deptcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+ break;
+ case "drcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ break;
+ case "leavehospitaldistrictcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+ break;
+ default:
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ break;
+ }
+ //鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
+ Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
+ for (String collectKey : collect.keySet()) {
+ List<ServiceSubtask> serviceSubtaskList = collect.get(collectKey);
+ if (CollectionUtils.isEmpty(serviceSubtaskList)) {
+ continue;
+ }
+ ServiceSubtaskStatistic statistic = getStatistic(serviceSubtaskList, serviceSubtaskCountReq.getFollowUpCountStyle());
+ if(ObjectUtils.isNotEmpty(jsRates)){
+ Map<String, Object> jsRateMap = jsRates.get(collectKey);
+ BigDecimal jsRate = new BigDecimal("0");
+ if(ObjectUtils.isNotEmpty(jsRateMap) && ObjectUtils.isNotEmpty(jsRateMap.get("rate"))){
+ jsRate = new BigDecimal(jsRateMap.get("rate").toString());
+ }
+ Double jsRateDouble = (jsRate.setScale(4, RoundingMode.HALF_UP)).doubleValue();
+ statistic.setRate(jsRateDouble);
+ }
+
+ if (ObjectUtils.isNotEmpty(statistic)) {
+ serviceSubtaskStatistics.add(statistic);
+ }
+ }
+ return serviceSubtaskStatistics;
+ }
+
+ /**
+ * 闅忚缁熻-鍙婃椂鐜囩粺璁�
+ * @param serviceSubtaskCountReq
+ * @param collect
+ * @return
+ */
+ public Map<String, Map<String, Object>> getSsRateForSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq, Map<String, List<ServiceSubtask>> collect){
+ if(ObjectUtils.isEmpty(serviceSubtaskCountReq)){
+ return null;
+ }
+ String groupKey = serviceSubtaskCountReq.getGroupKey();
+ if(StringUtils.isEmpty(groupKey)){
+ return null;
+ }
List<String> groupKeyList = new ArrayList<>(collect.keySet());
+ if(ObjectUtils.isEmpty(groupKeyList)){
+ return null;
+ }
//鍙婃椂鐜囩粺璁�
ServiceSubtaskVO ssRate = new ServiceSubtaskVO();
ssRate.setOrgid(serviceSubtaskCountReq.getOrgid());
@@ -2263,50 +2317,14 @@
if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
ssRate.setEndtime(new Date());
}
- switch (groupKeyType)
- {
- case "deptCode":
- ssRate.setGroupKey("deptcode");
- ssRate.setGroupKeyList(groupKeyList);
- break;
- case "drCode":
- ssRate.setGroupKey("drcode");
- ssRate.setGroupKeyList(groupKeyList);
- break;
- case "leaveHospitalDistrictCode":
- ssRate.setGroupKey("leavehospitaldistrictcode");
- ssRate.setGroupKeyList(groupKeyList);
- break;
- default:
- ssRate.setGroupKey("drcode");
- ssRate.setGroupKeyList(groupKeyList);
- break;
- }
+ ssRate.setGroupKey(groupKey);
+ ssRate.setGroupKeyList(groupKeyList);
Map<String, Map<String, Object>> jsRates = new HashMap<>();
if(!collect.isEmpty()){
jsRates = serviceSubtaskMapper.selectTimelyRateBatch(ssRate);
}
-
- for (String collectKey : collect.keySet()) {
- List<ServiceSubtask> serviceSubtaskList = collect.get(collectKey);
- if (CollectionUtils.isEmpty(serviceSubtaskList)) {
- continue;
- }
- ServiceSubtaskStatistic statistic = getStatistic(serviceSubtaskList);
- Map<String, Object> jsRateMap = jsRates.get(collectKey);
- BigDecimal jsRate = new BigDecimal("0");
- if(ObjectUtils.isNotEmpty(jsRateMap) && ObjectUtils.isNotEmpty(jsRateMap.get("rate"))){
- jsRate = new BigDecimal(jsRateMap.get("rate").toString());
- }
- Double jsRateDouble = (jsRate.setScale(4, RoundingMode.HALF_UP)).doubleValue();
- statistic.setRate(jsRateDouble);
- if (ObjectUtils.isNotEmpty(statistic)) {
- serviceSubtaskStatistics.add(statistic);
- }
- }
- return serviceSubtaskStatistics;
+ return jsRates;
}
-
@Override
public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq);
@@ -2502,7 +2520,7 @@
}
- private ServiceSubtaskStatistic getStatistic(List<ServiceSubtask> serviceSubtaskList) {
+ private ServiceSubtaskStatistic getStatistic(List<ServiceSubtask> serviceSubtaskList, String followUpCountStyle) {
ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
//鏍煎紡鍖栦负涓や綅灏忔暟鐨勭櫨鍒嗘瘮
DecimalFormat percentFormat = new DecimalFormat("##.##%");
@@ -2572,42 +2590,72 @@
serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
pendingFollowUpInfo.add(serviceSubtask);
}
- //棣栨闅忚鎴愬姛
- if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
- serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
- followUpSuccessInfo.add(serviceSubtask);
- }
//棣栨闅忚澶辫触
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
followUpFailInfo.add(serviceSubtask);
+ }
+ /**
+ * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
+ */
+ if(StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")){
+ //棣栨闅忚鎴愬姛
+ if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6L)) {
+ serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+ followUpSuccessInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+ manualInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+ smsInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+ wechatInfo.add(serviceSubtask);
+ }
+ }else {
+ //棣栨闅忚鎴愬姛 - 缁熻鏃跺�欏姞涓婁笉鎵ц鐨勶紝宸插彂閫佺殑
+ if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate().equals(6L)
+ || serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
+ serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+ followUpSuccessInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
+ manualInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+ smsInfo.add(serviceSubtask);
+ }
+ //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+ wechatInfo.add(serviceSubtask);
+ }
}
if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
serviceSubtaskStatistic.setFollowUpRate(percentFormat.format(rate));
} else {
serviceSubtaskStatistic.setFollowUpRate("0.00%");
- }
- //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("1")) {
- serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
- manualInfo.add(serviceSubtask);
- }
- //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("4")) {
- serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
- smsInfo.add(serviceSubtask);
- }
- //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("5")) {
- serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
- wechatInfo.add(serviceSubtask);
}
//缁撴灉寮傚父
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -2625,42 +2673,73 @@
serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
pendingFollowUpAgainInfo.add(serviceSubtask);
}
- //鍐嶆闅忚鎴愬姛
- if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
- serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
- followUpSuccessAgainInfo.add(serviceSubtask);
- }
//鍐嶆闅忚澶辫触
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
followUpFailAgainInfo.add(serviceSubtask);
+ }
+ /**
+ * 涓嶅悓缁熻鏂瑰紡涓嬩笉鍚岀殑闅忚鎴愬姛鏁� 鍙傛暟 followUpCountStyle 鎺у埗
+ */
+ if(StringUtils.isNotEmpty(followUpCountStyle) && followUpCountStyle.equals("1")){
+ //鍐嶆闅忚鎴愬姛
+ if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
+ serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+ followUpSuccessAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+ manualAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+ smsAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
+ if (serviceSubtask.getSendstate() != null
+ && !serviceSubtask.getSendstate().equals(4L)
+ && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+ wechatAgainInfo.add(serviceSubtask);
+ }
+ }else {
+ //鍐嶆闅忚鎴愬姛
+ if (serviceSubtask.getSendstate() != null &&
+ (serviceSubtask.getSendstate().equals(1L) || serviceSubtask.getSendstate().equals(6L) ||
+ serviceSubtask.getSendstate().equals(3L) || serviceSubtask.getSendstate().equals(4L))) {
+ serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+ followUpSuccessAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("1")) {
+ serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
+ manualAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("4")) {
+ serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+ smsAgainInfo.add(serviceSubtask);
+ }
+ //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
+ if (serviceSubtask.getSendstate() != null
+ && serviceSubtask.getPreachform().equals("5")) {
+ serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+ wechatAgainInfo.add(serviceSubtask);
+ }
}
if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
serviceSubtaskStatistic.setFollowUpRateAgain(percentFormat.format(rate));
} else {
serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
- }
- //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("1")) {
- serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
- manualAgainInfo.add(serviceSubtask);
- }
- //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("4")) {
- serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
- smsAgainInfo.add(serviceSubtask);
- }
- //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
- if (serviceSubtask.getSendstate() != null
- && !serviceSubtask.getSendstate().equals(4L)
- && serviceSubtask.getPreachform().equals("5")) {
- serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
- wechatAgainInfo.add(serviceSubtask);
}
//鍐嶆寮傚父
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3105,59 +3184,67 @@
@Override
@Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
- log.error("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
+ log.info("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
// 鏍规嵁鏉′欢杩涜鍒嗙粍
Map<String, List<ServiceSubtask>> collect = new HashMap<>();
- String orgid = null;
-
- if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() > 0) {
+ String groupKey = "drcode";
+ if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
-
+ groupKey = "drcode";
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
+ groupKey = "leavehospitaldistrictcode";
}
- } else if (serviceSubtaskCountReq.getDeptcodes() != null && serviceSubtaskCountReq.getDeptcodes().size() > 0) {
+ } else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrname()).orElse("Unknown")));
+ groupKey = "drcode";
} else {
- collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptname()).orElse("Unknown")));
+ groupKey = "deptcode";
}
}
- for (List<ServiceSubtask> serviceSubtaskList : collect.values()) {
+ serviceSubtaskCountReq.setGroupKey(groupKey);
+ List<String> groupKeyList = serviceSubtaskMapper.getSfStatisticsGroupKey(serviceSubtaskCountReq);
+ serviceSubtaskCountReq.setGroupKeyList(groupKeyList);
+ List<ServiceSubtask> rawData = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq);
+ switch (groupKey)
+ {
+ case "deptcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDeptcode()).orElse("Unknown")));
+ break;
+ case "drcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ break;
+ case "leavehospitaldistrictcode":
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
+ break;
+ default:
+ collect = rawData.stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getDrcode()).orElse("Unknown")));
+ break;
+ }
+ //鑾峰彇鍙婃椂鐜囩粺璁″悎闆�
+ Map<String, Map<String, Object>> jsRates = getSsRateForSfStatistics(serviceSubtaskCountReq, collect);
+ for (String collectKey : collect.keySet()) {
+ List<ServiceSubtask> serviceSubtaskList = collect.get(collectKey);
if (CollectionUtils.isEmpty(serviceSubtaskList)) {
continue;
}
ServiceSubtaskStatistic statistic = getStatisticCategory(serviceSubtaskList, serviceSubtaskCountReq);
- //鍙婃椂鐜�
- ServiceSubtask ss = new ServiceSubtask();
- orgid = serviceSubtaskList.get(0).getOrgid();
- ss.setOrgid(orgid);
-
- // 濡傛灉鏈夊尰鐢熺紪鐮侊紝璁剧疆鍖荤敓缂栫爜鐢ㄤ簬鍙婃椂鐜囨煡璇�
- if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
- ss.setDrcode(serviceSubtaskList.get(0).getDrcode());
- } else {
- if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())) {
- ss.setLeavehospitaldistrictcode(serviceSubtaskList.get(0).getLeavehospitaldistrictcode());
- } else if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getDeptcodes())) {
- ss.setDeptcode(serviceSubtaskList.get(0).getDeptcode());
+ if(ObjectUtils.isNotEmpty(jsRates)){
+ Map<String, Object> jsRateMap = jsRates.get(collectKey);
+ BigDecimal jsRate = new BigDecimal("0");
+ if(ObjectUtils.isNotEmpty(jsRateMap) && ObjectUtils.isNotEmpty(jsRateMap.get("rate"))){
+ jsRate = new BigDecimal(jsRateMap.get("rate").toString());
}
+ Double jsRateDouble = (jsRate.setScale(4, RoundingMode.HALF_UP)).doubleValue();
+ statistic.setRate(jsRateDouble);
}
-
- ss.setStarttime(serviceSubtaskCountReq.getStartTime());
- ss.setEndtime(serviceSubtaskCountReq.getEndTime());
- if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
- ss.setEndtime(new Date());
- }
- Double jsRate = serviceSubtaskMapper.selectTimelyRate(ss);
- statistic.setRate(jsRate);
if (ObjectUtils.isNotEmpty(statistic)) {
serviceSubtaskStatistics.add(statistic);
}
}
+
+ //缁熻闅忚棰樼洰鍒嗙被
if (CollectionUtils.isNotEmpty(serviceSubtaskStatistics)) {
for (ServiceSubtaskStatistic serviceSubtaskStatistic : serviceSubtaskStatistics) {
//鑾峰彇婊℃剰搴﹂鐩�婚噺
@@ -3281,6 +3368,8 @@
* @return
*/
public Boolean setFailPreachForm(ServiceSubtask serviceSubtask, String preachform, String remark, String failSendstate) {
+ log.info("setFailPreachForm 闅忚娴佺▼澶勭悊 serviceSubtask:{}, preachform:{}, remark:{}, failSendstate:{}",
+ serviceSubtask, preachform, remark, failSendstate);
//灏嗙姸鎬佽缃负澶辫触
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
@@ -3307,6 +3396,7 @@
if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
+ serviceSubtask.setRemark("setFailPreachForm鏂规硶 褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛屽叏澶辫触浜�");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
}
--
Gitblit v1.9.3