From 594f669e8f3e1d84e1803520fbed048ca71420d3 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Sat, 5 Jun 2021 14:53:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B9=B3=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wisdomcar/src/main/resources/mapper_dao/PatientDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 175242ae3a52982aaf2fd8f42a45805f6bd8590e Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Sat, 5 Jun 2021 15:09:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E9=85=8D=E5=B9=B3=E8=BD=A6?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B9=B3=E8=BD=A6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/wisdomcar/service/WisdomCarService.java | 5 +++++ 1 file changed, 5 insertions(+) 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..3c265b3c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -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 From ebdf7888610caf3aeb12c9f323c426b7b085aec7 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 7 Jun 2021 15:58:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ccsens/wisdomcar/util/Constant.java | 2 +- wisdomcar/src/main/resources/application.yml | 4 ++-- wisdomcar/src/main/resources/druid-dev.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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..5d65c2cc 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java @@ -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/druid-dev.yml b/wisdomcar/src/main/resources/druid-dev.yml index 9e94758c..bcd1a390 100644 --- a/wisdomcar/src/main/resources/druid-dev.yml +++ b/wisdomcar/src/main/resources/druid-dev.yml @@ -28,8 +28,8 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 -# url: jdbc:mysql://49.233.89.188:3306/wisdomcar?useUnicode=true&characterEncoding=UTF-8 - url: jdbc:mysql://81.70.54.64/wisdomcar?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://49.233.89.188:3306/wisdomcar?useUnicode=true&characterEncoding=UTF-8 +# url: jdbc:mysql://81.70.54.64/wisdomcar?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME From 6cbd4670c3caebc129f051de05d95cdae93f1a2e Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 7 Jun 2021 16:30:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/wisdomcar/service/WisdomCarService.java | 2 +- wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3c265b3c..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); 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 5d65c2cc..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 = "护士"; /** * 角色名称:专科医生 */ From e7d656238c1e9a1fc4358f3e017fa850bb372304 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 7 Jun 2021 17:36:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=82=A3=E8=80=85=E5=B9=B3=E8=BD=A6id=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/persist/dao/PatientWisdomCarDao.java | 7 +++++++ .../java/com/ccsens/wisdomcar/service/StepService.java | 8 ++++++++ .../main/resources/mapper_dao/PatientWisdomCarDao.xml | 9 +++++++++ 3 files changed, 24 insertions(+) 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/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