From 0328c630079663d3b9c3a17ec4787e226d6910c2 Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Wed, 9 Jun 2021 16:19:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=9A=84=E5=B9=B3=E8=BD=A6=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/api/WisdomCarController.java | 11 ++++++++ .../wisdomcar/bean/dto/WisdomCarDto.java | 9 +++++++ .../ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 27 +++++++++++++++++++ .../persist/dao/PatientWisdomCarDao.java | 7 +++++ .../wisdomcar/service/IWisdomCarService.java | 7 +++++ .../wisdomcar/service/WisdomCarService.java | 24 ++++++++++++++++- .../mapper_dao/PatientWisdomCarDao.xml | 12 +++++++++ 7 files changed, 96 insertions(+), 1 deletion(-) 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 0c39996d..4343d3a3 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -84,6 +84,17 @@ public class WisdomCarController { } + @ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "") + @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()); + log.info("查询正在运行的平车绑定的患者信息成功"); + return JsonResponse.newInstance().ok(list); + } + + + diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java index 7e49e073..b38ff9e9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java @@ -56,4 +56,13 @@ public class WisdomCarDto { private Long taskSubId; } + + @Data + @ApiModel("查询正在运行的平车绑定的患者信息参数") + public static class queryBindingCarRun { + @NotNull(message="请说明您的平车ID") + @ApiModelProperty("平车id") + private Long carId; + + } } 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 dfb1cb30..0e94b48f 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 @@ -75,4 +75,31 @@ public class WisdomCarVo { private StepTask stepTask; } + + @Data + @ApiModel("查询正在运行的平车绑定的患者信息结果") + public static class queryBindingCarRun { + @ApiModelProperty("平车ID") + private Long carId; + @ApiModelProperty("患者平车ID") + private Long patientCarId; + @ApiModelProperty("患者ID") + private Long patientId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("病案号") + private String medicalRecordNum; + @ApiModelProperty("患者姓名") + private String name; + @ApiModelProperty("患者性别") + private Byte sex; + @ApiModelProperty("患者年龄") + private Integer age; + @ApiModelProperty("患者身份证号") + private String idCard; + @ApiModelProperty("患者联系电话") + private String phone; + } } 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 877ba4b1..bb1313bb 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 @@ -18,4 +18,11 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper { * @return 是否存在 */ Integer findIsExist(@Param("id") Long patientCarId); + + /** + * 查询正在运行的平车信息 + * @param carId 平车id + * @return + */ + List queryBindingCarIsRun(@Param("carId")Long carId); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java index c8e878ec..d74d0ed5 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java @@ -48,4 +48,11 @@ public interface IWisdomCarService { * */ List queryBindingCar(WisdomCarDto.QueryInfo param); + + /** + * 查询正在运行的平车绑定的患者信息 + * @param param 参数 + * + */ + List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param); } 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 ad2a1e8f..890c569d 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -290,7 +290,7 @@ public class WisdomCarService implements IWisdomCarService { } //开始时间不能大于当前时间,结束时间不能小于开始时间 //System.out.println(System.currentTimeMillis()); - if (param.getEndTime() < param.getStartTime() || param.getStartTime() > System.currentTimeMillis()){ + if (param.getEndTime()!= 0 && param.getEndTime() != null && param.getEndTime() < param.getStartTime()){ throw new BaseException(CodeEnum.PARAM_ERROR); } // 判断平车是否在运行中 @@ -368,5 +368,27 @@ public class WisdomCarService implements IWisdomCarService { return bindingCarList; } + @Override + public List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param) { + List queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); + if(CollectionUtil.isEmpty(queryBindingCarRunList)){ + log.info("未找到对应的平车在运行"); + throw new BaseException(CodeEnum.PARAM_ERROR); + } + for (WisdomCarVo.queryBindingCarRun queryBindingCarRun : queryBindingCarRunList) { + //拿到患者id把 患者的信息存入 + PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryBindingCarRun.getPatientId()); + if(ObjectUtil.isNotNull(patientProject)){ + queryBindingCarRun.setMedicalRecordNum(patientProject.getMedicalRecordNum()); + queryBindingCarRun.setName(patientProject.getName()); + queryBindingCarRun.setSex(patientProject.getSex()); + queryBindingCarRun.setAge(patientProject.getAge()); + queryBindingCarRun.setIdCard(patientProject.getIdCard()); + queryBindingCarRun.setPhone(patientProject.getPhone()); + } + } + return queryBindingCarRunList; + } + } diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index 6dac5d6e..18b01912 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -37,4 +37,16 @@ WHERE id = #{id} + + \ No newline at end of file From f43af7012c704a3cb2e5c2fff16113a3ceeb5b81 Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Wed, 9 Jun 2021 17:21:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=9A=84=E5=B9=B3=E8=BD=A6=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF?= 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 ++ .../java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java | 3 ++- .../java/com/ccsens/wisdomcar/service/WisdomCarService.java | 6 ++++++ .../src/main/resources/mapper_dao/PatientWisdomCarDao.xml | 3 ++- 4 files changed, 12 insertions(+), 2 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 0e94b48f..1ee1dc18 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 @@ -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("开始时间") diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java index c86db5b5..b1f5434d 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/WisdomCarDao.java +++ b/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 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 890c569d..59f6e37f 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/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)){ diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index 18b01912..6550091a 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/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)),'.','') \ No newline at end of file From bc69986a810915a68cfff3acdd7de0224d64a33e Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Wed, 9 Jun 2021 17:30:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?0609=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/wisdomcar/api/OtherRecordsController.java | 4 ++-- .../ccsens/wisdomcar/api/PatientAndFamilyController.java | 2 +- .../com/ccsens/wisdomcar/api/WisdomCarController.java | 8 ++++---- .../com/ccsens/wisdomcar/service/IWisdomCarService.java | 2 +- .../com/ccsens/wisdomcar/service/WisdomCarService.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java index be39d067..34390732 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/OtherRecordsController.java @@ -31,7 +31,7 @@ public class OtherRecordsController { @Resource private IOtherRecordsService iOtherRecordsService; - @ApiOperation(value = "上传图片和记录", notes = "") + @ApiOperation(value = "上传图片和记录", notes = "1007") @RequestMapping(value = "/upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse upload(@ApiParam @Validated @RequestBody QueryDto params){ log.info("上传图片和记录：{}", params); @@ -41,7 +41,7 @@ public class OtherRecordsController { } - @ApiOperation(value = "查询上传图片和记录", notes = "") + @ApiOperation(value = "查询上传图片和记录", notes = "1007") @RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryList(@ApiParam @Validated @RequestBody QueryDto params){ log.info("查询上传图片和记录：{}", params); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java index d3228cf7..48d16794 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java @@ -67,7 +67,7 @@ public class PatientAndFamilyController { } - @ApiOperation(value = "查询患者", notes = "") + @ApiOperation(value = "查询患者", notes = "1007") @RequestMapping(value = "/queryPatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询患者：{}", params); 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 4343d3a3..b3ad035e 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -74,7 +74,7 @@ public class WisdomCarController { }*/ - @ApiOperation(value = "查询绑定平车", notes = "") + @ApiOperation(value = "查询绑定平车", notes = "1007") @RequestMapping(value = "/queryBindingCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询绑定平车：{}", params); @@ -83,12 +83,12 @@ public class WisdomCarController { return JsonResponse.newInstance().ok(list); } - - @ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "") + @MustLogin + @ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "1007") @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()); + List list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId()); log.info("查询正在运行的平车绑定的患者信息成功"); return JsonResponse.newInstance().ok(list); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java index d74d0ed5..c8a8011e 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java @@ -54,5 +54,5 @@ public interface IWisdomCarService { * @param param 参数 * */ - List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param); + List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId); } 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 59f6e37f..ce62a6a7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -370,7 +370,7 @@ public class WisdomCarService implements IWisdomCarService { } @Override - public List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param) { + public List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId) { List queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); if(CollectionUtil.isEmpty(queryBindingCarRunList)){ log.info("未找到对应的平车在运行");