查询正在运行的平车绑定的患者信息

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java

@@ -83,6 +83,8 @@ public class WisdomCarVo {
         private Long carId;
         @ApiModelProperty("患者平车ID")
         private Long patientCarId;
+        @ApiModelProperty("平车编号ID")
+        private String carNumber;
         @ApiModelProperty("患者ID")
         private Long patientId;
         @ApiModelProperty("开始时间")

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.wisdomcar.persist.dao;
 
 import com.ccsens.wisdomcar.bean.vo.WisdomCarVo;
+import com.ccsens.wisdomcar.persist.mapper.WisdomCarMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @author whj
  */
-public interface WisdomCarDao {
+public interface WisdomCarDao extends WisdomCarMapper {
     /**
      * 查询空闲平车
      * @param hospitalId 医院ID

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -3,6 +3,7 @@ package com.ccsens.wisdomcar.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.util.CodeEnum;
+import com.ccsens.util.StringUtil;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
 import com.ccsens.wisdomcar.bean.dto.WisdomCarDto;
@@ -376,6 +377,11 @@ public class WisdomCarService implements IWisdomCarService {
             throw new BaseException(CodeEnum.PARAM_ERROR);
         }
         for (WisdomCarVo.queryBindingCarRun queryBindingCarRun : queryBindingCarRunList) {
+            //通过平车id把 平车的平车编号信息存入
+            WisdomCar wisdomCar = wisdomcarDao.selectByPrimaryKey(param.getCarId());
+            if (ObjectUtil.isNotNull(wisdomCar)){
+                queryBindingCarRun.setCarNumber(wisdomCar.getCarNumber());
+            }
             //拿到患者id把 患者的信息存入
             PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryBindingCarRun.getPatientId());
             if(ObjectUtil.isNotNull(patientProject)){

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

@@ -47,6 +47,7 @@
 			a.end_time as endTime
 			from t_patient_wisdom_car a
 			where car_id=#{carId}
-			AND (a.end_time=0 OR a.end_time > REPLACE(unix_timestamp(NOW(3)),'.',''))
+			AND (a.end_time=0 OR (a.end_time > REPLACE(unix_timestamp(NOW(3)),'.','') ))
+			AND a.start_time < REPLACE(unix_timestamp(NOW(3)),'.','')
 	</select>
 </mapper>