From 925c6699365bc8947f5644519c3682418fc8be8b Mon Sep 17 00:00:00 2001
From: hyy-alt <1041001226@qq.com>
Date: Fri, 4 Jun 2021 17:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 4 ++--
 .../src/main/resources/mapper_dao/PatientWisdomCarDao.xml   | 6 +++---
 2 files changed, 5 insertions(+), 5 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 1c0268b5..82d66fa0 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
@@ -29,9 +29,9 @@ public class WisdomCarVo {
         @ApiModelProperty("患者id")
         private Long patientId;
         @ApiModelProperty("平车id")
-        private Long carNumber;
-        @ApiModelProperty("平车信息id")
         private Long carId;
+        @ApiModelProperty("平车信息id")
+        private String carNumber;
         @ApiModelProperty("开始时间")
         private Long startTime;
         @ApiModelProperty("结束时间")
diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml
index 8d1b3fe5..77b93184 100644
--- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml
+++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml
@@ -18,12 +18,12 @@
 	<select id="queryBindingCarList"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCarInfo">
 		select
 		a.patient_id as patientId,
-		a.car_id as carNumber,
-		b.id as carId,
+		a.car_id as carId,
+		b.car_number as carNumber,
 		a.start_time as startTime,
 		a.end_time as endTime
 		from t_patient_wisdom_car a,t_wisdom_car b
-		where a.car_id=b.car_number
+		where a.car_id=b.id
 		and a.task_sub_id=#{taskSubId}
 	</select>
 </mapper>
\ No newline at end of file