Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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("患者病案号")

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")

wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml

@@ -17,6 +17,7 @@
 
 	<select id="queryBindingCarList"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCarInfo">
 		select
+		a.id as patientCarId,
 		a.patient_id as patientId,
 		a.car_id as carId,
 		b.car_number as carNumber,
@@ -25,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
 	</select>
 </mapper>