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] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=91=E5=AE=9A=E5=B9=B3?=
 =?UTF-8?q?=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 @@
 
 	<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 carNumber,
 		b.id as carId,
 		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