ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -184,7 +184,7 @@ //通过任务ID拿到患者信息 ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO(); ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid()); ivrTaskcall.setSendstate(1L); ivrTaskcall.setSendstate(2L); List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(ivrTaskcall); if (descByCode.equals("电话")) { for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) { @@ -315,13 +315,13 @@ // sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false"); //转成16进制 String format = String.format("%03X", serviceOutPath.getId()) + RandomStringGenerator.generateRandomString(); ; serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); iServiceOutPathService.updateServiceOutPath(serviceOutPath); sendMagParam.setPhone(serviceSubtask.getPhone()); sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format); sendMagParam.setContent("您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + " 填写。感谢您配合！"); log.info("888888888888:{}",sendMagParam); } else if (type == 2) { //问券（问题） ServiceOutPath serviceOutPath = new ServiceOutPath(); @@ -335,6 +335,7 @@ serviceOutPath.setRadix(format); serviceOutPath.setUpdateTime(new Date()); 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); ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -4,6 +4,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.ISelect; import com.ruoyi.common.utils.PageUtils; import com.smartor.domain.PatMedReq; import com.smartor.domain.PatMedRes; import io.swagger.annotations.Api; @@ -48,9 +50,16 @@ @PostMapping("/selectPatMedOuthospList") @ApiOperation("查询患者门诊记录列表") public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) { startPage(); PageUtils.startPageByPost(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize()); List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp); return getDataTable(list); long count = PageUtils.count(new ISelect() { @Override public void doSelect() { patMedOuthospService.selectPatMedOuthospList(patMedOuthosp); } }); return getDataTable2(count, list); } /** smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -192,4 +192,32 @@ @ApiModelProperty(value = "类别：0急诊 1门诊") private String category; /** * 就诊开始时间 */ @ApiModelProperty(value = "就诊开始时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date starttime; /** * 就诊结束时间 */ @ApiModelProperty(value = "就诊结束时间") @JsonFormat(pattern = "yyyy-MM-dd") private Date endtime; /** * pageNum */ @ApiModelProperty("pageNum") private Integer pageNum; /** * pageSize */ @ApiModelProperty("pageSize") private Integer pageSize; } smartor/src/main/java/com/smartor/service/impl/ExternalInfoServiceImpl.java
@@ -185,10 +185,11 @@ patMedOuthosp.setPatid(patid); PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid); patMedOuthosp.setPatname(patArchive.getName()); patMedOuthosp.setPatno(patArchive.getPatientno()); patMedOuthosp.setDeptcode("" + externalOutHospInfo1.getKsdm()); patMedOuthosp.setDeptname(externalOutHospInfo1.getKsmc()); patMedOuthosp.setDiagname(externalOutHospInfo1.getZddm()); patMedOuthosp.setIcd10code(externalOutHospInfo1.getZdmc()); patMedOuthosp.setDiagname(externalOutHospInfo1.getZdmc()); patMedOuthosp.setIcd10code(externalOutHospInfo1.getZddm()); patMedOuthosp.setDrcode(externalOutHospInfo1.getYsdm().toString()); patMedOuthosp.setDrname(externalOutHospInfo1.getYsmc()); patMedOuthosp.setAdmitdate(externalOutHospInfo1.getJzrq()); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -439,6 +439,19 @@ return map; } //获取随访时间 Date visitTime = null; List<TaskSendTimeVO> sendTimeslot = serviceTaskVO.getSendTimeslot(); if (CollectionUtils.isNotEmpty(sendTimeslot) && sendTimeslot.size() > 0) { String dateString = sendTimeslot.get(0).getBegantime(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { visitTime = format.parse(dateString); } catch (Exception e) { e.printStackTrace(); } } //将任务信息放到服务表中 ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class); serviceSubtask.setTaskid(serviceTask.getTaskid().longValue()); @@ -450,13 +463,12 @@ //将任务信息新增到随访服务表中 serviceSubtask.setSendname(patTaskRelevance.getName()); serviceSubtask.setAge(patTaskRelevance.getAge()); // serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid())); serviceSubtask.setSfzh(patTaskRelevance.getIdcardno()); serviceSubtask.setPhone(patTaskRelevance.getTelcode()); serviceSubtask.setAddr(patTaskRelevance.getAddr()); serviceSubtask.setPatid(patTaskRelevance.getPatid()); serviceSubtask.setCreateTime(DateUtils.getNowDate()); serviceSubtask.setSendstate(1L); serviceSubtask.setSendstate(2L); if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1) serviceSubtask.setSendstate(2L); serviceSubtask.setDeptcode(patTaskRelevance.getDeptCode()); @@ -472,7 +484,7 @@ serviceSubtask.setEndtime(patTaskRelevance.getEndtime()); serviceSubtask.setNurseId(patTaskRelevance.getNurseId()); serviceSubtask.setNurseName(patTaskRelevance.getNurseName()); serviceSubtask.setVisitTime(patTaskRelevance.getVisitTime()); serviceSubtask.setVisitTime(visitTime); if (serviceTask.getSendType() == 2) { serviceSubtask.setVisitTime(new Date()); } @@ -596,7 +608,7 @@ if (patTaskRelevance.getIsoperation() == 2) serviceSubtask.setUpdateTime(new Date()); serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask); if (patTaskRelevance.getIsoperation() == 1) { serviceSubtask.setSendstate(1L); serviceSubtask.setSendstate(2L); serviceSubtask.setCreateTime(new Date()); serviceSubtaskMapper.insertServiceSubtask(serviceSubtask); } smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -177,7 +177,7 @@ serviceSubtask.setDelFlag("1"); Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask); log.error("sfSend需要移除的结果为：{}", aBoolean); //关联表删除 ServiceTaskdept serviceTaskdept = new ServiceTaskdept(); serviceTaskdept.setTaskId(taskid); @@ -372,6 +372,8 @@ } svyLibTemplateScriptVO.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions); } //这东西在无锡 ，会使请求不到后端 svyLibTemplateScriptVO.setOtherdata(null); } svyLibTemplateScriptVOS.sort(Comparator.comparingLong(SvyLibTemplateScriptVO::getSort)); return svyLibTemplateScriptVOS; smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -117,7 +117,12 @@ <if test="deptname != null and deptname != ''">and b.deptname like concat('%', #{deptname}, '%')</if> <if test="deptcode != null and deptcode != ''">and b.deptcode =#{deptcode}</if> <if test="drname != null and drname != ''">and b.drname like concat('%', #{drname}, '%')</if> <if test="admitdate != null ">and b.admitdate = #{admitdate}</if> <if test="starttime != null ">and date_format(pmo.admitdate,'%y%m%d') >= date_format(#{starttime},'%y%m%d') </if> <if test="endtime != null ">and date_format(pmo.admitdate,'%y%m%d') <= date_format(#{endtime},'%y%m%d') </if> <if test="orgid != null and orgid != ''">and b.orgid = #{orgid}</if> <if test="outhospno != null and outhospno != ''">and b.outhospno = #{outhospno}</if> <if test="category != null and category != ''">and b.category = #{category}</if> smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -716,6 +716,7 @@ <if test="suggest != null ">suggest=#{suggest},</if> <if test="inhospid != null ">inhospid=#{inhospid},</if> <if test="visitTime != null ">visitTime=#{visitTime},</if> <if test="delFlag != null ">del_flag=#{delFlag},</if> </trim> <where> <if test="patid != null ">patid=#{patid}</if> smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
@@ -191,8 +191,8 @@ update_time = #{updateTime} </trim> <where> <if test="id != null">and id = #{id},</if> <if test="taskId != null">and task_id = #{taskId},</if> <if test="id != null">and id = #{id}</if> <if test="taskId != null">and task_id = #{taskId}</if> </where> </update>
