From f48f57a4801757e01231c0583a93195ca9598f43 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 11 Jun 2021 14:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1ID=E4=B8=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AEID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/wisdomcar/bean/dto/ProjectDto.java | 4 +-- .../ccsens/wisdomcar/bean/dto/StepDto.java | 4 +-- .../wisdomcar/bean/dto/WisdomCarDto.java | 9 ++++--- .../ccsens/wisdomcar/bean/vo/ProjectVo.java | 4 +-- .../wisdomcar/persist/dao/PatientDataDao.java | 5 ++-- .../persist/dao/PatientWisdomCarDao.java | 2 +- .../ccsens/wisdomcar/persist/dao/StepDao.java | 4 +-- .../wisdomcar/persist/dao/StepTaskDao.java | 8 +++--- .../service/OtherRecordsService.java | 12 +-------- .../wisdomcar/service/ProjectService.java | 16 +++++------- .../ccsens/wisdomcar/service/StepService.java | 14 +++++----- .../wisdomcar/service/WisdomCarService.java | 26 +++++++++---------- wisdomcar/src/main/resources/application.yml | 4 +-- .../resources/mapper_dao/PatientDataDao.xml | 5 +--- .../mapper_dao/PatientWisdomCarDao.xml | 2 +- .../src/main/resources/mapper_dao/StepDao.xml | 15 ++--------- .../main/resources/mapper_dao/StepTaskDao.xml | 21 ++++++--------- 17 files changed, 62 insertions(+), 93 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java index bc34aec9..6e75d070 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java @@ -28,8 +28,8 @@ public class ProjectDto { @ApiModel("查询称重和剂量--请求") public static class Weight { @NotNull(message="请说明您的任务") - @ApiModelProperty("分解任务ID") - private Long taskSubId; + @ApiModelProperty("项目ID") + private Long projectId; } @Data diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StepDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StepDto.java index 2482cdb2..d0080391 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StepDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StepDto.java @@ -16,7 +16,7 @@ public class StepDto { @ApiModel("查看环节完成状态") public static class FindStepStatus{ @NotNull(message = "请选择要查看的数据") - @ApiModelProperty("分解任务id") - private Long taskSubId; + @ApiModelProperty("项目id") + private Long projectId; } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java index 62da88d9..dcc0ba9c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java @@ -30,9 +30,10 @@ public class WisdomCarDto { @NotNull(message="项目ID不能为空") @ApiModelProperty("项目ID") private Long projectId; - @NotNull(message="分解任务ID不能为空") - @ApiModelProperty("分解任务ID") - private Long taskSubId; + +// @NotNull(message="分解任务ID不能为空") +// @ApiModelProperty("分解任务ID") +// private Long taskSubId; @NotNull(message="开始时间不能为空") @Min(1) @ApiModelProperty("开始时间") @@ -53,7 +54,7 @@ public class WisdomCarDto { public static class QueryInfo { @NotNull(message="请说明您的任务") @ApiModelProperty("分解任务id") - private Long taskSubId; + private Long projectId; } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java index 373b11cd..f97c598c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java @@ -35,8 +35,8 @@ public class ProjectVo { public static class BindCar { @ApiModelProperty("患者平车绑定ID") private Long id; - @ApiModelProperty("任务ID") - private Long taskSubId; + @ApiModelProperty("批次") + private Long batch; @ApiModelProperty("患者ID") private Long patientId; @ApiModelProperty("平车ID") diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientDataDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientDataDao.java index f6a8464f..63529e5c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientDataDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientDataDao.java @@ -15,10 +15,11 @@ public interface PatientDataDao extends PatientDataMapper { /** * 为和taskSubId中一批的、尚无消息平车信息的记录添加平车记录 + * 为同一项目中的、尚无消息平车信息的记录添加平车记录 * @param carId 患者绑定平车ID - * @param taskSubId 任务ID + * @param projectId 项目ID */ - void updateCarId(@Param("carId") Long carId, @Param("taskSubId") Long taskSubId); + void updateCarId(@Param("carId") Long carId, @Param("projectId") Long projectId); /** * 查询任务开始时间 diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java index f01f55db..555fd570 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java @@ -10,7 +10,7 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper { List queryByNew(@Param("id")Long id); - List queryBindingCarList(@Param("taskSubId")Long taskSubId); + List queryBindingCarList(@Param("projectId")Long projectId); /** * 查看患者平车id是否存在 diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java index 31e613f1..b2094ca4 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepDao.java @@ -33,8 +33,8 @@ public interface StepDao extends StepMapper { /** * 查看环节是否完成 - * @param taskSubId 患者平车id + * @param projectId 患者平车id * @return 环节信息 */ - List findStepIsOver(@Param("taskSubId") Long taskSubId); + List findStepIsOver(@Param("projectId") Long projectId); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java index 249b7b1b..b7d36e21 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java @@ -14,11 +14,11 @@ import java.util.List; public interface StepTaskDao extends StepTaskMapper { /** - * 查找对应绑定平车的任务ID - * @param taskSubId 查询的任务ID - * @return 绑定平车任务ID + * 查找对应绑定平车信息 + * @param batch 查询的项目ID + * @return 绑定平车信息 */ - ProjectVo.BindCar getBindCarTaskId(@Param("taskSubId") Long taskSubId); + ProjectVo.BindCar getBindCarByBatch(@Param("batch") Long batch); /** * 查询当前平车绑定的患者和对应的环节的绑定关系 diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java index 09c301ff..bd10d4a7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java @@ -3,34 +3,24 @@ package com.ccsens.wisdomcar.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; -import com.ccsens.util.CodeEnum; import com.ccsens.util.StringUtil; -import com.ccsens.util.exception.BaseException; import com.ccsens.wisdomcar.bean.dto.OtherRecordsDto; import com.ccsens.wisdomcar.bean.dto.ProjectDto; import com.ccsens.wisdomcar.bean.po.PatientInformationRecord; import com.ccsens.wisdomcar.bean.po.PatientInformationRecordExample; -import com.ccsens.wisdomcar.bean.po.PatientWisdomCar; -import com.ccsens.wisdomcar.bean.po.PatientWisdomCarExample; import com.ccsens.wisdomcar.bean.vo.OtherRecordsVo; import com.ccsens.wisdomcar.bean.vo.ProjectVo; import com.ccsens.wisdomcar.persist.dao.PatientWisdomCarDao; import com.ccsens.wisdomcar.persist.dao.StepTaskDao; import com.ccsens.wisdomcar.persist.mapper.PatientInformationRecordMapper; import com.ccsens.wisdomcar.persist.mapper.PatientWisdomCarMapper; -import com.ccsens.wisdomcar.persist.mapper.WisdomCarMapper; -import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import javax.management.ObjectName; import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; import java.util.List; @Slf4j @@ -59,7 +49,7 @@ public class OtherRecordsService implements IOtherRecordsService { public void upload(OtherRecordsDto.PicturesAndRecords param,Long userId,Byte carOrUser) { //通过t_patient_information_record里面的分解任务id 找到患者平车id 最新的 拿到患者平车id t_patient_information_record //拿到患者平车id - ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(param.getId()); + ProjectVo.BindCar bindCar = stepTaskDao.getBindCarByBatch(param.getId()); /*if (bindCar == null) { log.info("没有找到绑定的平车信息：{}", param); throw new BaseException(CodeEnum.PARAM_ERROR); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java index b965521c..d7278f17 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java @@ -68,7 +68,7 @@ public class ProjectService implements IProjectService { public void saveData(Long startTime, StepTask stepTask, Long operationId, byte operation) { //患者平车id Long patientCarId = null; - ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId()); + ProjectVo.BindCar bindCar = stepTaskDao.getBindCarByBatch(stepTask.getBatch()); if(ObjectUtil.isNotNull(bindCar)){ patientCarId = bindCar.getId(); } @@ -79,7 +79,6 @@ public class ProjectService implements IProjectService { // 修改平车结束时间点 boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0); if (needModifyEndTime) { -// log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId()); PatientWisdomCar patientWisdomCar = new PatientWisdomCar(); patientWisdomCar.setId(bindCar.getId()); patientWisdomCar.setEndTime(startTime); @@ -91,7 +90,6 @@ public class ProjectService implements IProjectService { dataExample.createCriteria().andTaskSubIdEqualTo(stepTask.getTaskSubId()).andStepIdEqualTo(stepTask.getStepId()); List patientData = patientDataDao.selectByExample(dataExample); if (CollectionUtil.isNotEmpty(patientData)){ -// log.info("taskId:{}, stepId:{}已经存在，不再修改", stepTask.getTaskSubId(), stepTask.getStepId()); log.info("修改开始时间"); PatientData data = patientData.get(0); data.setStartTime(startTime); @@ -107,11 +105,11 @@ public class ProjectService implements IProjectService { data.setType(operation); patientDataDao.updateByPrimaryKeySelective(data); - // 未推送 - if (data.getPushStatus() == Constant.PUSH_STATUS_SUCCESS) { - log.info("已推送成功，不处理"); - return; - } +// // 未推送 +// if (data.getPushStatus() == Constant.PUSH_STATUS_SUCCESS) { +// log.info("已推送成功，不处理"); +// return; +// } // 异步推送数据 根据结果修改状态 asyncService.pushTime(stepTask, data); return; @@ -146,7 +144,7 @@ public class ProjectService implements IProjectService { @Override public List queryWeight(ProjectDto.Weight param, Long userId) { - ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(param.getTaskSubId()); + ProjectVo.BindCar bindCar = stepTaskDao.getBindCarByBatch(param.getProjectId()); if (bindCar == null) { log.info("没有找到绑定的平车信息：{},userId:{}", param, userId); return new ArrayList<>(); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java index 9bbad5f3..70938d18 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java @@ -36,13 +36,13 @@ public class StepService implements IStepService { @Override public List findStepIsOver(StepDto.FindStepStatus param) { - StepTaskExample stepTaskExample = new StepTaskExample(); - stepTaskExample.createCriteria().andTaskSubIdEqualTo(param.getTaskSubId()); - List stepTasks = stepTaskDao.selectByExample(stepTaskExample); - if (CollectionUtil.isEmpty(stepTasks)){ - throw new BaseException(CodeEnum.TASK_IS_EXIST); - } - return stepDao.findStepIsOver(param.getTaskSubId()); +// StepTaskExample stepTaskExample = new StepTaskExample(); +// stepTaskExample.createCriteria().andTaskSubIdEqualTo(param.getTaskSubId()); +// List stepTasks = stepTaskDao.selectByExample(stepTaskExample); +// if (CollectionUtil.isEmpty(stepTasks)){ +// throw new BaseException(CodeEnum.TASK_IS_EXIST); +// } + return stepDao.findStepIsOver(param.getProjectId()); } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java index 7fa620e9..62309cbd 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -252,7 +252,7 @@ public class WisdomCarService implements IWisdomCarService { for (ProjectVo.TaskSub taskSub : taskDetail.getTaskSubList()) { StepTask stepTask = new StepTask(); stepTask.setId(snowflake.nextId()); - stepTask.setBatch(1L); + stepTask.setBatch(data.getId()); stepTask.setPatientId(patient.getId()); stepTask.setTaskSubId(taskSub.getTaskSubId()); if (CollectionUtil.isNotEmpty(steps)){ @@ -304,17 +304,18 @@ public class WisdomCarService implements IWisdomCarService { if (0 == carIsExist){ throw new BaseException(CodeEnum.WISDOM_CAR_IS_EXIST); } - //查询任务是否存在 - Integer taskIsExist = stepTaskDao.findTaskIsExist(param.getTaskSubId()); - if (0 == taskIsExist){ - throw new BaseException(CodeEnum.TASK_IS_EXIST); - } +// //查询任务是否存在 +// Integer taskIsExist = stepTaskDao.findTaskIsExist(param.getTaskSubId()); +// if (0 == taskIsExist){ +// throw new BaseException(CodeEnum.TASK_IS_EXIST); +// } //查询任务是否是分诊环节的任务ID // Integer taskIsTriageTask = stepTaskDao.findTaskIsTriageTask(param.getTaskSubId()); // if (0 == taskIsTriageTask){ // throw new BaseException(CodeEnum.PARAM_ERROR); // } //查询患者是否存在 + // TODO 患者校验需重设置 Integer patientIsExist = patientProjectDao.findPatientIsExist(param.getProjectId()); if (0 == patientIsExist){ throw new BaseException(Constant.PATIENT_NOT_FOUND); @@ -331,6 +332,7 @@ public class WisdomCarService implements IWisdomCarService { throw new BaseException(CodeEnum.WISDOM_CAR_RUNNED); } // 查询患者信息 + // TODO 患者校验需重设置 PatientProjectExample projectExample = new PatientProjectExample(); projectExample.createCriteria().andProjectIdEqualTo(param.getProjectId()); List patientProjects = patientProjectDao.selectByExample(projectExample); @@ -345,7 +347,8 @@ public class WisdomCarService implements IWisdomCarService { // 绑定平车 PatientWisdomCar pc = new PatientWisdomCar(); pc.setId(snowflake.nextId()); - pc.setTaskSubId(param.getTaskSubId()); +// pc.setTaskSubId(param.getTaskSubId()); + pc.setBatch(param.getProjectId()); pc.setPatientId(patient.getId()); pc.setCarId(param.getCarId()); pc.setStartTime(param.getStartTime()); @@ -364,12 +367,7 @@ public class WisdomCarService implements IWisdomCarService { } // 更新患者数据中，尚未绑定平车的数据 - patientDataDao.updateCarId(pc.getId(), param.getTaskSubId()); - // 添加分诊任务开始 - com.ccsens.wisdomcar.bean.dto.ProjectDto.Start start = new com.ccsens.wisdomcar.bean.dto.ProjectDto.Start(); - start.setTaskSubId(param.getTaskSubId()); - start.setStartTime(param.getStartTime()); - projectService.start(start,userId); + patientDataDao.updateCarId(pc.getId(), param.getProjectId()); } @Override @@ -379,7 +377,7 @@ public class WisdomCarService implements IWisdomCarService { @Override public List queryBindingCar(WisdomCarDto.QueryInfo param) { - List bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId()); + List bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getProjectId()); if(CollectionUtil.isEmpty(bindingCarList)){ // log.info("未找到对应的任务"); // throw new BaseException(CodeEnum.PARAM_ERROR); diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index ee995f68..b98fb82e 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml index 09865c10..6780944c 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml @@ -4,10 +4,7 @@ update t_patient_data set patient_car_id = #{carId} where task_sub_id in - (select t2.task_sub_id from t_step_task t1, t_step_task t2 - where t1.patient_id = t2.patient_id and t1.batch = t2.batch - and t1.task_sub_id = #{taskSubId} - and t1.rec_status = 0 and t2.rec_status = 0) + (select task_sub_id from t_step_task where batch = #{projectId} and rec_status = 0) and patient_car_id = 0 and rec_status = 0 diff --git a/wisdomcar/src/main/resources/mapper_dao/StepDao.xml b/wisdomcar/src/main/resources/mapper_dao/StepDao.xml index 9e26de44..870d99e2 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StepDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StepDao.xml @@ -56,19 +56,8 @@ SELECT st.task_sub_id FROM - t_step_task AS st, - ( - SELECT - st.batch, - st.patient_id - FROM - t_step_task AS st - WHERE - st.task_sub_id = #{taskSubId} - ) AS bat - WHERE - st.patient_id = bat.patient_id - AND st.batch = bat.batch + t_step_task + where batch = #{projectId} ) LEFT JOIN t_hospital_member AS hm ON pd.user_id = hm.user_id WHERE diff --git a/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml b/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml index 6e057bc6..1bc2d6c2 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml @@ -2,26 +2,21 @@ - + select c.id, c.batch as batch, c.patient_id as patientId, c.car_id as carId, c.start_time as startTime, c.end_time as endTime FROM t_patient_wisdom_car c - where batch.batch = st.batch and batch.patient_id = st.patient_id and step.id = st.step_id and st.task_sub_id = c.task_sub_id and st.rec_status = 0 and c.rec_status = 0 order by c.start_time desc limit 1 + where c.batch = #{batch} and c.rec_status = 0 order by c.start_time desc limit 1