ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -437,37 +437,6 @@ } /** * 新增或修改删除单一任务(临时接口) */ @ApiOperation("新增或修改删除单一任务(临时接口)") //@PreAuthorize("@ss.hasPermi('system:task:add')") @Log(title = "单一任务（随访）", businessType = BusinessType.INSERT) @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/insertOrUpdateTaskByTaskId") public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) { log.info("insertOrUpdateTaskByTaskId的入参为：{}", ivrTaskVO); LoginUser loginUser = getLoginUser(); SysUser user = loginUser.getUser(); ivrTaskVO.setCreateBy(user.getNickName()); ivrTaskVO.setUpdateBy(user.getNickName()); ivrTaskVO.setOrgid(user.getOrgid()); //根据入参查询信息-用户关系 ServiceSubtask serviceSubtask = new ServiceSubtask(); if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){ serviceSubtask.setTaskid(ivrTaskVO.getTaskid()); serviceSubtask.setOrgid(user.getOrgid()); serviceSubtask.setCampusid(user.getCampusid()); ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask); ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances()); return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO)); }else { return error("insertOrUpdateTaskByTaskId taskid不可为空"); } } /** * 电话回调任务(上海) */ @ApiOperation("电话回调任务") smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -162,6 +162,9 @@ @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、住院满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访 11，影像专科随访 12、心电专科随访， 13专科随访 14、门诊满意度调查 15投诉建议 16课题随访") private String serviceType; @ApiModelProperty(value = "服务类型集合，按逗号分割") private String serviceTypes; /** * 模板ID */ smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -31,11 +31,11 @@ @ApiModelProperty(value = "异常预警：0绿色；1红色；2黄色") private Integer isabnormal; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @ApiModelProperty(value = "开始时间") private Date startTime; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @ApiModelProperty(value = "结束时间") private Date endTime;
@@ -118,6 +118,9 @@ @Excel(name = " 首次随访失败 ") private Long followUpFail = 0L; @ApiModelProperty(value = "无需随访详情") private List<ServiceSubtask> nonFollowUpInfo; @ApiModelProperty(value = "首次应随访详情") private List<ServiceSubtask> needFollowUpInfo;
@@ -2685,6 +2685,8 @@ serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname()); //出院人次 serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size()); //无需随访详情 List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>(); //记录过滤患者详情 List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>(); //记录首次应随访详情 @@ -2721,6 +2723,7 @@ //无需随访人次 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) { serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L); nonFollowUpInfo.add(serviceSubtask); if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) { serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L); filterServiceSubtasks.add(serviceSubtask); @@ -2899,6 +2902,8 @@ } } serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks); //记录无需随访详情 serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo); //记录首次应随访详情 serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo); //记录首次待随访详情 @@ -2951,6 +2956,8 @@ serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname()); //出院人次 serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size()); //无需随访详情 List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>(); //记录过滤患者详情 List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>(); //记录首次应随访详情 @@ -2972,6 +2979,7 @@ //无需随访人次 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) { serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L); nonFollowUpInfo.add(serviceSubtask); if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) { serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L); filterServiceSubtasks.add(serviceSubtask); @@ -3077,6 +3085,8 @@ } } serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks); //记录无需随访详情 serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo); //记录首次应随访详情 serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo); //记录首次待随访详情 @@ -3113,6 +3123,8 @@ serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname()); //出院人次 serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size()); //无需随访详情 List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>(); //记录过滤患者详情 List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>(); @@ -3135,6 +3147,7 @@ //无需随访人次 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) { serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L); nonFollowUpInfo.add(serviceSubtask); if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) { serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L); filterServiceSubtasks.add(serviceSubtask); @@ -3240,6 +3253,8 @@ } } serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks); //记录无需随访详情 serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo); //记录再次应随访详情 serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo); //记录再次待随访详情 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -646,6 +646,8 @@ AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d') </if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if> <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if> <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if> <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if> <if test="isabnormal != null">and isabnormal = #{isabnormal}</if> @@ -725,6 +727,8 @@ AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d') </if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if> <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if> <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if> <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if> <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
