查询空闲平车

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java

@@ -88,14 +88,13 @@ public class WisdomCarController {
     @RequestMapping(value = "/queryBindingCarRun", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<WisdomCarVo.QueryBindingCarRun>> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryBindingCarRun> params) {
         log.info("查询正在运行的平车绑定的患者信息：{}", params);
-
         List<WisdomCarVo.QueryBindingCarRun> list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId());
         log.info("查询正在运行的平车绑定的患者信息成功");
         return JsonResponse.newInstance().ok(list);
     }
 
     @MustLogin
-    @ApiOperation(value = "查询全部平车", notes = "")
+    @ApiOperation(value = "查询全部平车", notes = "1007")
     @RequestMapping(value = "/queryAllCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<WisdomCarVo.QueryAllCar> queryAllCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryAllCar> params){
         log.info("查询全部平车：{}", params);

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

@@ -19,7 +19,11 @@ public interface PatientProjectDao extends PatientProjectMapper {
      * @return 患者信息
      */
     List<PatientVo.PatientRecord> findPatientInfoByIdList(@Param("list") List<Long> newPatientIds);
-
+    /**
+     *
+     * @param projectId
+     * @return
+     */
     PatientAndFamilyVo.PatientInfo queryPatientInfo(@Param("projectId")Long projectId);
 
     /**

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

@@ -25,4 +25,14 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper {
      * @return
      */
     List<WisdomCarVo.QueryBindingCarRun> queryBindingCarIsRun(@Param("carId")Long carId);
+
+    /**
+     * 查询绑定的的平车信息
+     * @param id 平车id
+     * @return
+     */
+    WisdomCarVo.BindingCarInfo queryBindingCar(@Param("id")Long id);
+
+
+
 }

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

@@ -440,16 +440,14 @@ public class WisdomCarService implements IWisdomCarService {
             return new ArrayList<>();
         }
         for (WisdomCarVo.QueryAllCar queryAllCar : queryAllCarList) {
-            PatientWisdomCarExample patientWisdomCarExample = new PatientWisdomCarExample();
-            patientWisdomCarExample.createCriteria().andCarIdEqualTo(queryAllCar.getId());
             //通过平车id
-            List<PatientWisdomCar> patientWisdomCars = patientWisdomCarDao.selectByExample(patientWisdomCarExample);
+            WisdomCarVo.BindingCarInfo bindingCar = patientWisdomCarDao.queryBindingCar(queryAllCar.getId());
-            if(CollectionUtil.isEmpty(patientWisdomCars)){
+            if(ObjectUtil.isNull(bindingCar)){
                 //未绑定
                 queryAllCar.setType((byte) 0);
             } else {
-                queryAllCar.setPatientCarId(patientWisdomCars.get(0).getId());
+                queryAllCar.setPatientCarId(bindingCar.getPatientCarId());
-                queryAllCar.setPatientId(patientWisdomCars.get(0).getPatientId());
+                queryAllCar.setPatientId(bindingCar.getPatientId());
                 PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryAllCar.getPatientId());
                 if(ObjectUtil.isNotNull(patientProject)){
                     queryAllCar.setMedicalRecordNum(patientProject.getMedicalRecordNum());

wisdomcar/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: common, util-test
+    include: common, util-dev
 
 

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

@@ -50,4 +50,24 @@
 			AND (a.end_time=0 OR (a.end_time > REPLACE(unix_timestamp(NOW(3)),'.','') ))
 			AND a.start_time < REPLACE(unix_timestamp(NOW(3)),'.','')
 	</select>
+
+
+	<select id="queryBindingCar"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCarInfo">
+		select
+		a.id as patientCarId,
+		a.patient_id as patientId,
+		a.car_id as carId,
+		a.start_time as startTime,
+		a.end_time as endTime
+		from
+		t_patient_wisdom_car a
+		WHERE
+		a.car_id = #{id}
+		and rec_status = 0
+		and
+		((a.start_time &lt; REPLACE(unix_timestamp(NOW(3)),'.','') and a.end_time &gt; REPLACE(unix_timestamp(NOW(3)),'.','') )
+		or (a.end_time =0 and a.start_time+7200000 &gt; REPLACE(unix_timestamp(NOW(3)),'.','')))
+		ORDER BY a.start_time
+		DESC LIMIT 1
+	</select>
 </mapper>