ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -390,15 +390,14 @@ serviceOutPath.setDeptName(serviceSubtask.getDeptname()); serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String url = ""; String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); //需要通过模板ID去判断要发的内容是宣教还是通知 HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/xj?p=" + format : ip + "/xj?p=" + format); url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/xj?p=" + format : ip + "/xj?p=" + format; sendMagParam.setUrl(url); SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("xj.sms.template"); @@ -421,6 +420,10 @@ sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setContent(sc); } serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); } //短信还需要模板 @@ -598,8 +601,9 @@ String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); url = ip + ":" + req_path + "/sf?p=" + format; serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); } else if (type == 2) { //问券 ServiceOutPath serviceOutPath = new ServiceOutPath(); @@ -615,13 +619,16 @@ serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format; //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf） if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format); serviceOutPath.setRadix(format); serviceOutPath.setUrl(url); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); } else if (type == 3) { //宣教 ServiceOutPath serviceOutPath = new ServiceOutPath(); @@ -637,9 +644,6 @@ serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); //需要通过模板ID去判断要发的内容是宣教还是通知 // HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); @@ -659,6 +663,10 @@ // } url = ip + ":" + req_path + "/xj?p=" + format; serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); } if (StringUtils.isEmpty(patArchive.getPatidHis())) { serviceSubtask.setCurrentPreachform(sendPreachform); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1069,18 +1069,17 @@ serviceOutPath.setCreateTime(new Date()); serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String url = ""; String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); //先判断一下发的是不是宣教 if (!"3".equals(serviceSubtask.getType())) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format); url = StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format; sendMagParam.setUrl(url); //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf） if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/sf?p=" + format : localIP + "/sf?p=" + format); url = StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/sf?p=" + format : localIP + "/sf?p=" + format; sendMagParam.setUrl(url); // SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("wj.sms.template"); SysConfig sysConfig = new SysConfig(); @@ -1100,7 +1099,9 @@ HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/xj?p=" + format : localIP + "/xj?p=" + format); url = StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/xj?p=" + format : localIP + "/xj?p=" + format; sendMagParam.setUrl(url); SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("xj.sms.template"); if (!Objects.isNull(sysConfig)) { @@ -1118,6 +1119,11 @@ } } serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); String isSuccess = null; log.info("active的值为：{}", active); if (active.equals("xh")) { @@ -1291,6 +1297,7 @@ String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); //获取微信公众号请求信息根据机构ID smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -4082,12 +4082,15 @@ iServiceOutPathService.insertServiceOutPath(serviceOutPath); //转成16进制 String format = String.format("%03X", serviceOutPath.getId()); String url = ""; SendMagParam sendMagParam = new SendMagParam(); url = localIP + ":" + req_path + "/sf?p=" + format; sendMagParam.setUrl(url); sendMagParam.setContent("【新华医院】您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); SendMagParam sendMagParam = new SendMagParam(); sendMagParam.setUrl(localIP + ":" + req_path + "/sf?p=" + format); sendMagParam.setContent("【新华医院】您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); Map<String, String> map = new HashMap<>(); map.put("phone", serviceSubtask.getPhone()); map.put("content", sendMagParam.getContent()); @@ -4973,15 +4976,17 @@ serviceOutPath.setOrgid(serviceSubtask.getOrgid()); iServiceOutPathService.insertServiceOutPath(serviceOutPath); String format = String.format("%03X", serviceOutPath.getId()); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); String url = ""; SendMagParam sendMagParam = new SendMagParam(); sendMagParam.setType("4"); sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format); url = StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format; sendMagParam.setUrl(url); serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); serviceOutPath.setUrl(url); iServiceOutPathService.updateServiceOutPath(serviceOutPath); SysConfig sysConfig = new SysConfig(); sysConfig = sysConfigMapper.checkConfigKeyUnique("wj.sms.template");
