ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -741,6 +741,7 @@ if (allSendStateNot1AndNot9) { //说明全发送失败了 serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("-----getSendPreachform,发送方式全部失败"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); } return "-1"; @@ -846,6 +847,7 @@ if (failSendstate.equals("4") || failSendstate.equals("5")) { serviceSubtask.setCurrentPreachform(preachform); serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("setFailPreachForm方法 当前的preachform已经是最后一个了，全部执行失败"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); return true; } ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -445,6 +445,7 @@ public AjaxResult saveQuestionAnswerPhone(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) { // SysUser user = getLoginUser().getUser(); // serviceSubTaskDetailReq.setOrgid(user.getOrgid()); log.info("患者问题结果记录(电话):{}", serviceSubTaskDetailReq); return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq)); } @@ -454,6 +455,7 @@ @ApiOperation("通话记录回调(上海)") @PostMapping("/recordAcceptshanghai") public AjaxResult recordAccepshanghait(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) { log.info("通话记录回调(上海):{}", serviceSubTaskDetailReq); return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq)); } @@ -594,7 +596,6 @@ if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes().size() == 0 && serviceSubtaskCountReq.getDeptcodes().size() == 0) { return error("科室或病区不能为空"); } PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize()); //复诊统计 String configKey = serviceSubtaskCountReq.getConfigKey(); if (StringUtils.isNotEmpty(configKey)) { @@ -614,6 +615,7 @@ LoginUser loginUser = getLoginUser(); String orgid = loginUser.getUser().getOrgid(); serviceSubtaskCountReq.setOrgid(orgid); PageUtils.startPageByPost(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize()); return success(serviceSubtaskService.getSfStatisticsScriptDetails(serviceSubtaskCountReq)); }
@@ -45,7 +45,7 @@ } /** * 杭州市一医院吴山院区我短信接口 * 杭州市一医院吴山院区微信接口 * * @param url 微信URL * @param phone 手机号 13500000001 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -494,6 +494,7 @@ Long cs = currentSort.get(); if (cs.equals(serviceSubtaskPreachforms.size())) { serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿，全部执行失败"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); //修改发送方式的状态为失败 serviceSubtaskPreachform.setSendstate("5"); @@ -810,7 +811,7 @@ wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx); } Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class); Map map = JSONObject.parseObject(wxCode, Map.class); //任务发送记录 ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord(); serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString()); @@ -819,12 +820,22 @@ serviceSubtaskRecord.setPreachform("4"); serviceSubtaskRecord.setStartTime(System.currentTimeMillis()); serviceSubtaskRecord.setResult("success"); if (!map.isEmpty() && (Boolean) map.get("succ") == false) serviceSubtaskRecord.setResult("error"); Boolean wxCodeSuccess = false; if(active.equals("hzszlyy")){ if(!map.isEmpty() && map.get("success") != null){ wxCodeSuccess = (boolean) map.get("success"); } }else { if(!map.isEmpty() && map.get("succ") != null){ wxCodeSuccess = (boolean) map.get("succ"); } } if (!map.isEmpty() && !wxCodeSuccess) serviceSubtaskRecord.setResult("error"); serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord); //发送完成后，修改状态 serviceSubtask.setSendstate(3L); if ((Boolean) map.get("succ") == true) { if (wxCodeSuccess) { serviceSubtask.setResult("success"); setSuccessPreachForm(serviceSubtask, sendPreachform, "【公众号】公众号发送成功", "2"); } else { @@ -905,6 +916,7 @@ if (allSendStateNot1AndNot9) { //说明全发送失败了 serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("getSendPreachform方法 检查是否所有sendstate不等于9, 全失败了"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); //修改发送状态 setFail(serviceSubtaskPreachforms, serviceSubtask); @@ -1120,6 +1132,7 @@ if (failSendstate.equals("4") || failSendstate.equals("5")) { serviceSubtask.setCurrentPreachform(preachform); serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("setSuccessPreachForm方法，当前的preachform已经是最后一个了，全部执行失败"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); return true; } 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)); @@ -3367,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()); @@ -3393,6 +3396,7 @@ if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) { serviceSubtask.setCurrentPreachform(preachform); serviceSubtask.setSendstate(5L); serviceSubtask.setRemark("setFailPreachForm方法 当前的preachform已经是最后一个了，全失败了"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); return true; }
