ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -275,13 +275,16 @@ subIds.clear(); subIds.addAll(lssubIds); lssubIds.clear(); } else if (descByCode.equals("多媒体")) { } else if (descByCode.equals("多媒体")) { //多媒体 continue; } else if (descByCode.equals("纸质")) { } else if (descByCode.equals("纸质")) { //纸质 continue; } else if (descByCode.equals("短信")) { } else if (descByCode.equals("短信")) { //短信 //对url中两个参数加密 RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); @@ -388,7 +391,7 @@ ss.setRemark("短信发送失败,该机构没有配置短信地址"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -454,7 +457,8 @@ subIds.clear(); subIds.addAll(lssubIds); lssubIds.clear(); } else if (descByCode.equals("公众号")) { } else if (descByCode.equals("公众号")) { //公众号 RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample(); String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key); @@ -512,7 +516,7 @@ ss.setRemark("公众号发送失败,his系统的患者id为空"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -526,7 +530,7 @@ ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -611,7 +615,7 @@ serviceSubtask.setRemark("发送失败"); serviceSubtask.setSendstate(5L); serviceSubtask.setId(id); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; ruoyi-common/src/main/java/com/ruoyi/common/enums/VisitSendStateEnum.java
@@ -10,6 +10,7 @@ private String code; private String desc; //随访标志 private Boolean visitFlag; VisitSendStateEnum(String code, String desc, Boolean visitFlag) { ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -361,7 +361,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); continue; } @@ -394,7 +394,8 @@ // redisCache.setCacheListLeft("cache-0", list); redisCache.setCacheListLeftAndDistinct("cache-0", list); } } else if (descByCode.equals("多媒体")) { } else if (descByCode.equals("多媒体")) { //多媒体 } else if (descByCode.equals("纸质")) { //纸质 @@ -457,7 +458,7 @@ serviceSubtask.setResult("error"); serviceSubtask.setRemark(patArchive.getNotrequiredreason()); serviceSubtask.setSendstate(4L); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); iServiceSubtaskService.insertServiceSubtask(serviceSubtask); continue; } @@ -495,7 +496,7 @@ ss.setRemark("短信发送失败,该机构没有配置短信地址"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -538,7 +539,7 @@ serviceSubtask.setResult("error"); serviceSubtask.setRemark("系统错误"); serviceSubtask.setSendstate(5L); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtask.setGuid(guid); iServiceSubtaskService.updateServiceSubtask(serviceSubtask); } @@ -562,7 +563,7 @@ serviceSubtask.setResult("error"); serviceSubtask.setRemark(patArchive.getNotrequiredreason()); serviceSubtask.setSendstate(4L); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); iServiceSubtaskService.insertServiceSubtask(serviceSubtask); continue; } @@ -579,7 +580,7 @@ ss.setRemark("该机构的公众号配置信息不全，无法通过公众号发送"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -590,7 +591,7 @@ ss.setRemark("公众号发送失败,his系统的患者id为空"); ss.setSendstate(5L); ss.setId(serviceSubtask.getId()); ss.setFinishtime(new Date()); // ss.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(ss); continue; } @@ -626,7 +627,7 @@ serviceSubtask.setResult("error"); serviceSubtask.setRemark("系统错误"); serviceSubtask.setSendstate(5L); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtask.setGuid(guid); iServiceSubtaskService.updateServiceSubtask(serviceSubtask); } smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -214,9 +214,9 @@ /** * 发送时间 */ @Excel(name = "就诊时间") @Excel(name = "发送时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("就诊时间") @ApiModelProperty("发送时间") private Date visitTime;
@@ -584,5 +584,6 @@ @ApiModelProperty(value = "患者上次随访的subId") private Integer upid; @ApiModelProperty(value = "随访时间") private Date visitTime; } smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -681,10 +681,7 @@ @ApiModelProperty(value = "患者上次随访的subId") private Integer upid; /** * 随访次数标识 */ @ApiModelProperty(value = "随访次数标识：0首次随访 1再次随访") private Integer visit_count_flag; @ApiModelProperty(value = "随访时间") private Date visitTime; } smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -175,7 +175,7 @@ * 服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知) */ @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)") @ApiModelProperty(value = "服务类型 : 1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10，影像专科随访 11、心电专科随访， 12专科随访") @ApiModelProperty(value = "服务类型 : 1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访 11，影像专科随访 12、心电专科随访， 13专病随访") private String serviceType; /** smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -570,7 +570,7 @@ serviceSubtask1.setSendstate(4L); serviceSubtask1.setRemark("患者再入院"); serviceSubtask1.setResult("error"); serviceSubtask1.setFinishtime(new Date()); // serviceSubtask1.setFinishtime(new Date()); serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy()); serviceSubtask1.setUpdateTime(new Date()); Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); @@ -578,7 +578,7 @@ } else { //相反,则将当有的数据停掉 serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtask.setSendstate(4L); serviceSubtask.setRemark("当前患者出院时间后有待执行的出院随访长期任务"); serviceSubtask.setCreateBy(serviceTask.getCreateBy()); @@ -591,7 +591,7 @@ serviceSubtask1.setSendstate(4L); serviceSubtask1.setRemark("疾病患者再入院"); serviceSubtask1.setResult("error"); serviceSubtask1.setFinishtime(new Date()); // serviceSubtask1.setFinishtime(new Date()); serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); //重新新增子任务 @@ -604,7 +604,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); } serviceSubtask.setCreateBy(serviceTask.getCreateBy()); serviceSubtask.setCreateTime(new Date()); @@ -615,7 +615,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); } serviceSubtask.setCreateBy(serviceTask.getCreateBy()); @@ -691,7 +691,7 @@ String remark = patArchive.getNotrequiredreason(); serviceSubtask.setRemark(remark); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); //不执行 serviceSubtask.setSendstate(4L); } @@ -720,7 +720,7 @@ serviceSubtask1.setSendstate(4L); serviceSubtask1.setRemark("患者再入院"); serviceSubtask1.setResult("error"); serviceSubtask1.setFinishtime(new Date()); // serviceSubtask1.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); } } smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -226,8 +226,7 @@ String remark = patArchive.getNotrequiredreason(); serviceSubtask.setRemark(remark); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); log.error("serviceSubtask888888的值为：{}",serviceSubtask); // serviceSubtask.setFinishtime(new Date()); //不执行 serviceSubtask.setSendstate(4L); } smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -207,7 +207,7 @@ serviceSubtask1.setSendstate(4L); serviceSubtask1.setRemark("疾病患者再入院"); serviceSubtask1.setResult("error"); serviceSubtask1.setFinishtime(new Date()); // serviceSubtask1.setFinishtime(new Date()); serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1); //重新新增子任务 @@ -219,7 +219,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); } serviceSubtask.setCreateBy(serviceTask.getCreateBy()); serviceSubtask.setCreateTime(new Date()); @@ -230,7 +230,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); } serviceSubtask.setCreateBy(serviceTask.getCreateBy()); @@ -288,12 +288,13 @@ if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L); Date newDate = addDays(patMedOuthosp.getAdmitdate(), serviceTask.getSendDay().intValue()); serviceSubtask.setLongSendTime(newDate); serviceSubtask.setVisitTime(newDate); //患者发送时间 if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) { String remark = patArchive.getNotrequiredreason(); serviceSubtask.setRemark(remark); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); //不执行 serviceSubtask.setSendstate(4L); } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -561,6 +561,7 @@ serviceSubtask.setNurseName(patTaskRelevance.getNurseName()); serviceSubtask.setCreateBy(serviceTask.getCreateBy()); serviceSubtask.setUpdateBy(serviceTask.getCreateBy()); serviceSubtask.setVisitTime(patTaskRelevance.getVisitTime()); if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1) serviceSubtask.setLongSendTime(patTaskRelevance.getLongSendTime()); serviceSubtaskMapper.insertServiceSubtask(serviceSubtask); @@ -766,6 +767,7 @@ serviceSubtask.setEndtime(patTaskRelevance.getEndtime()); serviceSubtask.setNurseId(patTaskRelevance.getNurseId()); serviceSubtask.setNurseName(patTaskRelevance.getNurseName()); serviceSubtask.setVisitTime(patTaskRelevance.getVisitTime()); serviceSubtask.setTextParam(new Gson().toJson(serviceTaskVO.getTextParam())); if (patTaskRelevance.getIsoperation() != null) { if (patTaskRelevance.getIsoperation() == 2) @@ -1743,7 +1745,7 @@ serviceSubtask.setRemark("手机号为空"); serviceSubtask.setSendstate(4L); serviceSubtask.setResult("error"); serviceSubtask.setFinishtime(new Date()); // serviceSubtask.setFinishtime(new Date()); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); continue; } smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -79,6 +79,7 @@ <result property="visitCount" column="visit_count"/> <result property="isVisitAgain" column="is_visit_again"/> <result property="upid" column="upid"/> <result property="visitTime" column="visit_time"/> </resultMap> <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2"> @@ -94,6 +95,7 @@ task_guid, patfrom, upid, visit_time, inhospid, visit_count, is_visit_again, @@ -299,6 +301,7 @@ <if test="createBy != null">and create_by = #{createBy}</if> <if test="taskGuid != null">and task_guid = #{taskGuid}</if> <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if> <if test="visitTime != null">and visit_time = #{visitTime}</if> </where> <if test="sort != null and sort==0">order by endtime asc</if> <if test="sort != null and sort==1">order by endtime desc</if> @@ -376,6 +379,7 @@ <if test="endtime != null ">and endtime = #{endtime}</if> <if test="excep != null ">and excep = #{excep}</if> <if test="nurseName != null ">and nurse_name = #{nurseName}</if> <if test="visitTime != null ">and visit_time = #{visitTime}</if> </where> </select> @@ -473,6 +477,7 @@ <if test="visitCount != null ">visit_count,</if> <if test="isVisitAgain != null ">is_visit_again,</if> <if test="upid != null ">upid,</if> <if test="visit_time != null ">visitTime,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="sendname != null">#{sendname},</if> @@ -551,6 +556,7 @@ <if test="visitCount != null ">#{visitCount},</if> <if test="isVisitAgain != null ">#{isVisitAgain},</if> <if test="upid != null ">#{upid},</if> <if test="visitTime != null ">#{visitTime},</if> </trim> </insert> @@ -634,6 +640,7 @@ <if test="visitCount != null ">visit_count=#{visitCount},</if> <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if> <if test="upid != null ">upid=#{upid},</if> <if test="visitTime != null ">visit_time=#{visitTime},</if> </trim> where id = #{id} </update> @@ -718,6 +725,7 @@ <if test="patguid != null ">patguid=#{patguid},</if> <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if> <if test="upid != null ">upid=#{upid},</if> <if test="visitTime != null ">visit_time=#{visitTime},</if> </trim> <where> <if test="patid != null ">and patid = #{patid}</if> @@ -804,6 +812,7 @@ <if test="taskGuid != null ">task_guid=#{taskGuid},</if> <if test="patguid != null ">patguid=#{patguid},</if> <if test="upid != null ">upid=#{upid},</if> <if test="visitTime != null ">visit_time=#{visitTime},</if> </trim> where patid = #{patid} and taskid = #{taskid} </update> @@ -887,6 +896,7 @@ <if test="taskGuid != null ">task_guid=#{taskGuid},</if> <if test="patguid != null ">patguid=#{patguid},</if> <if test="upid != null ">upid=#{upid},</if> <if test="visitTime != null ">visit_time=#{visitTime},</if> </trim> where task_guid = #{taskGuid} and task_name = #{taskName} </update> @@ -949,6 +959,7 @@ senderdetail, type, taskid, visit_time, templateid, templatename, senddate,
