diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java index 7e38f2c1..4e9b1630 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/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> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询正在运行的平车绑定的患者信息:{}", params); - List 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 queryAllCar(@ApiParam @Validated @RequestBody QueryDto params){ log.info("查询全部平车:{}", params); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java index 13cea1d0..a91933dd 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientProjectDao.java @@ -19,7 +19,11 @@ public interface PatientProjectDao extends PatientProjectMapper { * @return 患者信息 */ List findPatientInfoByIdList(@Param("list") List newPatientIds); - + /** + * + * @param projectId + * @return + */ PatientAndFamilyVo.PatientInfo queryPatientInfo(@Param("projectId")Long projectId); /** diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java index d105b006..f01f55db 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/PatientWisdomCarDao.java @@ -25,4 +25,14 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper { * @return */ List queryBindingCarIsRun(@Param("carId")Long carId); + + /** + * 查询绑定的的平车信息 + * @param id 平车id + * @return + */ + WisdomCarVo.BindingCarInfo queryBindingCar(@Param("id")Long id); + + + } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java index 48d8f97c..521c2629 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/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 patientWisdomCars = patientWisdomCarDao.selectByExample(patientWisdomCarExample); - if(CollectionUtil.isEmpty(patientWisdomCars)){ + WisdomCarVo.BindingCarInfo bindingCar = patientWisdomCarDao.queryBindingCar(queryAllCar.getId()); + if(ObjectUtil.isNull(bindingCar)){ //未绑定 queryAllCar.setType((byte) 0); } else { - queryAllCar.setPatientCarId(patientWisdomCars.get(0).getId()); - queryAllCar.setPatientId(patientWisdomCars.get(0).getPatientId()); + queryAllCar.setPatientCarId(bindingCar.getPatientCarId()); + queryAllCar.setPatientId(bindingCar.getPatientId()); PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryAllCar.getPatientId()); if(ObjectUtil.isNotNull(patientProject)){ queryAllCar.setMedicalRecordNum(patientProject.getMedicalRecordNum()); diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index b57d4481..af91885f 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/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)),'.','') + + + \ No newline at end of file