ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -259,19 +259,28 @@ @PostMapping("/dealOutHospInfo") public void dealOutHospInfo() { String config = configService.selectConfigByKey("visit.early.day"); if (port.equals("8095")) { //出院表 iPatMedInhospService.dealOutHospInfo(config); //门诊表(新华的暂时不做门诊随访) if (!active.equals("xh")) { iPatMedOuthospService.dealOutpatientInfo(); } //出院表 iPatMedInhospService.dealOutHospInfo(config); //门诊表(新华的暂时不做门诊随访) if (!active.equals("xh")) { iPatMedOuthospService.dealOutpatientInfo(); } } /** * 处理患者信息，进入子任务表 */ @ApiOperation("dealOutHospInfoBySchedule") @PostMapping("/dealOutHospInfoBySchedule") public void dealOutHospInfoBySchedule() { String config = configService.selectConfigByKey("visit.early.day"); //出院表 iPatMedInhospService.dealOutHospInfoBySchedule(config); } /** * 处理患者信息，进入子任务表 */ @ApiOperation("addOperationSubTask") @PostMapping("/addOperationSubTask") public void addOperationSubTask() { ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1370,7 +1370,7 @@ serviceSubtask.setSendstate(7L); serviceSubtask.setFinishtime(null); log.error("getSendPreachform方法 检查是否所有sendstate不等于9, 全失败了"); serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + "所有发送方式均未获取结果，任务失败（超时）" : "所有发送方式均未获取结果，任务失败（超时）"); serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + "所有执行方式均未获取结果，任务失败（超时）" : "所有执行方式均未获取结果，任务失败（超时）"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); //修改发送状态 setFail(serviceSubtaskPreachforms, serviceSubtask); smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -432,19 +432,19 @@ Integer type = 1; if (StringUtils.isNotEmpty(deptCodes)) { type = 1; deptCodeList = Arrays.asList(deptCodes.split(",")); deptCodeList = new ArrayList<>(Arrays.asList(deptCodes.split(","))); } if(StringUtils.isNotEmpty(wardCodes)) { type = 2; wardCodeList = Arrays.asList(wardCodes.split(",")); wardCodeList = new ArrayList<>(Arrays.asList(wardCodes.split(","))); } if(StringUtils.isNotEmpty(icd10Codes)) { type = 3; icd10CodeList = Arrays.asList(icd10Codes.split(",")); icd10CodeList = new ArrayList<>(Arrays.asList(icd10Codes.split(","))); } if (StringUtils.isNotEmpty(opLevelCodes)) { type = 6; opLevelCodeList = Arrays.asList(opLevelCodes.split(",")); opLevelCodeList = new ArrayList<>(Arrays.asList(opLevelCodes.split(","))); } //非手术处理方式 if(type != 6){ smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -269,6 +269,7 @@ e.printStackTrace(); } findServiceTaskScheduleVO(serviceTaskVO); return serviceTaskVO; } @@ -398,17 +399,7 @@ } } serviceTaskVO.setPatTaskRelevances(patTaskRelevances); if(StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")){ //任务组信息 ServiceTaskSchedule schedule = serviceTaskScheduleService.selectByTaskid(serviceTaskVO.getTaskid()); if (ObjectUtils.isNotEmpty(schedule)) { ServiceTaskScheduleVO serviceTaskScheduleVO = DtoConversionUtils.sourceToTarget(schedule, ServiceTaskScheduleVO.class); List<ServiceTaskScheduleDetail> scheduleDetailList = serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId()); serviceTaskScheduleVO.setDetailList(scheduleDetailList); serviceTaskVO.setServiceTaskScheduleVO(serviceTaskScheduleVO); } } findServiceTaskScheduleVO(serviceTaskVO); return serviceTaskVO; } @@ -4504,7 +4495,7 @@ if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) { serviceSubtask.setCurrentPreachform(preachform); serviceSubtask.setSendstate(5L); serviceSubtask.setRemark(remark + ";所有发送方式均未获取结果，任务失败"); serviceSubtask.setRemark(remark + ";所有执行方式均未获取结果，任务失败"); serviceSubtaskMapper.updateServiceSubtask(serviceSubtask); return true; } else { @@ -5434,6 +5425,21 @@ return back; } //获取任务组信息 private void findServiceTaskScheduleVO(ServiceTaskVO serviceTaskVO){ if(StringUtils.isNotEmpty(serviceTaskVO.getAppltype()) && serviceTaskVO.getAppltype().equals("5")){ //任务组信息 ServiceTaskSchedule schedule = serviceTaskScheduleService.selectByTaskid(serviceTaskVO.getTaskid()); if (ObjectUtils.isNotEmpty(schedule)) { ServiceTaskScheduleVO serviceTaskScheduleVO = DtoConversionUtils.sourceToTarget(schedule, ServiceTaskScheduleVO.class); List<ServiceTaskScheduleDetail> scheduleDetailList = serviceTaskScheduleService.selectDetailByScheduleid(schedule.getId()); serviceTaskScheduleVO.setDetailList(scheduleDetailList); serviceTaskVO.setServiceTaskScheduleVO(serviceTaskScheduleVO); } } } @Test public void TestMatch(){ String questionText = "您好,请问您是患者本人还是家属？\n";
