From 8463b37cfb1d41d02fa90dc740a47764d7611e4d Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 4 Jun 2021 16:02:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java index c7cd5ed9..63c22ae7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/CreateCaseDto.java @@ -27,7 +27,7 @@ public class CreateCaseDto { private int patientAge; @ApiModelProperty("患者身份证号") private String patientIdCard; - @Pattern(regexp="^[1]([3-9])[0-9]{9}$",message="请输入正确的手机号") + @Pattern(regexp="^\\s{0}$|^[1]([3-9])[0-9]{9}$",message="请输入正确的手机号") @ApiModelProperty("患者手机号") private String patientPhone; @ApiModelProperty("患者病案号") From 1b0dd5e39dae13ae2d058849a4e7d0804d7bd69c Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 4 Jun 2021 17:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=B9=B3=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 2 ++ wisdomcar/src/main/resources/application.yml | 4 ++-- .../src/main/resources/mapper_dao/PatientWisdomCarDao.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java index 4ceed6b3..1fe1c949 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java @@ -39,6 +39,8 @@ public class WisdomCarVo { @Data @ApiModel("查询绑定平车结果") public static class BindingCarInfo { + @ApiModelProperty("患者平车ID") + private Long patientCarId; @ApiModelProperty("患者id") private Long patientId; @ApiModelProperty("平车id") diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index a47f2a7b..1ac895fc 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: prod + include: common, util-prod diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index 8d1b3fe5..d9d1e008 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -17,13 +17,14 @@ \ No newline at end of file From 4f499ccdab905a0b453f9773de6bab1777a196ea Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 4 Jun 2021 19:44:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=B9=B3=E8=BD=A6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index d40b5d67..a545c030 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -26,5 +26,6 @@ from t_patient_wisdom_car a,t_wisdom_car b where a.car_id=b.id and a.task_sub_id=#{taskSubId} + order by a.start_time desc \ No newline at end of file