ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -335,11 +335,11 @@ iServiceOutPathService.updateServiceOutPath(serviceOutPath); // sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"); sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format); log.info("sendMagParam的值为：{}", sendMagParam); //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf） if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/sf?p=" + format : ip + "/sf?p=" + format); if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) { sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！"); } else if (active.equals("xh")) { @@ -366,7 +366,7 @@ HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/xj?p=" + format : ip + "/xj?p=" + format); if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) { sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！"); } else if (active.equals("xh")) { @@ -549,7 +549,7 @@ serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); url = ip + ":" + req_path + "/wt?p=" + format; 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); ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -175,7 +175,7 @@ if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) { redisFlag = true; map = redisMap; redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES); redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES); } } if (!redisFlag) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,5 +1,6 @@ package com.ruoyi.web.controller.system; import com.ruoyi.common.annotation.IpWhitelist; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -97,12 +98,12 @@ */ // @IpWhitelist @GetMapping("/SSOLogin") public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String campusid, public RedirectView SSOLogin(@RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, String orgid, String userName, String token) { if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) { if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) { throw new BaseException("参数不能为空"); }
@@ -155,7 +155,7 @@ */ //@PreAuthorize("@ss.hasPermi('system:role:edit')") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PostMapping("/changeStatus") @PostMapping("/changeStatus/edit") public AjaxResult changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,7 @@ # password: Hxerp2000 # driverClassName: com.mysql.cj.jdbc.Driver # 公司本地 url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=120000&socketTimeout=240000 url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_xinhua?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=120000&socketTimeout=240000 username: smartor password: Smartor.2023 driverClassName: com.mysql.cj.jdbc.Driver ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@ # 国际化资源文件路径 basename: i18n/messages profiles: active: nhfy active: durid # 文件上传 servlet: ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -130,7 +130,7 @@ */ public String ssoLogin(String userName, String orgid, String deptId, String campusid, String token) { // sltd 环境：通过 SSO token 获取员工账号 if ("sltd".equals(active)) { if ("sltd".equals(active) || "nhfy".equals(active)) { userName = resolveUserNameBySltdToken(token); if (userName == null) { return null; ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -542,12 +542,12 @@ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); serviceSubtaskVO.setTaskid(commonTaskcallMQ.getTaskid()); serviceSubtaskVO.setSendstate(2L); serviceSubtaskVO.setIsVisitAgain(1); serviceSubtaskVO.setVisitTime(new Date()); List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.queryServiceSubtaskList(serviceSubtaskVO); for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) { sfHandlle(serviceSubtask); } } } @@ -605,11 +605,8 @@ //3.不是最后一个，获取到下一个执行方式(因为都是在今天执行，那就直接发出去就完了) sfHandlle(serviceSubtask); } } } @@ -655,7 +652,7 @@ if (!Objects.isNull(patArchive) && patArchive.getNotrequiredFlag() == "1") { //不需要发送 serviceSubtask.setResult("患者不需要随访"); serviceSubtask.setRemark(patArchive.getNotrequiredreason()); serviceSubtask.setRemark("患者不需要随访," + patArchive.getNotrequiredreason()); serviceSubtask.setSendstate(4L); iServiceSubtaskService.insertServiceSubtask(serviceSubtask); setSuccessPreachForm(serviceSubtask, "-1", "不需要执行", "6"); @@ -751,10 +748,11 @@ //先判断一下发的是不是宣教 if (!"3".equals(serviceSubtask.getType())) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(localIP + ":" + req_path + "/wt?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/wt?p=" + format : localIP + "/wt?p=" + format); //如果type是语音随访的话（说明补偿发送方式中有电话随访的方式，这里的外链就地址只能用/sf） if (serviceSubtask.getType().equals("1")) sendMagParam.setUrl(localIP + ":" + req_path + "/sf?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/sf?p=" + format : localIP + "/sf?p=" + format); sendMagParam.setContent("您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); if (active.equals("xh")) { sendMagParam.setContent("【新华医院】您好，邀请您填写出院调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！"); @@ -763,7 +761,7 @@ HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid()); if (heLibrary.getHetype().equals("1")) { sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(localIP + ":" + req_path + "/xj?p=" + format); sendMagParam.setUrl(StringUtils.isNotEmpty(req_path) ? localIP + ":" + req_path + "/xj?p=" + format : localIP + "/xj?p=" + format); if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) { sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！"); } else if (active.equals("xh")) { smartor/src/main/java/com/smartor/common/MtSubmitSmUtil.java
@@ -59,6 +59,7 @@ */ public Map<String, Object> submitSm(String destAddr, String content) { try { log.info("南华附一发送短信，destAddr：{}，content：{}", destAddr, content); String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String hashHex = buildHashHex(accountName, password, date);
@@ -33,7 +33,7 @@ @ApiModelProperty(value = "门诊编号") private String outhospno; @ApiModelProperty(value = "长期任务随访标识：0不需要，1需要") @ApiModelProperty(value = "长期任务随访标识：0需要，1不需要") private String fuflag; /** smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
@@ -22,6 +22,9 @@ @ApiModelProperty(value = "患者ID") private String param2; @ApiModelProperty(value = "subID") private String param6; @ApiModelProperty(value = "异常标识") private String excep;
@@ -25,6 +25,9 @@ @ApiModelProperty(value = "任务ID") private String taskId; @ApiModelProperty(value = "subId") private Long subId; @ApiModelProperty(value = "住院 1 门诊2 投诉3") private String mzzy; } smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -1110,18 +1110,15 @@ //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前，则将循环的子任务停掉 // log.error("患者再入院的serviceSubtask1为:{}", serviceSubtask1); serviceSubtask1.setSendstate(4L); serviceSubtask1.setIsVisitAgain(2); serviceSubtask1.setRemark("患者再入院"); serviceSubtask1.setResult("error"); // serviceSubtask1.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); } } } } //将患入的入院数据设置为已处理 //更新状态值 patMedInhosp1.setDeptcheckFlag("0"); //patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); } catch (Exception e) { log.error("入院数据信息出异常了：{},{}", patMedInhosp1, e.getMessage()); } smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -334,6 +334,7 @@ public Integer dealOutpatientInfo() { PatMedOuthosp patMedOuthosp = new PatMedOuthosp(); patMedOuthosp.setDiagcheckFlag("0"); patMedOuthosp.setFuflag("1"); List<PatMedOuthosp> patMedOuthosps = selectPatMedOuthospList(patMedOuthosp); for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) { PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid()); smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -154,7 +154,7 @@ sysUser.setCampusid("1"); //根据userName判断一下，是不是之前有新增 SysUser sysUser1 = null; if(StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())){ if (StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())) { return false; } List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser); @@ -553,9 +553,9 @@ if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0); List<HashMap<String, Object>> bingRenKZXXList = ObjectUtils.isNotEmpty(yeWuXX) ? (List<HashMap<String, Object>>) yeWuXX.get("BingRenKZXXList") : null; if (CollectionUtils.isNotEmpty(bingRenKZXXList)) { for(HashMap<String, Object> bingRenKZXX : bingRenKZXXList){ for (HashMap<String, Object> bingRenKZXX : bingRenKZXXList) { String XiangMuDM = ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuDM")) ? bingRenKZXX.get("XiangMuDM").toString() : null; if(StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")){ if (StringUtils.isNotEmpty(XiangMuDM) && XiangMuDM.equals("DuanHaoXX")) { externalInHospPatientInfo.setDuanHaoXX(ObjectUtils.isNotEmpty(bingRenKZXX.get("XiangMuZMC")) ? bingRenKZXX.get("XiangMuZMC").toString() : null); break; } @@ -610,7 +610,7 @@ patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID()); if (ObjectUtils.isNotEmpty(SuiFangJH)) { patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null); patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1"); if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -644,9 +644,10 @@ patMedInhosp1.setInhospstate("1"); if (deathFlag) { //病人死亡无须随访 patMedInhosp1.setFuflag("1"); patMedInhosp1.setFuflag("0"); //更新病人 notrequiredFlag patArchive.setNotrequiredFlag("1"); patArchive.setNotrequiredreason("患者已离世"); patArchiveMapper.updatePatArchive(patArchive); //对已经生成的随访任务进行处理 ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); @@ -654,8 +655,8 @@ serviceSubtaskVO.setSendstate(2L); List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); for (ServiceSubtask serviceSubtask : serviceSubtaskList) { serviceSubtask.setSendstate(6L); serviceSubtask.setRemark(serviceSubtask.getRemark() + ";病人已死亡，不随访"); serviceSubtask.setSendstate(4L); serviceSubtask.setRemark(serviceSubtask.getRemark() + ";患者已离世，不随访"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); } } @@ -666,7 +667,7 @@ patMedInhosp1.setCampusid("1"); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) { //不需要长期任务随访 patMedInhosp1.setFuflag("1"); patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; @@ -689,7 +690,7 @@ patMedInhosp1.setCreateTime(new Date()); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) { //不需要长期任务随访 patMedInhosp1.setFuflag("1"); patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); @@ -768,7 +769,7 @@ patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID()); if (ObjectUtils.isNotEmpty(SuiFangJH)) { patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null); patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1"); if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -811,7 +812,7 @@ patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) { //不需要长期任务随访 patMedInhosp1.setFuflag("1"); patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp1); if (i != 1) return false; @@ -834,7 +835,7 @@ patMedInhosp1.setCreateTime(new Date()); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) { //不需要长期任务随访 patMedInhosp1.setFuflag("1"); patMedInhosp1.setFuflag("0"); } int i = patMedInhospMapper.insertPatMedInhosp(patMedInhosp1); if (i != 1) return false; @@ -984,7 +985,7 @@ patMedInhosp1.setDeptcode(externalInHospPatientInfo.getDangQianKSID()); if (ObjectUtils.isNotEmpty(SuiFangJH)) { patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : null); patMedInhosp1.setFuflag(ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangBS")) ? SuiFangJH.get("SuiFangBS").toString() : "1"); if (ObjectUtils.isNotEmpty(SuiFangJH.get("SuiFangRQ"))) { try { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -1174,7 +1175,7 @@ patMedOuthosp.setDrcode(externalDiagnosisInfo.getZhenDuanYSID()); patMedOuthosp.setDrname(externalDiagnosisInfo.getZhenDuanYSXM()); patMedOuthosp.setIcd10code(externalDiagnosisInfo.getIcd10()); patMedOuthosp.setFuflag("0"); patMedOuthosp.setFuflag("1"); } } for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) { @@ -1191,7 +1192,7 @@ patMedOuthosp.setUpdateTime(new Date()); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) { //不需要长期任务随访，由医生自己去随访（丽水中医院首次提出） patMedOuthosp.setFuflag("1"); patMedOuthosp.setFuflag("0"); } i = patMedOuthospService.updatePatMedOuthosp(patMedOuthosp); } else { @@ -1199,7 +1200,7 @@ patMedOuthosp.setUpdateTime(new Date()); if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedOuthosp.getOrgid())) { //不需要长期任务随访 patMedOuthosp.setFuflag("1"); patMedOuthosp.setFuflag("0"); } i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
@@ -297,6 +297,7 @@ SysUserDept sud = new SysUserDept(); sud.setUserId(sysUser.getUserId()); sud.setDeptId(sysDept.getDeptId()); sud.setOrgid(sysDept.getOrgid()); List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sud); if (CollectionUtils.isNotEmpty(sysUserDepts)) { sysUserDept.setId(sysUserDepts.get(0).getId()); @@ -552,6 +553,9 @@ patMedOuthosp.setCreateTime(new Date()); patMedOuthosp.setOrgid(dto.getOrgId()); patMedOuthosp.setCampusid(dto.getCampusId()); patMedOuthosp.setFuflag("1"); if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) patMedOuthosp.setFuflag("0"); return patMedOuthosp; } @@ -705,6 +709,8 @@ patMedInhosp.setNurseName(dto.getChiefNurseName()); patMedInhosp.setSerialnum(dto.getHealthcareRecordNo()); patMedInhosp.setFuflag("1"); if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) patMedInhosp.setFuflag("0"); if ("0".equals(cry)) patMedInhosp.setInhospstate("0"); if ("1".equals(cry)) patMedInhosp.setInhospstate("1"); if ("3".equals(cry)) patMedInhosp.setInhospstate("3"); @@ -774,6 +780,8 @@ log.debug("【processPatientArchive】新增患者档案，患者编号：{}", patArchive.getPatientno()); } else { patArchive.setId(existingArchives.get(0).getId()); patArchive.setNotrequiredFlag(existingArchives.get(0).getNotrequiredFlag()); patArchive.setNotrequiredreason(existingArchives.get(0).getNotrequiredreason()); patArchiveService.updateArchive(patArchive); log.debug("【processPatientArchive】更新患者档案，患者编号：{}", patArchive.getPatientno()); } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -164,6 +164,7 @@ public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) { Long tid = null; Long pid = null; Long subid = null; Double score = null; Long isabno = 0L; Set<String> allKeys = redisCache.getAllKeys(); @@ -174,16 +175,18 @@ if (flag == 0) { tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key)); pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key)); subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key)); } else if (flag == 1) { tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1()); pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2()); subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6()); } if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 2) { allKeys = new HashSet<>(); allKeys.add(pid + "-" + tid + "-WJscriptCache"); allKeys.add(pid + "-" + tid + "-" + subid + "-WJscriptCache"); } else if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 1) { allKeys = new HashSet<>(); allKeys.add(pid + "-" + tid + "-SFscriptCache"); allKeys.add(pid + "-" + tid + "-" + subid + "-SFscriptCache"); } } @@ -193,7 +196,7 @@ String[] split = key.split("-"); //先判断，是不是当前提交人的，不是当前提交人的，跳过 try { if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid)) { if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Long.valueOf(split[2]).equals(subid)) { continue; } } catch (Exception e) { @@ -212,7 +215,7 @@ //说明是第一题 List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions(); svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, null); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid); if (map == null) continue aa; if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); @@ -234,7 +237,7 @@ if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) { // log.error("svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), null); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2])); log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); @@ -260,7 +263,7 @@ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList(); // List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(ivrLibaTemplateTargetoptions, IvrTaskTemplateTargetoption.class); ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions); Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, null); Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); if (score == null) { @@ -277,7 +280,7 @@ ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions); if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) { Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), null); Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Long.valueOf(split[2])); log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo")); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); @@ -515,7 +518,7 @@ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(0).getSvyTaskTemplateTargetoptions(); // List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyTaskTemplateTargetoptions, SvyTaskTemplateTargetoption.class); svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, null); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId()); if (map == null) continue; if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); @@ -539,7 +542,7 @@ if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) { log.error("svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, null); Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId()); log.error("map的信息为：{}", map); if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo")); @@ -648,28 +651,31 @@ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); Long tid = null; Long pid = null; Long subid = null; if (flag == 0L) { tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key)); pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key)); subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam6(), pri_key)); } else if (flag == 1L) { tid = Long.valueOf(serviceSubTaskCacheReq.getParam1()); pid = Long.valueOf(serviceSubTaskCacheReq.getParam2()); subid = Long.valueOf(serviceSubTaskCacheReq.getParam6()); } if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS()) && serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS().size() > 0) { //问卷 redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS()); redisCache.deleteObject(pid + "-" + tid + "-" + subid + "-WJscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-" + subid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS()); //设置过期时间 3天 Long tims = Long.valueOf(3 * 24 * 3600); boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims); boolean expire = redisCache.expire(pid + "-" + tid + "-" + subid + "-WJscriptCache", tims); return 1; } else if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList()) && serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList().size() > 0) { //问卷 redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList()); redisCache.deleteObject(pid + "-" + tid + "-" + subid + "-SFscriptCache"); redisCache.setCacheListRight(pid + "-" + tid + "-" + subid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList()); //设置过期时间 3天 Long tims = Long.valueOf(3 * 24 * 3600); redisCache.expire(pid + "-" + tid + "-SFscriptCache", tims); redisCache.expire(pid + "-" + tid + "-" + subid + "-SFscriptCache", tims); return 1; } } catch (Exception e) { @@ -809,6 +815,7 @@ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); serviceSubtaskVO.setTaskid(taskid); serviceSubtaskVO.setPatid(patid); serviceSubtaskVO.setSubId(subid); List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); String score = "0"; //下题跳转 @@ -1081,6 +1088,7 @@ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); serviceSubtaskVO.setTaskid(taskid); serviceSubtaskVO.setPatid(patid); serviceSubtaskVO.setPatid(subid); List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); String score = "0"; smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -456,18 +456,18 @@ if (patMedInhospList.size() > 0) { serviceSubtask1.setIsVisitAgain(2); serviceSubtask1.setRemark(serviceSubtask1.getRemark() + ";患者再入院了"); serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";患者再入院了" : "患者再入院了"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); return "无需再次随访，患者再入院了"; } else if (serviceSubtask1.getSendstate() == 4L) { serviceSubtask1.setIsVisitAgain(2); serviceSubtask1.setRemark(serviceSubtask1.getRemark() + ";无需再次随访，任务被标记不在执行"); serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";无需再次随访，任务被标记不在执行" : "无需再次随访，任务被标记不在执行"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); return "无需再次随访，任务被标记不在执行"; } else if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) { serviceSubtask1.setIsVisitAgain(2); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); serviceSubtask1.setRemark(serviceSubtask1.getRemark() + ";无需再次随访，患者被标记不需要被服务"); serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";无需再次随访，患者被标记不需要被服务" : "无需再次随访，患者被标记不需要被服务"); return "无需再次随访，患者被标记不需要被服务"; } else if (ObjectUtils.isNotEmpty(serviceSubtask1.getIsVisitAgain()) && serviceSubtask1.getIsVisitAgain() == 2) { return "无需再次随访，该任务已经再次随访过了"; @@ -2303,7 +2303,7 @@ String deptcodes = CollectionUtils.isEmpty(request.getDeptcodes()) ? null : String.join(",", request.getDeptcodes()); if (!request.getTimeType().equals("month")) { req.setBeginAdmitdate(DateUtils.parseDate(serviceStatisticsResponse.getTimePeriod())); req.setEndAdmitdate( DateUtils.addDays(DateUtils.parseDate(serviceStatisticsResponse.getTimePeriod()),1)); req.setEndAdmitdate(DateUtils.addDays(DateUtils.parseDate(serviceStatisticsResponse.getTimePeriod()), 1)); } else { // year 类型：timePeriod 格式为 "yyyy-MM"，取当月第一天和最后一天 java.time.YearMonth ym = java.time.YearMonth.parse(serviceStatisticsResponse.getTimePeriod()); @@ -4046,23 +4046,19 @@ List<Map<String, Object>> detail = new ArrayList<>(); for (Map<String, Object> row : districtRows) { String groupName = row.get("groupName") == null ? (row.get("groupCode") == null ? "" : row.get("groupCode").toString()) : row.get("groupName").toString(); String groupName = row.get("groupName") == null ? (row.get("groupCode") == null ? "" : row.get("groupCode").toString()) : row.get("groupName").toString(); long noCnt = row.get("noContinueCnt") == null ? 0L : Long.parseLong(row.get("noContinueCnt").toString()); long yesCnt = row.get("continueCnt") == null ? 0L : Long.parseLong(row.get("continueCnt").toString()); totalNoContinue += noCnt; totalContinue += yesCnt; Map<String, Object> item = new LinkedHashMap<>(); item.put("未延续_" + groupName, noCnt); item.put("已延续_"+groupName, yesCnt); item.put("已延续_" + groupName, yesCnt); detail.add(item); } for (Map<String, Object> row : deptRows) { String groupName = row.get("groupName") == null ? (row.get("groupCode") == null ? "" : row.get("groupCode").toString()) : row.get("groupName").toString(); String groupName = row.get("groupName") == null ? (row.get("groupCode") == null ? "" : row.get("groupCode").toString()) : row.get("groupName").toString(); long noCnt = row.get("noContinueCnt") == null ? 0L : Long.parseLong(row.get("noContinueCnt").toString()); long yesCnt = row.get("continueCnt") == null ? 0L : Long.parseLong(row.get("continueCnt").toString()); totalNoContinue += noCnt; smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java
@@ -316,6 +316,8 @@ // 住院信息 patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId()); patMedInhosp.setFuflag("1"); if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) patMedInhosp.setFuflag("0"); patMedInhosp.setInhospstate("0".equals(cry) ? "0" : "1"); // 医院和床位信息
