From 0c1f8c479065739f3c7a5126de8e667035d00b58 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 12 十月 2026 14:21:52 +0800
Subject: [PATCH] 【丽水】满意度模块化：新增 ruoyi-satisfaction 独立模块
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 1043 +++++----------------------------------------------------
1 files changed, 91 insertions(+), 952 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 2660766..b27d133 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -9,25 +9,24 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.service.IConfigService;
-import com.ruoyi.common.dx.MessageSend;
-import com.ruoyi.common.enums.WxGZHEnum;
+import com.ruoyi.satisfaction.api.SatisfactionFacade;
+import com.ruoyi.message.sms.provider.sltd.ws.MessageSend;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.message.SendResult;
+import com.ruoyi.message.sms.SmsSendRequest;
+import com.ruoyi.message.sms.SmsSenderFactory;
+import com.ruoyi.message.wechat.WechatSendRequest;
+import com.ruoyi.message.wechat.WechatSenderFactory;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.common.FtpService;
-import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.ScheduleSubtaskBuilder;
import com.smartor.config.PhoneUtils;
-import com.smartor.domain.DTO.MydTrendReqDTO;
-import com.smartor.domain.DTO.MzMydScoreRankDTO;
-import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
-import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
-import com.smartor.domain.DTO.ServiceSubtaskOptionStatDTO;
+import com.smartor.domain.DTO.*;
import com.smartor.domain.*;
import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -74,6 +73,16 @@
@Slf4j
@Service
public class ServiceSubtaskServiceImpl implements IServiceSubtaskService {
+
+ /**
+ * 婊℃剰搴︽ā鍧楀澶栭棬闈紙甯搁┗ Bean锛夈��
+ * <p>
+ * 闅忚缁熻閲岀殑銆屾弧鎰忓害鎸囨暟銆嶏紙{@code getSfStatisticsJoy}锛夊彧鑳介�氳繃瀹冨彇鏁帮紱
+ * 婊℃剰搴︽ā鍧楀叧闂椂闂ㄩ潰杩斿洖鍏ㄩ浂 Map锛屼笉褰卞搷闅忚缁熻鐨勫叾瀹冨瓧娈典笌鍚姩銆�
+ */
+ @Autowired
+ private SatisfactionFacade satisfactionFacade;
+
@Autowired
private ServiceSubtaskMapper serviceSubtaskMapper;
@@ -170,10 +179,16 @@
private ISysConfigService configService;
@Autowired
- private MtSubmitSmUtil mtSubmitSmUtil;
+ private SysConfigMapper sysConfigMapper;
+
+ /**
+ * 娑堟伅鍙戦�佹柟宸ュ巶锛堢煭淇�/寰俊鍏紬鍙凤級锛屾浛浠ｅ師鏉ョ洿鎺ヨ皟鐢ㄥ悇绔欑偣鍙戦�佷唬鐮佺殑鍐欐硶
+ */
+ @Autowired
+ private SmsSenderFactory smsSenderFactory;
@Autowired
- private SysConfigMapper sysConfigMapper;
+ private WechatSenderFactory wechatSenderFactory;
@Autowired
private RedisTemplate redisTemplate;
@@ -195,9 +210,6 @@
@Value("${req_path}")
private String req_path;
-
- @Value("${xhsmsPath}")
- private String xhsmsPath;
@Value("${phoneUpEveryHour}")
private Integer phoneUpEveryHour;
@@ -603,7 +615,6 @@
// return map;
// }
-
/**
* 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
* 浼樺寲璇存槑锛�
@@ -850,7 +861,6 @@
svyTaskTemplateService.deleteSvyTaskTemplateBySvyid(serviceSubtask.getTemplateid());
} else if (serviceSubtask.getType().equals("1"))
ivrTaskTemplateService.deleteIvrTaskTemplateByID(serviceSubtask.getTemplateid());
-
String tempName = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(Long.valueOf(taskTempid)).getSvyname();
serviceSubtask.setTemplateid(taskTempid.longValue());
@@ -2470,7 +2480,6 @@
return phoneCallBackYQVO;
}
-
private String getObject(ServiceSubtask serviceSubtask, String scriptContent) {
Map<String, Map<String, String>> param = getParam(serviceSubtask.getTaskid());
for (Map<String, String> map : param.values()) {
@@ -2487,7 +2496,6 @@
return scriptContent;
}
-
/**
* 鑾峰彇浠诲姟閲岀殑閫氶厤绗�
@@ -2537,7 +2545,6 @@
}
return map;
}
-
/**
* 闆ㄧ划浠诲姟鎷夊彇
@@ -2607,7 +2614,6 @@
log.info("-----------瀹為檯鎷夊彇鐨勭數璇濇暟鎹噺锛歿}", CollectionUtils.isNotEmpty(pullTaskVOList) ? pullTaskVOList.size() : null);
return pullTaskVOList;
}
-
private List<PullTaskVO> getPullTaskList(List<String> subIds, String cacheName) {
log.error("浠诲姟鎷夊彇subIds鐨勫�兼槸澶氬皯锛歿}", subIds);
@@ -2680,7 +2686,6 @@
return pullTaskVOList;
}
-
@Override
public Integer saveQuestionAnswerPhone(ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
@@ -3062,6 +3067,8 @@
ssRate.setOrgid(serviceSubtaskCountReq.getOrgid());
ssRate.setStarttime(serviceSubtaskCountReq.getStartTime());
ssRate.setEndtime(serviceSubtaskCountReq.getEndTime());
+ ssRate.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
+ ssRate.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
ssRate.setVisitCount(serviceSubtaskCountReq.getVisitCount());
ssRate.setServiceTypeList(serviceSubtaskCountReq.getServiceType());
if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
@@ -3076,7 +3083,6 @@
}
return jsRates;
}
-
public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq);
@@ -3153,6 +3159,8 @@
if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
ss.setEndtime(new Date());
}
+ ss.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
+ ss.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
Double jsRate = serviceSubtaskMapper.selectTimelyRate(ss);
statistic.setRate(jsRate);
if (ObjectUtils.isNotEmpty(statistic)) {
@@ -3162,13 +3170,15 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskStatistics)) {
for (ServiceSubtaskStatistic serviceSubtaskStatistic : serviceSubtaskStatistics) {
//鎵�鏈夋弧鎰忓害鏁伴噺
+ //婊℃剰搴︽ā鍧楀寲鍚庯細婊℃剰搴︽寚鏁版嵁姝ゆ敼涓鸿皟鐢ㄦ弧鎰忓害妯″潡闂ㄩ潰锛�
+ //妯″潡鍏抽棴鏃堕棬闈㈣繑鍥炲叏闆� Map锛堜笌琚縼绉诲疄鐜扮殑瀹為檯杈撳嚭涓�鑷达級锛屼笉褰卞搷闅忚缁熻鍏跺畠瀛楁銆�
if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getDeptcodes())) {
- Map<String, Object> satisfactionIndex = getSatisfactionIndex("1", serviceSubtaskStatistic.getDeptcode(), orgid, serviceSubtaskCountReq.getIvrCategoryid(), serviceSubtaskCountReq.getSvyCategoryid());
+ Map<String, Object> satisfactionIndex = satisfactionFacade.getSatisfactionIndex("1", serviceSubtaskStatistic.getDeptcode(), orgid, serviceSubtaskCountReq.getIvrCategoryid(), serviceSubtaskCountReq.getSvyCategoryid());
serviceSubtaskStatistic.setJoyAllCount(satisfactionIndex.get("mydtmzl") != null ? (Integer) satisfactionIndex.get("mydtmzl") : 0);
serviceSubtaskStatistic.setJoyCount(satisfactionIndex.get("mydtbl") != null ? (Integer) satisfactionIndex.get("mydtbl") : 0);
serviceSubtaskStatistic.setJoyTotal((Double) satisfactionIndex.get("wcbl"));
} else if (CollectionUtils.isNotEmpty(serviceSubtaskCountReq.getLeavehospitaldistrictcodes())) {
- Map<String, Object> satisfactionIndex = getSatisfactionIndex("2", serviceSubtaskStatistic.getLeavehospitaldistrictcode(), orgid, serviceSubtaskCountReq.getIvrCategoryid(), serviceSubtaskCountReq.getSvyCategoryid());
+ Map<String, Object> satisfactionIndex = satisfactionFacade.getSatisfactionIndex("2", serviceSubtaskStatistic.getLeavehospitaldistrictcode(), orgid, serviceSubtaskCountReq.getIvrCategoryid(), serviceSubtaskCountReq.getSvyCategoryid());
serviceSubtaskStatistic.setJoyAllCount(satisfactionIndex.get("mydtmzl") != null ? (Integer) satisfactionIndex.get("mydtmzl") : 0);
serviceSubtaskStatistic.setJoyCount(satisfactionIndex.get("mydtbl") != null ? (Integer) satisfactionIndex.get("mydtbl") : 0);
serviceSubtaskStatistic.setJoyTotal((Double) satisfactionIndex.get("wcbl"));
@@ -3178,103 +3188,6 @@
return serviceSubtaskStatistics;
}
-
-
- /**
- * 鑾峰彇婊℃剰搴﹂鐩�婚噺
- * type : 1-绉戝 2鐥呭尯
- * code: 绉戝鎴栫梾鍖篶ode
- *
- * @return
- */
- private Map<String, Object> getSatisfactionIndex(String type, String code, String orgid, Long ivrCategoryid, Long svyCategoryid) {
- Map<String, Object> map = new HashMap<>();
- List<ServiceTask> serviceTasks = null;
- if (type.equals("1")) {
- ServiceTask serviceTask = new ServiceTask();
- serviceTask.setDeptcode(code);
- serviceTask.setOrgid(orgid);
- serviceTasks = serviceTaskService.selectServiceTaskList(serviceTask);
- } else if (type.equals("2")) {
- ServiceTask serviceTask = new ServiceTask();
- serviceTask.setLeavehospitaldistrictcode(code);
- serviceTask.setOrgid(orgid);
- serviceTasks = serviceTaskService.selectServiceTaskList(serviceTask);
- }
-
- //鑾峰彇婊℃剰搴﹂鐩�婚噺
- BigDecimal mydtmzlsum = new BigDecimal(0);
- //鑾峰彇婊℃剰搴﹂鐩～鎶ラ噺
- BigDecimal mydtblsum = new BigDecimal(0);
- if (CollectionUtils.isNotEmpty(serviceTasks)) {
- //鑾峰彇婊℃剰搴﹂鐩�婚噺
- for (ServiceTask serviceTask : serviceTasks) {
- if (serviceTask.getType().equals("1")) {
- //璇煶
- Long templateid = serviceTask.getTemplateid();
- IvrTaskTemplateScript ivrTaskTemplateScript = new IvrTaskTemplateScript();
- ivrTaskTemplateScript.setTemplateID(templateid);
- ivrTaskTemplateScript.setOrgid(serviceTask.getOrgid());
- //鍏堥粯璁や负1鍚э紝assortid=1 浠ｈ〃鏄弧鎰忓害
- ivrTaskTemplateScript.setScriptAssortid(ivrCategoryid);
- List<IvrTaskTemplateScript> ivrTaskTemplateScripts = iIvrTaskTemplateScriptService.selectIvrTaskTemplateScriptList(ivrTaskTemplateScript);
- if (CollectionUtils.isNotEmpty(ivrTaskTemplateScripts)) {
- //闇�瑕佸厛璁＄畻鍑哄彂閫侀噺锛屽啀涔樹互鍗曚釜闂埜婊℃剰搴﹂鐩暟閲忥紝寰楀埌婊℃剰搴﹂鐩�婚噺锛堝寘鍚簡鏈仛鐨勶級
- ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
- serviceSubtaskVO.setTaskid(serviceTask.getTaskid());
- List<Long> sendstates = new ArrayList<>(Arrays.asList(3L, 5L, 6L));
- serviceSubtaskVO.setSendstates(sendstates);
- List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskBySendstate(serviceSubtaskVO);
- if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
- int mydtmzlCount = ivrTaskTemplateScripts.size() * serviceSubtaskList.size();
- mydtmzlsum.add(new BigDecimal(mydtmzlCount));
- }
-
- }
- } else if (serviceTask.getType().equals("2")) {
- //闂嵎
- SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
- svyTaskTemplateScript.setTemplateID(serviceTask.getTemplateid());
- svyTaskTemplateScript.setOrgid(serviceTask.getOrgid());
- svyTaskTemplateScript.setCategoryid(svyCategoryid);
- List<SvyTaskTemplateScript> svyTaskTemplateScriptList = svyTaskTemplateScriptService.selectSvyTaskTemplateScriptList(svyTaskTemplateScript);
- if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptList)) {
- ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
- serviceSubtaskEntity.setTaskid(serviceTask.getTaskid());
- List<Long> sendstates = new ArrayList<>(Arrays.asList(3L, 5L, 6L));
- serviceSubtaskEntity.setSendstates(sendstates);
- List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskBySendstate(serviceSubtaskEntity);
- if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
- int mydtmzlCount = svyTaskTemplateScriptList.size() * serviceSubtaskList.size();
- mydtmzlsum.add(new BigDecimal(mydtmzlCount));
- }
- }
- }
-
- //鑾峰彇婊℃剰搴﹂鐩～鎶ラ噺
- ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
- serviceSubtaskDetail.setTaskid(serviceTask.getTaskid());
- if (serviceTask.getType().equals("1")) serviceSubtaskDetail.setCategoryid(ivrCategoryid);
- if (serviceTask.getType().equals("2")) serviceSubtaskDetail.setCategoryid(svyCategoryid);
- serviceSubtaskDetail.setOrgid(serviceTask.getOrgid());
- List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
- if (CollectionUtils.isNotEmpty(serviceSubtaskDetails))
- mydtblsum.add(new BigDecimal(serviceSubtaskDetails.size()));
- }
-
-
- }
- //婊℃剰搴﹂鐩�婚噺
- map.put("mydtmzl", mydtmzlsum.intValue());
- map.put("mydtbl", mydtblsum.intValue());
- map.put("wcbl", 0.0);
- if (mydtmzlsum.intValue() != 0) {
- map.put("wcbl", mydtblsum.divide(mydtmzlsum, 2, RoundingMode.HALF_UP).doubleValue());
- }
-
- return map;
- }
-
private ServiceSubtaskStatistic getStatistic(List<ServiceSubtask> serviceSubtaskList, String followUpCountStyle, Integer visitCount) {
ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
@@ -3906,7 +3819,6 @@
return serviceSubtaskStatistic;
}
-
private ServiceSubtaskStatistic getStatisticJoy(List<ServiceSubtask> serviceSubtaskList, List<ServiceSubtaskCount> joySubCount) {
ServiceSubtaskStatistic serviceSubtaskStatistic = new ServiceSubtaskStatistic();
//鏍煎紡鍖栦负涓や綅灏忔暟鐨勭櫨鍒嗘瘮
@@ -4029,7 +3941,6 @@
if (subCounts == null) {
subCounts = new ArrayList<>();
}
-
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
List<ServiceSubtaskCount> subCountTemp = subCounts.stream().filter(r -> r.getSubTaskId().equals(serviceSubtask.getId())).collect(Collectors.toList());
@@ -4218,10 +4129,8 @@
serviceOutPath.setUpdateTime(new Date());
serviceOutPath.setUrl(url);
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- Map<String, String> map = new HashMap<>();
- map.put("phone", serviceSubtask.getPhone());
- map.put("content", sendMagParam.getContent());
- HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(map));
+ //鐭俊鍙戦�佸凡鏀跺彛鍒� ruoyi-message 妯″潡锛涗笌鍘熷疄鐜颁竴鑷达細涓嶅垽鏂彂閫佺粨鏋�
+ smsSenderFactory.send(active, SmsSendRequest.of(serviceSubtask.getPhone(), sendMagParam.getContent(), serviceSubtask.getOrgid()));
redisCache.setCacheObject(subTaskId + "recordAccept-hungup", "1", 10, TimeUnit.MINUTES);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
serviceSubtask.setRemark("鐢佃瘽鍙戦�佹嫆鎺�,鐭俊琛ュ伩鍙戦�佹垚鍔�");
@@ -4509,7 +4418,6 @@
}
}
-
/**
* 鑾峰彇闅忚缁熻姣斾緥
*
@@ -4731,7 +4639,6 @@
return result;
}
-
/**
* @param serviceSubtask
* @param preachform
@@ -4762,7 +4669,6 @@
serviceSubtaskPreachform1.setSendstate(failSendstate);
serviceSubtaskPreachform1.setRemark(remark);
serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
-
//濡傛灉褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛岄偅鐩存帴灏唖erviceSubtask鐨剆endstate鐘舵�佹敼鎴�5灏辫浜�(鍏ㄥけ璐ヤ簡)
if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
@@ -4809,7 +4715,6 @@
}
return visitTime;
}
-
/**
* 璁＄畻鎬昏琛�
@@ -5177,9 +5082,11 @@
sendMagParam.setContent(smsContemt.replace("${wjurl}", sendMagParam.getUrl()));
}
+ //鐭俊鍙戦�侊細鍚勭珯鐐瑰鎺ユ柟寮忓樊寮傝緝澶э紝宸叉敹鍙ｅ埌 ruoyi-message 妯″潡
if (active.equals("nhfy")) {
- Map<String, Object> smsResult = mtSubmitSmUtil.submitSm(sendMagParam.getPhone(), sendMagParam.getContent());
- if (smsResult != null && smsResult.get("result") != null && smsResult.get("result").toString().equals("0")) {
+ SendResult smsResult = smsSenderFactory.send(active,
+ SmsSendRequest.of(sendMagParam.getPhone(), sendMagParam.getContent(), serviceSubtask.getOrgid()));
+ if (smsResult.isOk()) {
resultMap.put("code", "200");
resultMap.put("msg", "鍙戦�佹垚鍔�");
serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";鐭俊鍙戦�佹垚鍔�(鎵嬪姩鎻愪氦)" : "鐭俊鍙戦�佹垚鍔�(鎵嬪姩鎻愪氦)");
@@ -5224,36 +5131,33 @@
serviceOutPath.setUrl(url);
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-
- //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
- List<String> wxqqxx = WxGZHEnum.getDescByCode(serviceSubtask.getOrgid());
- if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
- resultMap.put("code", -1);
- resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�");
- return resultMap;
- }
-
+ //his鎮ｈ�卛d鏍￠獙锛堜笌鍘熷疄鐜颁竴鑷达細鍏堟牎楠岃繖涓�椤癸級
if (StringUtils.isEmpty(serviceSubtask.getPatidHis())) {
resultMap.put("code", -1);
resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
return resultMap;
}
- String wxCode = "";
- wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
- Map map = JSONObject.parseObject(wxCode, Map.class);
- Boolean wxCodeSuccess = false;
- if (!map.isEmpty() && map.get("succ") != null) {
- wxCodeSuccess = (boolean) map.get("succ");
- }
+
+ //鏈烘瀯閰嶇疆鏍￠獙銆佹姤鏂囩鍚嶄笌杩斿洖鍒ゅ畾鍧囧凡鏀跺彛鍒� ruoyi-message 鐨勫彂閫佹柟瀹炵幇
+ WechatSendRequest wechatRequest = new WechatSendRequest();
+ wechatRequest.setOrgid(serviceSubtask.getOrgid());
+ wechatRequest.setIdCard(serviceSubtask.getSfzh());
+ wechatRequest.setUrl(url);
+ wechatRequest.setTitle(serviceSubtask.getTaskName());
+ wechatRequest.setContent(serviceSubtask.getTaskDesc());
+ wechatRequest.setPhone(patArchive.getTelcode());
+ wechatRequest.setPatientName(serviceSubtask.getSendname());
+ wechatRequest.setPatidHis(patArchive.getPatidHis());
+ SendResult wechatResult = wechatSenderFactory.send(active, wechatRequest);
//鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
serviceSubtask.setSendstate(3L);
- if (wxCodeSuccess) {
+ if (wechatResult.isOk()) {
serviceSubtask.setResult("success");
resultMap.put("code", "200");
resultMap.put("msg", "鍙戦�佹垚鍔�");
} else {
- log.error("銆恠fHandlle銆戝叕浼楀彿鍙戦�佸け璐ワ紝鎮ｈ�呬俊鎭細{}锛岄敊璇俊鎭細{}", serviceSubtask, map.get("msg"));
+ log.error("銆恠fHandlle銆戝叕浼楀彿鍙戦�佸け璐ワ紝鎮ｈ�呬俊鎭細{}锛岄敊璇俊鎭細{}", serviceSubtask, wechatResult.getMessage());
resultMap.put("code", -1);
resultMap.put("message", "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�");
return resultMap;
@@ -5266,400 +5170,6 @@
return resultMap;
}
return resultMap;
- }
- @Override
- public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType, List<Long> subtaskIds) {
- //鍏堟竻鐞嗕竴涓嬮噸澶嶆暟鎹�
- List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
- if (!CollectionUtils.isEmpty(repeatIds)) {
- serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
- }
- List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType, subtaskIds);
-
- // 澶勭悊 targetvalue锛氭寜 & 鍒嗗壊鎴愬鏉¤褰�
- List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
- for (ServiceSubtaskDetailRatioExport export : serviceSubtaskDetailRatioExports) {
- if (StringUtils.isNotEmpty(export.getTargetvalue()) && export.getTargetvalue().contains("&")) {
- String[] values = export.getTargetvalue().split("&");
- // 濡傛灉鏈夊鏉＄洰鏍囧�硷紝鎷嗗垎鎴愬琛�
- for (String value : values) {
- //鍏堝幓 result 涓煡涓�涓嬶紝鏈夋病鏈夎繖涓� questiontext 鍜屽搴旂殑 targetvalue
- //娉ㄦ剰蹇呴』甯︿笂 taskid 涓�璧峰尮閰嶏細鍚﹀垯浼氭妸鍒殑浠诲姟鐨勬暟鎹～鍒版湰浠诲姟鐨勮涓婏紝
- //瀵艰嚧瀵煎嚭鐨勩�屾暟閲�/姣斾緥銆嶅拰璇ヨ鐨勩�屼换鍔″悕绉�/浠诲姟缂栧彿銆嶅涓嶄笂锛堝悓涓�浠诲姟鍚屼竴棰樺嚭鐜颁袱涓笉鍚屽垎姣嶏級
- ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> Objects.equals(e.getTaskid(), export.getTaskid()) && e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
- if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
- //濡傛灉瀛樺湪锛屽垯灏� result 閲岀殑杩欎釜闂鎵�瀵瑰簲鐨� Targetvalue=value 杩欐潯鏁版嵁鏇存柊鎴愬綋鍓嶈繖鏉℃暟鎹�
- if (value.equals(export.getOptionresult())) {
- existingExport.setRatio(export.getRatio());
- existingExport.setScore(export.getScore());
- existingExport.setCount(export.getCount());
- existingExport.setOptionresult(export.getOptionresult());
- }
- } else if (existingExport != null && !existingExport.getRatio().equals("0")) {
- continue;
- } else {
- ServiceSubtaskDetailRatioExport newExport = DtoConversionUtils.sourceToTarget(export, ServiceSubtaskDetailRatioExport.class);
- newExport.setTargetvalue(value.trim()); // targetvalue 鏄剧ず鍗曚釜閫夐」
- if (!value.equals(export.getOptionresult())) {
- newExport.setOptionresult(null);
- newExport.setCount("0");
- newExport.setRatio("0");
- }
- result.add(newExport);
- }
- }
- } else {
- // targetvalue 涓嶅寘鍚� &锛岀洿鎺ユ坊鍔犲埌缁撴灉
- result.add(export);
- }
- }
-
- return result;
- }
-
- @Override
- public List<ServiceSubtaskDetailRatioExport> statMydQuestionOptionForExport(List<Long> subtaskIds, String questiontext) {
- List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
- if (CollectionUtils.isEmpty(subtaskIds)) {
- return result;
- }
- List<ServiceSubtaskOptionStatDTO> statList = serviceSubtaskMapper.statMydQuestionOptionForExport(subtaskIds, questiontext);
- if (CollectionUtils.isEmpty(statList)) {
- return result;
- }
- return buildMydOptionRows(statList);
- }
-
- /**
- * 鎶娿�屼换鍔�+棰樼洰+閫夐」銆嶇殑浣滅瓟缁熻鎷兼垚瀵煎嚭鐨勩�岄棶棰樿鎯呭崰姣斻�嶈
- * <ul>
- * <li>閫夐」娓呭崟锛氶鐩厤缃繃鐨勯�夐」鍦� targetvalue锛堢敤 & 杩炴帴锛夐噷锛屽叏閮ㄥ垪鍑猴紝娌′汉閫夌殑鏄剧ず 0</li>
- * <li>鏁伴噺锛氭偅鑰呴�変腑鐨勯�夐」鍦� asrtext 閲岋紙澶氶�夐鏄�孉&B銆嶏級锛屾瘡涓�変腑椤瑰悇璁颁竴娆′汉鏁帮紝涓�涓偅鑰呭彧绠椾竴鏉℃槑缁�</li>
- * <li>姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屾墍浠ュ崟閫夐鍚勯�夐」鏁伴噺涔嬪拰 = 璇ラ浣滅瓟鎮ｈ�呮暟</li>
- * <li>鍒嗘暟锛氳閫夐」鏄庣粏鐨� score 涔嬪拰锛涘閫夎鎸夐�変腑椤逛唤鏁板潎鍒嗭紝淇濊瘉鍚勯�夐」鍒嗘暟涔嬪拰 = 鏄庣粏鍒嗘暟涔嬪拰</li>
- * </ul>
- */
- private static List<ServiceSubtaskDetailRatioExport> buildMydOptionRows(List<ServiceSubtaskOptionStatDTO> statList) {
- List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
-
- // 鎸夈�屼换鍔� + 棰樼洰銆嶅垎缁勶紝淇濇寔 SQL 鐨勯『搴忥紙鍏堥鐩悗浠诲姟锛�
- Map<String, List<ServiceSubtaskOptionStatDTO>> grouped = new LinkedHashMap<>();
- for (ServiceSubtaskOptionStatDTO stat : statList) {
- String key = stat.getTaskid() + "\u0001" + stat.getQuestiontext();
- grouped.computeIfAbsent(key, k -> new ArrayList<>()).add(stat);
- }
-
- for (List<ServiceSubtaskOptionStatDTO> group : grouped.values()) {
- ServiceSubtaskOptionStatDTO first = group.get(0);
- // 閫夐」 -> 浜烘暟锛坙ong[1] 渚夸簬绱姞锛夛紝椤哄簭鍗冲嚭鐜伴『搴�
- Map<String, long[]> countMap = new LinkedHashMap<>();
- Map<String, BigDecimal> scoreMap = new LinkedHashMap<>();
-
- for (ServiceSubtaskOptionStatDTO stat : group) {
- // targetvalue = 鏈鎵�鏈夐�夐」鐨勬竻鍗曪紝娌′汉閫夌殑涔熻鍒楀嚭鏉�
- List<String> options = splitOptions(stat.getTargetvalue());
- // asrtext = 鎮ｈ�呭疄闄呴�変腑鐨勯�夐」锛屽閫夐浼氭槸銆岄�変腑椤�1&閫変腑椤�2銆�
- List<String> chosenOptions = splitOptions(stat.getOptionresult());
- for (String option : options) {
- countMap.computeIfAbsent(option, k -> new long[1]);
- scoreMap.computeIfAbsent(option, k -> BigDecimal.ZERO);
- }
-
- long patientCount = stat.getPatientCount() == null ? 0L : stat.getPatientCount();
- BigDecimal scoreSum = stat.getScoreSum() == null ? BigDecimal.ZERO : stat.getScoreSum();
-
- if (!chosenOptions.isEmpty()) {
- BigDecimal[] scoreParts = splitScore(scoreSum, chosenOptions.size());
- for (int i = 0; i < chosenOptions.size(); i++) {
- String chosen = chosenOptions.get(i);
- // 閫変腑鐨勯�夐」鍙兘涓嶅湪閰嶇疆娓呭崟閲岋紙鍘嗗彶鏁版嵁锛夛紝琛ヤ竴琛�
- countMap.computeIfAbsent(chosen, k -> new long[1]);
- scoreMap.computeIfAbsent(chosen, k -> BigDecimal.ZERO);
- countMap.get(chosen)[0] += patientCount;
- scoreMap.put(chosen, scoreMap.get(chosen).add(scoreParts[i]));
- }
- } else if (options.size() == 1) {
- // 娌℃湁 asrtext锛堟湭绛�/鏃犲簲绛旓級鏃讹紝鍙湁鍞竴閫夐」鎵嶈兘纭畾褰掑睘
- countMap.get(options.get(0))[0] += patientCount;
- scoreMap.put(options.get(0), scoreMap.get(options.get(0)).add(scoreSum));
- }
- }
-
- long total = 0L;
- for (long[] count : countMap.values()) total += count[0];
-
- for (Map.Entry<String, long[]> entry : countMap.entrySet()) {
- long count = entry.getValue()[0];
- ServiceSubtaskDetailRatioExport row = new ServiceSubtaskDetailRatioExport();
- row.setQuestiontext(first.getQuestiontext());
- row.setOptionresult(entry.getKey());
- row.setTargetvalue(entry.getKey());
- row.setCount(String.valueOf(count));
- row.setRatio(formatRatio(count, total));
- row.setScore(formatScore(scoreMap.get(entry.getKey())));
- row.setTaskname(first.getTaskName());
- row.setTaskid(first.getTaskid());
- row.setValueType(first.getValueType());
- result.add(row);
- }
- }
- return result;
- }
-
- /**
- * 鎶婁竴鏉℃槑缁嗙殑鍒嗘暟鎸夐�変腑椤逛唤鏁板潎鍒嗭紝浣欐暟琛ョ粰绗竴涓紝淇濊瘉鍚勪唤涔嬪拰 = 鍘熷垎鏁�
- */
- private static BigDecimal[] splitScore(BigDecimal total, int parts) {
- BigDecimal[] result = new BigDecimal[parts];
- if (parts <= 0) {
- return result;
- }
- BigDecimal each = total.divide(BigDecimal.valueOf(parts), 2, RoundingMode.HALF_UP);
- for (int i = 0; i < parts; i++) {
- result[i] = each;
- }
- result[0] = result[0].add(total.subtract(each.multiply(BigDecimal.valueOf(parts))));
- return result;
- }
-
- /**
- * 鎷嗗垎棰樼洰閰嶇疆鐨勯�夐」锛堝涓�夐」鐢� & 杩炴帴锛夛紝椤哄甫鍘绘帀鍏ㄨ/鍗婅绌虹櫧
- */
- private static List<String> splitOptions(String targetvalue) {
- List<String> options = new ArrayList<>();
- if (StringUtils.isEmpty(targetvalue)) {
- return options;
- }
- for (String part : targetvalue.split("&")) {
- String option = trimAll(part);
- if (StringUtils.isNotEmpty(option) && !options.contains(option)) {
- options.add(option);
- }
- }
- return options;
- }
-
- /**
- * 姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屼繚鐣欎袱浣嶅皬鏁�
- */
- private static String formatRatio(long count, long total) {
- if (total <= 0) {
- return "0.00%";
- }
- return BigDecimal.valueOf(count * 100.0 / total).setScale(2, RoundingMode.HALF_UP).toPlainString() + "%";
- }
-
- /**
- * 鍒嗘暟涔嬪拰锛氬幓鎺夊浣欑殑灏忔暟浣嶏紙0.00 -> 0锛�
- */
- private static String formatScore(BigDecimal score) {
- if (score == null) {
- return "0";
- }
- BigDecimal value = score.stripTrailingZeros();
- if (value.scale() < 0) {
- value = value.setScale(0);
- }
- return value.toPlainString();
- }
-
- /*
- * 鏍规嵁绉戝鎴栫梾鍖虹粺璁￠棶鍗烽�夐」(绉戝銆侀鐩煡璇㈢殑绉戝璇勫垎琛�)
- */
- @Override
- public Map<String, Map<String, List<QuestionCountKsOrBqDTO>>> statQuestionOptionByKsOrBq(QuestionCountKsOrBqVO vo) {
-
- // 1. 鏌ユ槑缁�
- List<QuestionCountKsOrBqDTO> sourceList = serviceSubtaskMapper.statQuestionOptionByKsOrBq(vo);
- if (CollectionUtils.isEmpty(sourceList)) {
- return Collections.emptyMap();
- }
-
- // 2. 鍒ゆ柇鎸夌瀹よ繕鏄寜鐥呭尯
- boolean byDept = vo.getLeaveldeptcodes() != null;
- boolean byDistrict = !byDept && vo.getLeavehospitaldistrictcodes() != null;
- if (!byDept && !byDistrict) {
- return Collections.emptyMap();
- }
-
- // 3. key = 绉戝/鐥呭尯 + 棰樼洰 + 閫夐」
- Map<String, QuestionCountKsOrBqDTO> map = new LinkedHashMap<>();
-
- for (QuestionCountKsOrBqDTO dto : sourceList) {
-
- if (StringUtils.isEmpty(dto.getTargetvalue())) {
- continue;
- }
-
- // 鍒嗙粍鍚嶏細绉戝 鎴� 鐥呭尯
- String groupName = byDept ? dto.getDeptname() : dto.getLeavehospitaldistrictname();
- if (StringUtils.isEmpty(groupName)) {
- continue;
- }
-
- String asrtext = trimAll(dto.getAsrtext()); // 鐢ㄦ埛瀹為檯閫変腑鐨勯�夐」
- String questionText = trimAll(dto.getQuestionText()); // 棰樼洰
- if (StringUtils.isEmpty(questionText)) {
- continue;
- }
-
- // 鎷嗗垎 targetvalue锛屾瘡涓�夐」閮借鏈変竴鏉¤褰�
- for (String raw : dto.getTargetvalue().split("&")) {
-
- String option = trimAll(raw);
- if (option.isEmpty()) {
- continue;
- }
-
- // key = 绉戝/鐥呭尯 + 棰樼洰 + 閫夐」
- String key = buildKey(groupName, questionText, option);
-
- QuestionCountKsOrBqDTO item = map.get(key);
- if (item == null) {
- item = DtoConversionUtils.sourceToTarget(dto, QuestionCountKsOrBqDTO.class);
- item.setTargetvalue(option);
- item.setAsrtext(option);
- item.setQuestionText(dto.getQuestionText());
- item.setAnswerCount("0");
- item.setSingleScore("0");
- map.put(key, item);
- }
-
- // 鍙湁褰撳墠閫夐」 == 鐢ㄦ埛瀹為檯閫変腑鐨勯�夐」锛屾墠绱姞
- if (option.equals(asrtext)) {
- int count = parseCount(item.getAnswerCount()) + 1;
- item.setAnswerCount(String.valueOf(count));
-
- BigDecimal totalScore = new BigDecimal(item.getSingleScore())
- .add(new BigDecimal(dto.getSingleScore() == null ? "0" : dto.getSingleScore()));
- item.setSingleScore(totalScore.toPlainString());
- }
- }
- }
-
- // 4. 璁＄畻骞冲潎鍒�
- for (QuestionCountKsOrBqDTO dto : map.values()) {
- String answerCount = dto.getAnswerCount();
- String singleScore = dto.getSingleScore();
-
- BigDecimal avg;
- if (StringUtils.isEmpty(answerCount)
- || BigDecimal.ZERO.compareTo(new BigDecimal(answerCount.trim())) == 0) {
- avg = BigDecimal.ZERO;
- } else {
- avg = new BigDecimal(singleScore == null ? "0" : singleScore)
- .divide(new BigDecimal(answerCount.trim()), 2, RoundingMode.HALF_UP);
- }
- dto.setAvgScore(avg.toPlainString());
- }
-
- // 5. 杞垚 Map<String, Map<String, List<QuestionCountKsOrBqDTO>>>
- // 绗竴灞� key锛氱瀹�/鐥呭尯
- // 绗簩灞� key锛氶鐩�
- // 绗簩灞� value锛氳棰樼洰涓嬬殑鎵�鏈夐�夐」鍒楄〃
- Map<String, Map<String, List<QuestionCountKsOrBqDTO>>> result = new LinkedHashMap<>();
-
- for (QuestionCountKsOrBqDTO dto : map.values()) {
-
- // 鍒嗙粍鍚�
- String groupName = byDept ? dto.getDeptname() : dto.getLeavehospitaldistrictname();
- if (StringUtils.isEmpty(groupName)) {
- continue;
- }
-
- // 棰樼洰鍚�
- String questionText = dto.getQuestionText();
- if (StringUtils.isEmpty(questionText)) {
- continue;
- }
-
- // 绗竴灞傦細绉戝/鐥呭尯
- Map<String, List<QuestionCountKsOrBqDTO>> questionMap =
- result.computeIfAbsent(groupName, k -> new LinkedHashMap<>());
-
- // 绗簩灞傦細棰樼洰
- List<QuestionCountKsOrBqDTO> optionList =
- questionMap.computeIfAbsent(questionText, k -> new ArrayList<>());
-
- optionList.add(dto);
- }
-
- return result;
- }
-
- @Override
- public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, Date startFinishTime, Date endFinishTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType) {
- //鍏堟竻鐞嗕竴涓嬮噸澶嶆暟鎹�
- List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
- if (!CollectionUtils.isEmpty(repeatIds)) {
- serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
- }
-
- List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOptionBySubtaskIds(subtaskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType);
- // 澶勭悊 targetvalue锛氭寜 & 鍒嗗壊鎴愬鏉¤褰�
- List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
- for (ServiceSubtaskDetailRatioExport export : serviceSubtaskDetailRatioExports) {
- if (StringUtils.isNotEmpty(export.getTargetvalue()) && export.getTargetvalue().contains("&")) {
- String[] values = export.getTargetvalue().split("&");
- // 濡傛灉鏈夊鏉＄洰鏍囧�硷紝鎷嗗垎鎴愬琛�
- for (String value : values) {
- //鍏堝幓 result 涓煡涓�涓嬶紝鏈夋病鏈夎繖涓� questiontext 鍜屽搴旂殑 targetvalue
- ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> {
- if (e == null || export == null) {
- return false;
- }
- String q1 = e.getQuestiontext() != null ? e.getQuestiontext() : "";
- String q2 = export.getQuestiontext() != null ? export.getQuestiontext() : "";
- String t1 = value.trim();
- String t2 = e.getTargetvalue() != null ? e.getTargetvalue() : "";
- return q1.equals(q2) && t1.equals(t2);
- }).findFirst().orElse(null);
- if (existingExport != null && "0".equals(existingExport.getRatio()) && "0".equals(existingExport.getCount())) {
- //濡傛灉瀛樺湪锛屽垯灏� result 閲岀殑杩欎釜闂鎵�瀵瑰簲鐨� Targetvalue=value 杩欐潯鏁版嵁鏇存柊鎴愬綋鍓嶈繖鏉℃暟鎹�
- if (value.equals(export.getOptionresult())) {
- existingExport.setRatio(export.getRatio());
- existingExport.setScore(export.getScore());
- existingExport.setCount(export.getCount());
- existingExport.setOptionresult(export.getOptionresult());
- }
- } else if (existingExport != null && !"0".equals(existingExport.getRatio())) {
- continue;
- } else {
- ServiceSubtaskDetailRatioExport newExport = DtoConversionUtils.sourceToTarget(export, ServiceSubtaskDetailRatioExport.class);
- newExport.setTargetvalue(value.trim()); // targetvalue 鏄剧ず鍗曚釜閫夐」
- if (!value.equals(export.getOptionresult())) {
- newExport.setOptionresult(null);
- newExport.setCount("0");
- newExport.setRatio("0");
- }
- result.add(newExport);
- }
- }
- } else {
- // targetvalue 涓嶅寘鍚� &锛岀洿鎺ユ坊鍔犲埌缁撴灉
- result.add(export);
- }
- }
-
- return result;
- }
-
- /**
- * 鏍囧噯鍖栭棶鍗风瓟妗堟枃鏈細鍘绘帀 A/B/C/D 鍗曞瓧姣嶅墠缂�鍜屽悗缁┖鏍�
- * 渚嬪 "A 鏄�" -> "鏄�"锛�"B 鍚�" -> "鍚�"
- */
- private String normalizeOptionAnswer(String answer) {
- if (StringUtils.isBlank(answer)) {
- return "";
- }
- String trimmed = answer.trim();
- if (trimmed.length() >= 3 && trimmed.charAt(1) == ' ') {
- char firstChar = trimmed.charAt(0);
- if (firstChar >= 'A' && firstChar <= 'Z') {
- return trimmed.substring(2).trim();
- }
- }
- return trimmed;
}
private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
@@ -5865,34 +5375,6 @@
return content;
}
- /**
- * 婊℃剰搴﹁秼鍔挎煡璇�
- *
- * @param mydTrendReqVO
- * @return
- */
- @Override
- public List<MydTrendReqDTO> mydTrend(MydTrendReqVO mydTrendReqVO) {
- List<MydTrendReqDTO> list = serviceSubtaskMapper.mydTrend(mydTrendReqVO.getStartFinishTime(), mydTrendReqVO.getEndFinishTime(), mydTrendReqVO.getType());
- if (mydTrendReqVO.getType().equals("week")) list = getWeekDate(mydTrendReqVO, list);
- if (mydTrendReqVO.getType().equals("year")) list = getYearDate(mydTrendReqVO, list);
- if (mydTrendReqVO.getType().equals("month")) list = getMonthDate(mydTrendReqVO, list);
- if (mydTrendReqVO.getType().equals("day")) list = getDayDate(mydTrendReqVO, list);
- return list;
- }
-
- @Override
- public List<MydTrendReqDTO> sltdMydTotalByDimension(MydTrendReqVO mydTrendReqVO) {
- List<MydTrendReqDTO> list = null;
- if (mydTrendReqVO.getDimensionType().equals("1"))
- list = serviceSubtaskMapper.sltdMydTotalByDimension(mydTrendReqVO.getStartFinishTime(), mydTrendReqVO.getEndFinishTime(), mydTrendReqVO.getType());
- else if (mydTrendReqVO.getDimensionType().equals("2"))
- list = serviceSubtaskMapper.sltdMydTotalByYQ(mydTrendReqVO.getStartFinishTime(), mydTrendReqVO.getEndFinishTime(), mydTrendReqVO.getType());
-
- return list;
- }
-
-
public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, ServiceTaskdept serviceTaskdept, PatArchive patArchive) {
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid());
@@ -5935,7 +5417,39 @@
Date newDate = new Date();
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
+ // 闄㈠尯锛�/scanGenerateSubtask 鏄尶鍚嶆帴鍙ｏ紙SecurityConfig permitAll锛夛紝鍙栦笉鍒扮櫥褰曠敤鎴凤紱
+ // 鑰� service_task.campusid 鍦ㄦ湰搴撴槸鍗犱綅鍊� '1'锛岀洿鎺ユ部鐢ㄤ細璁╃粺璁℃帴鍙ｏ紙@AddOrgId 鎸夐櫌鍖鸿繃婊わ級鏌ヤ笉鍒版暟鎹��
+ // 杩欓噷鐢ㄤ换鍔￠厤缃殑鐥呭尯锛堝叾娆＄瀹わ級鍙嶆煡 sys_dept.campusid 钀藉簱锛屼繚璇侀棶鍗风粺璁¤兘鎸夐櫌鍖哄彇鍒般��
+ String campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getLeavehospitaldistrictcode(), serviceTask.getOrgid());
+ if (StringUtils.isEmpty(campusIdByDept)) {
+ campusIdByDept = queryCampusIdByDeptCode(serviceSubtask.getDeptcode(), serviceTask.getOrgid());
+ }
+ if (StringUtils.isNotEmpty(campusIdByDept)) {
+ serviceSubtask.setCampusid(campusIdByDept);
+ }
+ // 鍙厤浜嗙瀹わ紙娌℃湁鐥呭尯锛夌殑婊℃剰搴︿换鍔★細杩欓亾绛斿嵎鍦ㄦ寜鐥呭尯绛涢�夌殑鎶ヨ〃閲岀粺璁′笉鍒帮紝鐣欐棩蹇椾究浜庤繍缁村彂鐜�
+ if (StringUtils.isEmpty(serviceSubtask.getLeavehospitaldistrictcode())
+ && ("6".equals(serviceSubtask.getServiceType()) || "14".equals(serviceSubtask.getServiceType()))) {
+ log.warn("銆愭壂鐮佺敓鎴愪换鍔°�戞弧鎰忓害瀛愪换鍔℃病鏈夌梾鍖猴紝鎸夌梾鍖虹瓫閫夌殑鎶ヨ〃灏嗙粺璁′笉鍒拌绛斿嵎锛歵askid={}, deptcode={}, campusid={}",
+ serviceSubtask.getTaskid(), serviceSubtask.getDeptcode(), serviceSubtask.getCampusid());
+ }
return serviceSubtask;
+ }
+
+ /**
+ * 鎸夌瀹�/鐥呭尯缂栫爜鍙嶆煡鎵�灞為櫌鍖猴紙鏌ヤ笉鍒拌繑鍥� null锛�
+ */
+ private String queryCampusIdByDeptCode(String deptCode, String orgid) {
+ if (StringUtils.isEmpty(deptCode)) {
+ return null;
+ }
+ try {
+ SysDept sysDept = sysDept2Mapper.selectDeptByCode(deptCode, orgid);
+ return sysDept == null ? null : sysDept.getCampusid();
+ } catch (Exception e) {
+ log.warn("鎸夌紪鐮佸弽鏌ラ櫌鍖哄け璐ワ細deptCode={}, orgid={}, err={}", deptCode, orgid, e.getMessage());
+ return null;
+ }
}
/**
@@ -5974,7 +5488,6 @@
}
}
-
public PhoneCallBackSHVO getFirstQues(PhoneCallReqYQVO phoneCallReqYQVO) {
//鐢ㄤ簬杩斿洖
PhoneCallBackSHVO phoneCallBackSHVO = new PhoneCallBackSHVO();
@@ -6012,7 +5525,6 @@
}
return phoneCallBackSHVO;
}
-
/**
* 涓夋眹ASR缁撴灉澶勭悊
@@ -6086,7 +5598,6 @@
Object cacheObject = redisCache.getCacheObject(phoneCallResultYQVO.getSubId() + "-" + phoneCallResultYQVO.getScriptId());
if (cacheObject == null || (Integer) cacheObject < ivrTaskTemplate.getMateNum()) {
-
// 鑾峰彇閫夐」闆嗗悎涓殑 optiondesc 鐢ㄤ簬寮曞鎮ｈ��
List<IvrTaskTemplateTargetoption> optionList = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList();
String optionDescStr = "";
@@ -6129,7 +5640,6 @@
}
return phoneCallBackSHVO;
}
-
public PhoneCallBackYQVO AiMatch(String url, PhoneCallReqYQVO phoneCallReqYQVO, PhoneCallBackYQVO phoneCallBackYQVO, IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, ServiceSubtask serviceSubtask, IvrTaskTemplate ivrTaskTemplate, List<IvrTaskTemplateScript> ivrTaskTemplateScripts, String scriptId, Integer flag, String uuid) {
PhoneCallBackYQVO back = null;
@@ -6432,45 +5942,6 @@
return back;
}
-
- /**
- * 闂缁撴灉鍗犳瘮
- *
- * @param sltdMydTotalVO
- * @param serviceSubtaskRes
- * @return
- */
- public List<ServiceSubtaskDetailRatioExport> getDetailRatio(SltdMydTotalVO sltdMydTotalVO, List<ServiceSubtaskRes> serviceSubtaskRes) {
- List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
- List<String> serviceTypeList = sltdMydTotalVO.getServiceTypeList();
- if (CollectionUtils.isEmpty(serviceTypeList)) {
- log.warn("getDetailRatio 鏈紶 serviceTypeList锛屾棤娉曠粺璁￠棶棰樺崰姣�");
- return serviceSubtaskDetailRatioExports;
- }
- // 鍒ゆ柇鍙ｅ緞锛�2=闅忚锛堟寜 taskid 缁熻锛夛紝6/14=婊℃剰搴︼紙鎸� subtask id 缁熻锛�
- boolean hasFollowUp = serviceTypeList.contains("2");
- boolean hasSatisfaction = serviceTypeList.contains("6") || serviceTypeList.contains("14");
- if (hasFollowUp && hasSatisfaction) {
- //serviceType锛屽嵆鏈夐殢璁垮張鏈夋弧鎰忓害锛屾殏鏃舵病娉曠粺璁�
- log.warn("getDetailRatio 鏆備笉鏀寔鍚屾椂缁熻闅忚(2)涓庢弧鎰忓害(6/14)锛宻erviceTypeList={}", serviceTypeList);
- return serviceSubtaskDetailRatioExports;
- }
- if (hasFollowUp) {
- //鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
- List<Long> taskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
- //鍚屾椂甯︿笂鏈瀵煎嚭鐨勫瓙浠诲姟 id锛氳銆岄棶棰樿鎯呭崰姣斻�嶅彧缁熻杩欐壒鎮ｈ�咃紝涓庛�屾偅鑰呴殢璁夸俊鎭〃鍗曘�嶅彛寰勪竴鑷�
- List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
- serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType(), subtaskIds);
- } else if (hasSatisfaction) {
- //婊℃剰搴︾粺璁� 锛堥�氳繃 subtask 鐨� id 鍘荤粺璁★級
- List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
- serviceSubtaskDetailRatioExports = statQuestionOptionBySubtaskIds(subtaskIds, sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
- } else {
- log.warn("getDetailRatio 鏆備笉鏀寔鐨� serviceTypeList={}锛堜粎鏀寔 2 鎴� 6/14锛�", serviceTypeList);
- }
- return serviceSubtaskDetailRatioExports;
- }
-
//鑾峰彇浠诲姟缁勪俊鎭�
private void findServiceTaskScheduleVO(ServiceTaskVO serviceTaskVO) {
if (StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")) {
@@ -6511,340 +5982,8 @@
log.info("ai鍖归厤鎴愬姛锛屽尮閰嶇粨鏋滄槸:" + matchedText);
}
- private static String trimAll(String s) {
- if (s == null) {
- return "";
- }
- int start = 0;
- int end = s.length();
- while (start < end && isBlankChar(s.charAt(start))) {
- start++;
- }
- while (end > start && isBlankChar(s.charAt(end - 1))) {
- end--;
- }
- return s.substring(start, end);
- }
-
- private static Boolean isBlankChar(char c) {
- return c == '\u3000' // 鍏ㄨ绌烘牸
- || c == ' ' // 鍗婅绌烘牸
- || c == '\t' || c == '\n' || c == '\r' || c == '\f' || Character.isWhitespace(c);
- }
-
-
- private String buildKey(String groupName, String questionText, String option) {
- return groupName + "\u0001" + questionText + "\u0001" + option;
- }
-
- private static int parseCount(String s) {
- if (StringUtils.isEmpty(s)) {
- return 0;
- }
- try {
- return Integer.parseInt(s.trim());
- } catch (NumberFormatException e) {
- return 0;
- }
- }
-
- private List<MydTrendReqDTO> getWeekDate(MydTrendReqVO mydTrendReqVO, List<MydTrendReqDTO> list) {
- // 1. 璁＄畻鎬诲懆鏁帮紙鍜� SQL 閲岀殑鍏紡淇濇寔涓�鑷达級
- long days = (mydTrendReqVO.getEndFinishTime().getTime() - mydTrendReqVO.getStartFinishTime().getTime()) / (1000L * 60 * 60 * 24);
- int totalWeeks = (int) (days / 7) + 1;
-
- // 2. 宸叉湁鏁版嵁锛歱eriod -> totalScore
- Map<Integer, String> exist = new HashMap<>();
- for (MydTrendReqDTO row : list) {
- // period 鏄暟瀛楋紝鍙兘鏄� Integer / Long / BigDecimal锛岀粺涓�杞� int
- int p = Integer.parseInt(StringUtils.isNotEmpty(row.getPeriod()) ? row.getPeriod() : "0");
- exist.put(p, row.getTotalScore() != null ? row.getTotalScore() : "0");
- // 涓嬮潰杩欒鎸変綘鐨勫師閫昏緫淇濈暀锛堣櫧鐒剁湅璧锋潵鏈夌偣澶氫綑锛�
- exist.put(p, String.valueOf(row.getTotalScore() != null ? row.getTotalScore() : 0));
- }
-
- // 3. 琛ュ叏 1..totalWeeks
- List<MydTrendReqDTO> result = new ArrayList<>(totalWeeks);
-
- // 鑾峰彇鏁翠綋鐨勫紑濮嬫椂闂�
- long startTimeMillis = mydTrendReqVO.getStartFinishTime().getTime();
- long endTimeMillis = mydTrendReqVO.getEndFinishTime().getTime();
- long oneWeekMillis = 7L * 24 * 60 * 60 * 1000; // 涓�鍛ㄧ殑姣鏁�
-
- for (int i = 1; i <= totalWeeks; i++) {
- MydTrendReqDTO row = new MydTrendReqDTO();
- row.setPeriod(String.valueOf(i));
- row.setTotalScore(exist.getOrDefault(i, "0"));
-
- // -------- 鏂板锛氳缃瘡鍛ㄧ殑 startDate 鍜� endDate --------
- // 褰撳墠鍛ㄥ紑濮嬫椂闂� = 鏁翠綋寮�濮嬫椂闂� + (i - 1) * 7澶�
- long currentStartMillis = startTimeMillis + (long) (i - 1) * oneWeekMillis;
-
- // 褰撳墠鍛ㄧ粨鏉熸椂闂� = 褰撳墠鍛ㄥ紑濮嬫椂闂� + 7澶� - 1姣锛堜繚璇佹槸杩欎竴鍛ㄧ殑鏈�鍚庝竴鍒伙級
- long currentEndMillis = currentStartMillis + oneWeekMillis - 1;
-
- // 濡傛灉鏄渶鍚庝竴鍛紝缁撴潫鏃堕棿涓嶈兘瓒呰繃鏁翠綋鐨� endTime
- if (i == totalWeeks) {
- currentEndMillis = endTimeMillis;
- }
-
- row.setStartDate(new Date(currentStartMillis));
- row.setEndDate(new Date(currentEndMillis));
- // ----------------------------------------------------
-
- result.add(row);
- }
-
- return result;
- }
-
- private List<MydTrendReqDTO> getYearDate(MydTrendReqVO mydTrendReqVO, List<MydTrendReqDTO> list) {
- // 鑾峰彇鏁翠綋寮�濮嬪拰缁撴潫鏃堕棿
- Date startTime = mydTrendReqVO.getStartFinishTime();
- Date endTime = mydTrendReqVO.getEndFinishTime();
-
- // 1. 璁＄畻骞翠唤鑼冨洿
- // 浣跨敤 Calendar 鑾峰彇璧峰骞翠唤鍜岀粨鏉熷勾浠�
- Calendar cal = Calendar.getInstance();
- cal.setTime(startTime);
- int startYear = cal.get(Calendar.YEAR);
-
- cal.setTime(endTime);
- int endYear = cal.get(Calendar.YEAR);
-
- // 鎬诲勾鏁� (鍖呭惈棣栧熬)
- int totalYears = endYear - startYear + 1;
-
- // 2. 宸叉湁鏁版嵁锛歱eriod -> totalScore (鍋囪 period 瀛樼殑鏄勾浠藉瓧绗︿覆锛屽 "2024")
- Map<String, String> exist = new HashMap<>();
- for (MydTrendReqDTO row : list) {
- String period = row.getPeriod() != null ? row.getPeriod() : "";
- exist.put(period, row.getTotalScore() != null ? row.getTotalScore() : "0");
- }
-
- // 3. 琛ュ叏鎵�鏈夊勾浠�
- List<MydTrendReqDTO> result = new ArrayList<>(totalYears);
-
- for (int i = 0; i < totalYears; i++) {
- int currentYear = startYear + i;
- String periodKey = String.valueOf(currentYear);
-
- MydTrendReqDTO row = new MydTrendReqDTO();
- row.setPeriod(periodKey);
- // 濡傛灉娌℃湁璇ュ勾浠界殑鏁版嵁锛岄粯璁ょ粰 "0"
- row.setTotalScore(exist.getOrDefault(periodKey, "0"));
-
- // -------- 璁剧疆璇ュ勾浠界殑 startDate 鍜� endDate --------
- Calendar yearCal = Calendar.getInstance();
- // 璁剧疆涓鸿骞寸殑 1鏈�1鏃� 00:00:00
- yearCal.set(currentYear, Calendar.JANUARY, 1, 0, 0, 0);
- yearCal.set(Calendar.MILLISECOND, 0);
- row.setStartDate(yearCal.getTime());
-
- // 璁剧疆涓鸿骞寸殑 12鏈�31鏃� 23:59:59
- yearCal.set(currentYear, Calendar.DECEMBER, 31, 23, 59, 59);
- yearCal.set(Calendar.MILLISECOND, 999);
- row.setEndDate(yearCal.getTime());
- // ----------------------------------------------------
-
- result.add(row);
- }
-
- return result;
- }
-
- private List<MydTrendReqDTO> getMonthDate(MydTrendReqVO mydTrendReqVO, List<MydTrendReqDTO> list) {
- // 鑾峰彇鏁翠綋寮�濮嬪拰缁撴潫鏃堕棿
- Date startTime = mydTrendReqVO.getStartFinishTime();
- Date endTime = mydTrendReqVO.getEndFinishTime();
-
- // 1. 璁＄畻鏈堜唤鑼冨洿
- Calendar cal = Calendar.getInstance();
- cal.setTime(startTime);
- int startYear = cal.get(Calendar.YEAR);
- int startMonth = cal.get(Calendar.MONTH); // 娉ㄦ剰锛欳alendar.MONTH 浠� 0 寮�濮�
-
- cal.setTime(endTime);
- int endYear = cal.get(Calendar.YEAR);
- int endMonth = cal.get(Calendar.MONTH);
-
- // 鎬绘湀鏁� = (缁撴潫骞� - 寮�濮嬪勾) * 12 + (缁撴潫鏈� - 寮�濮嬫湀) + 1
- int totalMonths = (endYear - startYear) * 12 + (endMonth - startMonth) + 1;
-
- // 2. 宸叉湁鏁版嵁锛歱eriod -> totalScore (period 瀛樼殑鏄湀浠藉瓧绗︿覆锛屽 "2024-06")
- Map<String, String> exist = new HashMap<>();
- for (MydTrendReqDTO row : list) {
- String period = row.getPeriod() != null ? row.getPeriod() : "";
- exist.put(period, row.getTotalScore() != null ? row.getTotalScore() : "0");
- }
-
- // 3. 琛ュ叏鎵�鏈夋湀浠�
- List<MydTrendReqDTO> result = new ArrayList<>(totalMonths);
-
- Calendar monthCal = Calendar.getInstance();
- monthCal.set(startYear, startMonth, 1, 0, 0, 0);
- monthCal.set(Calendar.MILLISECOND, 0);
-
- for (int i = 0; i < totalMonths; i++) {
- int currentYear = monthCal.get(Calendar.YEAR);
- int currentMonth = monthCal.get(Calendar.MONTH) + 1; // 杞垚 1-12 鏈�
-
- // 鎷兼帴 period锛屾牸寮忥細yyyy-MM锛屾瘮濡� "2024-06"
- // 濡傛灉浣犲笇鏈涙槸 "2024-6"锛屽彲浠ユ妸 String.format 鏀规垚 currentMonth
- String periodKey = String.format("%04d-%02d", currentYear, currentMonth);
-
- MydTrendReqDTO row = new MydTrendReqDTO();
- row.setPeriod(periodKey);
- row.setTotalScore(exist.getOrDefault(periodKey, "0"));
-
- // -------- 璁剧疆璇ユ湀鐨� startDate 鍜� endDate --------
- // 褰撴湀寮�濮嬫椂闂达細1鍙� 00:00:00.000
- Calendar startCal = (Calendar) monthCal.clone();
- row.setStartDate(startCal.getTime());
-
- // 褰撴湀缁撴潫鏃堕棿锛氫笅涓湀1鍙� 00:00:00.000 鍑� 1 姣
- Calendar endCal = (Calendar) monthCal.clone();
- endCal.add(Calendar.MONTH, 1);
- endCal.add(Calendar.MILLISECOND, -1);
- row.setEndDate(endCal.getTime());
- // ----------------------------------------------------
-
- result.add(row);
-
- // 杩涘叆涓嬩竴涓湀
- monthCal.add(Calendar.MONTH, 1);
- }
-
- return result;
- }
-
- private List<MydTrendReqDTO> getDayDate(MydTrendReqVO mydTrendReqVO, List<MydTrendReqDTO> list) {
- // 鑾峰彇鏁翠綋寮�濮嬪拰缁撴潫鏃堕棿
- Date startTime = mydTrendReqVO.getStartFinishTime();
- Date endTime = mydTrendReqVO.getEndFinishTime();
-
- // 1. 璁＄畻鎬诲ぉ鏁�
- long oneDayMillis = 24L * 60 * 60 * 1000;
- // 娉ㄦ剰锛氳繖閲屽彧绠楁棩鏈熷樊锛屼笉鑰冭檻鏃跺垎绉掞紝鍚﹀垯鍙兘宸竴澶�
- Calendar startCal = Calendar.getInstance();
- startCal.setTime(startTime);
- startCal.set(Calendar.HOUR_OF_DAY, 0);
- startCal.set(Calendar.MINUTE, 0);
- startCal.set(Calendar.SECOND, 0);
- startCal.set(Calendar.MILLISECOND, 0);
-
- Calendar endCal = Calendar.getInstance();
- endCal.setTime(endTime);
- endCal.set(Calendar.HOUR_OF_DAY, 0);
- endCal.set(Calendar.MINUTE, 0);
- endCal.set(Calendar.SECOND, 0);
- endCal.set(Calendar.MILLISECOND, 0);
-
- long days = (endCal.getTimeInMillis() - startCal.getTimeInMillis()) / oneDayMillis;
- int totalDays = (int) days + 1;
-
- // 2. 宸叉湁鏁版嵁锛歱eriod -> totalScore (period 瀛樼殑鏄棩鏈熷瓧绗︿覆锛屽 "2024-06-01")
- Map<String, String> exist = new HashMap<>();
- for (MydTrendReqDTO row : list) {
- String period = row.getPeriod() != null ? row.getPeriod() : "";
- exist.put(period, row.getTotalScore() != null ? row.getTotalScore() : "0");
- }
-
- // 3. 琛ュ叏鎵�鏈夋棩鏈�
- List<MydTrendReqDTO> result = new ArrayList<>(totalDays);
-
- Calendar dayCal = (Calendar) startCal.clone();
- for (int i = 0; i < totalDays; i++) {
- // 鎷兼帴 period锛屾牸寮忥細yyyy-MM-dd
- String periodKey = String.format("%04d-%02d-%02d", dayCal.get(Calendar.YEAR), dayCal.get(Calendar.MONTH) + 1, dayCal.get(Calendar.DAY_OF_MONTH));
-
- MydTrendReqDTO row = new MydTrendReqDTO();
- row.setPeriod(periodKey);
- row.setTotalScore(exist.getOrDefault(periodKey, "0"));
-
- // -------- 璁剧疆璇ュぉ鐨� startDate 鍜� endDate --------
- Calendar startOfDay = (Calendar) dayCal.clone();
- row.setStartDate(startOfDay.getTime());
-
- Calendar endOfDay = (Calendar) dayCal.clone();
- endOfDay.set(Calendar.HOUR_OF_DAY, 23);
- endOfDay.set(Calendar.MINUTE, 59);
- endOfDay.set(Calendar.SECOND, 59);
- endOfDay.set(Calendar.MILLISECOND, 999);
- row.setEndDate(endOfDay.getTime());
- // ----------------------------------------------------
-
- result.add(row);
-
- // 杩涘叆涓嬩竴澶�
- dayCal.add(Calendar.DAY_OF_MONTH, 1);
- }
-
- return result;
- }
-
- /**
- * 闂ㄨ瘖婊℃剰搴︾患鍚堝緱鍒嗘帓鍚嶏紙鎸夌瀹ゆ垨鐥呭尯锛�
- * <p>
- * 缁煎悎婊℃剰搴� = 危(璇勫垎鏄庣粏鏉冮噸) / 璇勫垎鏄庣粏鏉℃暟 脳 100%锛�
- * 鏉冮噸鍙彇 1銆�0.8銆�0.6銆�0.4銆�0.2 浜旀。锛堝緢婊℃剰銆佹弧鎰忋�佷竴鑸�佷笉婊℃剰銆佸緢涓嶆弧鎰忥級銆�
- *
- * @param mzMydScoreRankVO 鏌ヨ鏉′欢
- * @return 鎺掑悕缁撴灉锛屽悕娆′粠 1 寮�濮嬮『搴忕紪鍙�
- */
- @Override
- public List<MzMydScoreRankDTO> mzMydScoreRank(MzMydScoreRankVO mzMydScoreRankVO) {
- if (StringUtils.isEmpty(mzMydScoreRankVO.getDimensionType())) {
- mzMydScoreRankVO.setDimensionType("1");
- }
- if (CollectionUtils.isEmpty(mzMydScoreRankVO.getServiceTypes())) {
- List<String> list=new ArrayList<>(Arrays.asList("14"));
- mzMydScoreRankVO.setServiceTypes(list);
- }
- List<MzMydScoreRankDTO> list = serviceSubtaskMapper.selectMzMydScoreRank(mzMydScoreRankVO);
- if (CollectionUtils.isEmpty(list)) {
- return new ArrayList<>();
- }
- // 鍚嶆锛歋QL 宸叉寜缁煎悎寰楀垎闄嶅簭杩斿洖锛岃繖閲岄『搴忕紪鍙�
- for (int i = 0; i < list.size(); i++) {
- list.get(i).setRank(i + 1);
- }
- return list;
- }
-
- private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
- XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
- xinHuaWXReq.setIdcard(idcard);
- xinHuaWXReq.setUrl(url);
- xinHuaWXReq.setPatientid(setPatientid);
- xinHuaWXReq.setPatientname(setPatientname);
- xinHuaWXReq.setMobile(phone);
- xinHuaWXReq.setMedcardno(null);
- xinHuaWXReq.setTitlename(taskName);
- xinHuaWXReq.setContent(taskDesc);
- xinHuaWXReq.setAppid(wxqqxx.get(1));
- log.info("銆恎etWXCode銆戝井淇″叕浼楀彿璇锋眰鍙傛暟锛歿}", xinHuaWXReq);
- String body = new Gson().toJson(xinHuaWXReq);
- String encode = encode(wxqqxx.get(2).concat(body));
- Map<String, String> headerMap = new HashMap<>();
- headerMap.put("sign", encode);
- String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
- log.info("銆恎etWXCode銆戝井淇″叕浼楀彿杩斿洖鍙傛暟锛歿}", result);
- JSONObject jsonObject = JSONObject.parseObject(result);
- String code = (String) jsonObject.toString();
- return code;
- }
- public String encode(String arg) {
- if (arg == null) {
- arg = "";
- }
- MessageDigest md5 = null;
- try {
- md5 = MessageDigest.getInstance("MD5");
- md5.update(arg.getBytes("UTF-8"));
- } catch (Exception e) {
- e.printStackTrace();
- }
- return toHex(md5.digest());
- }
+ // ---------------------------------------------------------------------
+ // 璇存槑锛氬師绉佹湁 getWXCode / encode 宸查殢鍙戦�佹柟涓�璧锋敹鍙ｅ埌 ruoyi-message 妯″潡
+ // 锛圶inHuaMpApi锛夛紝姝ゅ宸插垹闄わ紝閬垮厤涓変唤鎷疯礉鍚勫啓涓�濂楃鍚嶉�昏緫銆�
+ // ---------------------------------------------------------------------
}
--
Gitblit v1.9.3