ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -114,6 +114,7 @@ */ @ApiOperation("查询指标和关联的指标选项") //@PreAuthorize("@ss.hasPermi('system:target:list')") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/targetInfo") public TableDataInfo targetInfo(@RequestBody IvrLibaTarget ivrLibaTarget) { PageUtils.startPageByPost(ivrLibaTarget.getPageNum(), ivrLibaTarget.getPageSize()); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -456,7 +456,7 @@ iPatMedInhospService.dealOutHospInfoByDimension(config); //门诊表(新华的暂时不做门诊随访) if (!active.equals("xh")) { // iPatMedOuthospService.dealOutpatientInfo(); //iPatMedOuthospService.dealOutpatientInfo(); } } } @@ -595,6 +595,7 @@ String sendPreachform = getSendPreachform(serviceSubtaskPreachform, serviceSubtask); if (sendPreachform.equals("-1") || serviceSubtask.getSendstate() == 6 || serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 4) { //说明已经全部遍历完了，当前的执行方式序号是最后一个了 或者 该患者已经随访结束（成功或失败了或不执行） log.error("说明已经全部遍历完了，当前的执行方式序号是最后一个了 或者 该患者已经随访结束（成功或失败了或不执行）"); return; } //先判断患者是不是还要发送 smartor/src/main/java/com/smartor/service/IServiceTaskdeptService.java
@@ -45,6 +45,14 @@ public int updateServiceTaskdept(ServiceTaskdept serviceTaskdept); /** * 新增模板科室关联 * * @param serviceTaskdept 模板科室关联 * @return 结果 */ public int insertOrUpdateServiceTaskdept(ServiceTaskdept serviceTaskdept); /** * 批量删除模板科室关联 * * @param ids 需要删除的模板科室关联主键集合 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -620,7 +620,8 @@ serviceTaskdept.setDeptCode(deptCode); serviceTaskdept.setDeptType("1"); serviceTaskdept.setServiceType(serviceTaskVO.getServiceType()); serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept); //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改 serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept); } } if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) { @@ -629,7 +630,8 @@ serviceTaskdept.setDeptCode(districtcode); serviceTaskdept.setDeptType("2"); serviceTaskdept.setServiceType(serviceTaskVO.getServiceType()); serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept); //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改 serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept); } } } @@ -762,15 +764,8 @@ serviceTaskdept.setDeptCode(deptCode); serviceTaskdept.setDeptType("1"); serviceTaskdept.setServiceType(serviceTaskVO.getServiceType()); ServiceTaskdept st = new ServiceTaskdept(); st.setDeptCode(deptCode); st.setTaskId(serviceTask.getTaskid()); List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st); if (CollectionUtils.isEmpty(serviceTaskdepts)) { serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept); } else { serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept); } //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改 serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept); } } if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) { @@ -785,15 +780,7 @@ serviceTaskdept.setDeptType("2"); serviceTaskdept.setServiceType(serviceTaskVO.getServiceType()); //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改 ServiceTaskdept st = new ServiceTaskdept(); st.setDeptCode(districtcode); st.setTaskId(serviceTask.getTaskid()); List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st); if (CollectionUtils.isEmpty(serviceTaskdepts)) { serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept); } else { serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept); } serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept); } } } else if (serviceTaskVO.getAppltype().equals("3")) { smartor/src/main/java/com/smartor/service/impl/ServiceTaskdeptServiceImpl.java
@@ -4,6 +4,7 @@ import com.smartor.domain.ServiceTaskdept; import com.smartor.mapper.ServiceTaskdeptMapper; import com.smartor.service.IServiceTaskdeptService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,6 +68,24 @@ } /** * 新增模板科室关联 * * @param serviceTaskdept 模板科室关联 * @return 结果 */ @Override public int insertOrUpdateServiceTaskdept(ServiceTaskdept serviceTaskdept) { ServiceTaskdept st = new ServiceTaskdept(); st.setDeptCode(serviceTaskdept.getDeptCode()); st.setTaskId(serviceTaskdept.getTaskId()); List<ServiceTaskdept> serviceTaskdepts = selectServiceTaskdeptList(st); if (CollectionUtils.isEmpty(serviceTaskdepts)) { return insertServiceTaskdept(serviceTaskdept); } else { return updateServiceTaskdept(serviceTaskdept); } } /** * 批量删除模板科室关联 * * @param ids 需要删除的模板科室关联主键 smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
@@ -247,19 +247,19 @@ </trim> where 1=1 <if test="subid != null">and subid = #{subid}, #{subid} </if> <if test="taskid != null">and taskid = #{taskid}, #{taskid} </if> <if test="preachform != null">and preachform = #{preachform}, #{preachform} </if> <if test="remark != null">and remark = #{remark}, #{remark} </if> <if test="orgid != null">and orgid = #{orgid}, #{orgid} </if> </update>
