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 bfcc80af..877ba4b1 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 @@ -11,4 +11,11 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper { List queryByNew(@Param("id")Long id); List queryBindingCarList(@Param("taskSubId")Long taskSubId); + + /** + * 查看患者平车id是否存在 + * @param patientCarId 患者平车id + * @return 是否存在 + */ + Integer findIsExist(@Param("id") Long patientCarId); } 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 2eff2918..1cbe1067 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StepService.java @@ -1,8 +1,10 @@ package com.ccsens.wisdomcar.service; +import com.ccsens.util.exception.BaseException; import com.ccsens.wisdomcar.bean.dto.StepDto; import com.ccsens.wisdomcar.bean.vo.StepVo; +import com.ccsens.wisdomcar.persist.dao.PatientWisdomCarDao; import com.ccsens.wisdomcar.persist.dao.StepDao; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,9 +25,15 @@ public class StepService implements IStepService { @Resource private StepDao stepDao; + @Resource + private PatientWisdomCarDao patientWisdomCarDao; @Override public List findStepIsOver(StepDto.FindStepStatus param) { + Integer isExist = patientWisdomCarDao.findIsExist(param.getPatientCarId()); + if (0 == isExist){ + throw new BaseException("请检查患者是否绑定平车"); + } return stepDao.findStepIsOver(param.getPatientCarId()); } 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 6d447ce9..057ae76d 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -105,7 +105,7 @@ public class WisdomCarService implements IWisdomCarService { patient.setIdCard(param.getPatientIdCard()); } if (ObjectUtil.isNotNull(param.getPatientPhone())){ - patient.setPhone(param.getFamilyPhone()); + patient.setPhone(param.getPatientPhone()); } patientProjectDao.insertSelective(patient); @@ -309,6 +309,11 @@ 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); } @Override diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java index 5f2eecc4..34cdd6f7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java @@ -71,7 +71,7 @@ public class Constant { /** * 角色名称:急诊护士 */ - public static final String EMERGENCY_NURSE = "急诊护士"; + public static final String EMERGENCY_NURSE = "护士"; /** * 角色名称:专科医生 */ @@ -83,7 +83,7 @@ public class Constant { /** * 角色名称:项目经理(主任) */ - public static final String HEAD = "项目经理"; + public static final String HEAD = "主任"; /** * 0急诊护士 diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml index f641e954..09865c10 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml @@ -4,7 +4,7 @@ update t_patient_data set patient_car_id = #{carId} where task_sub_id in - (select t2.id from t_step_task t1, t_step_task t2 + (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) diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index a545c030..6dac5d6e 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -28,4 +28,13 @@ and a.task_sub_id=#{taskSubId} order by a.start_time desc + + \ No newline at end of file