From 857e3fca49419d9b69a0ccee0837b03d898e6afb Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Thu, 10 Jun 2021 14:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8=E5=B9=B3?= =?UTF-8?q?=E8=BD=A6=E7=BB=93=E6=9D=9F=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/PatientAndFamilyController.java | 2 +- .../wisdomcar/api/ProjectController.java | 10 ++++ .../wisdomcar/api/WisdomCarController.java | 15 +++++- .../bean/dto/PatientAndFamilyDto.java | 2 +- .../ccsens/wisdomcar/bean/dto/ProjectDto.java | 11 +++++ .../wisdomcar/bean/dto/WisdomCarDto.java | 6 ++- .../ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 28 ++++++++++- .../persist/dao/PatientWisdomCarDao.java | 2 +- .../wisdomcar/persist/dao/WisdomCarDao.java | 7 +++ .../service/IPatientAndFamilyService.java | 2 +- .../wisdomcar/service/IProjectService.java | 8 +++ .../wisdomcar/service/IWisdomCarService.java | 9 +++- .../service/PatientAndFamilyService.java | 2 +- .../wisdomcar/service/ProjectService.java | 15 ++++-- .../wisdomcar/service/WisdomCarService.java | 49 +++++++++++++++++-- .../mapper_dao/PatientWisdomCarDao.xml | 2 +- .../resources/mapper_dao/WisdomCarDao.xml | 9 +++- 17 files changed, 160 insertions(+), 19 deletions(-) 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 48d16794..7070ccbf 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java @@ -69,7 +69,7 @@ public class PatientAndFamilyController { @ApiOperation(value = "查询患者", notes = "1007") @RequestMapping(value = "/queryPatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询患者：{}", params); PatientAndFamilyVo.PatientInfo patientInfo = patientAndFamilyService.queryPatientInfo(params.getParam()); log.info("查询患者成功"); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java index ecad47a1..e08f02c2 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java @@ -102,4 +102,14 @@ public class ProjectController { log.info("选择历史患者切换项目"); return JsonResponse.newInstance().ok(); } + + @MustLogin + @ApiOperation(value = "结束绑定平车", notes = "1007") + @RequestMapping(value = "/end", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse end(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("结束绑定平车：{}", params); + projectService.end(params.getParam(), params.getUserId()); + log.info("结束绑定平车成功"); + return JsonResponse.newInstance().ok(); + } } 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 b3ad035e..7e38f2c1 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -86,13 +86,24 @@ public class WisdomCarController { @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) { + public JsonResponse> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询正在运行的平车绑定的患者信息：{}", params); - List list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId()); + + List list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId()); log.info("查询正在运行的平车绑定的患者信息成功"); return JsonResponse.newInstance().ok(list); } + @MustLogin + @ApiOperation(value = "查询全部平车", notes = "") + @RequestMapping(value = "/queryAllCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryAllCar(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("查询全部平车：{}", params); + List list = wisdomCarService.queryAllCar(params.getParam(), params.getUserId()); + log.info("查询全部平车结果：{}", list); + return JsonResponse.newInstance().ok(list); + } + diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java index dc005625..604589f0 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java @@ -49,7 +49,7 @@ public class PatientAndFamilyDto { @Data @ApiModel("查询患者参数") - public static class queryPatientInfo{ + public static class QueryPatientInfo{ @NotNull(message="请说明您的项目") @ApiModelProperty("项目ID") private Long projectId; diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java index ab96125d..bc34aec9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java @@ -54,4 +54,15 @@ public class ProjectDto { @ApiModelProperty("项目id") private Long projectId; } + + @Data + @ApiModel("结束绑定平车-请求") + public static class End { + @NotNull(message="请说明患者平车id") + @ApiModelProperty("患者平车id") + private Long id; + @ApiModelProperty("结束时间") + private Long endTime = System.currentTimeMillis(); + + } } 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 b38ff9e9..62da88d9 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 @@ -59,10 +59,14 @@ public class WisdomCarDto { @Data @ApiModel("查询正在运行的平车绑定的患者信息参数") - public static class queryBindingCarRun { + public static class QueryBindingCarRun { @NotNull(message="请说明您的平车ID") @ApiModelProperty("平车id") private Long carId; } + @Data + @ApiModel("查询全部平车参数") + public static class QueryAllCar { + } } 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 1ee1dc18..06a2a7e1 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 @@ -78,7 +78,7 @@ public class WisdomCarVo { @Data @ApiModel("查询正在运行的平车绑定的患者信息结果") - public static class queryBindingCarRun { + public static class QueryBindingCarRun { @ApiModelProperty("平车ID") private Long carId; @ApiModelProperty("患者平车ID") @@ -104,4 +104,30 @@ public class WisdomCarVo { @ApiModelProperty("患者联系电话") private String phone; } + @Data + @ApiModel("查询全部平车结果") + public static class QueryAllCar { + @ApiModelProperty("平车ID") + private Long id; + @ApiModelProperty("平车编号ID") + private String carNumber; + @ApiModelProperty("患者平车ID") + private Long patientCarId; + @ApiModelProperty("患者ID") + private Long patientId; + @ApiModelProperty("病案号") + private String medicalRecordNum; + @ApiModelProperty("患者姓名") + private String name; + @ApiModelProperty("患者性别") + private Byte sex; + @ApiModelProperty("患者年龄") + private Integer age; + @ApiModelProperty("患者身份证号") + private String idCard; + @ApiModelProperty("患者联系电话") + private String phone; + @ApiModelProperty("绑定状态(0-未绑定,1-绑定)") + private Byte type; + } } 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 bb1313bb..d105b006 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 @@ -24,5 +24,5 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper { * @param carId 平车id * @return */ - List queryBindingCarIsRun(@Param("carId")Long carId); + List queryBindingCarIsRun(@Param("carId")Long carId); } 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 b1f5434d..712056f8 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 @@ -32,4 +32,11 @@ public interface WisdomCarDao extends WisdomCarMapper { * @return 0不存在 */ Integer findCarIsExist(@Param("id") Long carId); + + /** + * + * @param hospitalId 医院id + * @return + */ + List queryAllCar(@Param("hospitalId")Long hospitalId); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java index c9d2949c..3788e17c 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java @@ -29,7 +29,7 @@ public interface IPatientAndFamilyService { * 查询患者信息 * @param param 家属信息 */ - PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.queryPatientInfo param); + PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.QueryPatientInfo param); /** * 查看往期患者记录 diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IProjectService.java index 763dc261..9e47af06 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IProjectService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IProjectService.java @@ -49,4 +49,12 @@ public interface IProjectService { * @param userId 当前用户id */ void switchProject(ProjectDto.SwitchProject param, Long userId) throws JsonProcessingException; + + + /** + * 结束绑定 + * @param param 患者平车id + * @param userId 当前用户id + */ + void end(ProjectDto.End param, Long userId); } 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 c8a8011e..ebc58d5e 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,12 @@ public interface IWisdomCarService { * @param param 参数 * */ - List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId); + List queryBindingCarRun(WisdomCarDto.QueryBindingCarRun param, Long userId); + /** + * 查询全部平车 + * @param param 平车要求，暂无 + * @param userId 用户userId,根据userId查询医院ID + * @return 全部平车 绑定和未绑定 + */ + List queryAllCar(WisdomCarDto.QueryAllCar param, Long userId); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java index 28908c11..dac5da74 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java @@ -168,7 +168,7 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{ } @Override - public PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.queryPatientInfo param) { + public PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.QueryPatientInfo param) { if(ObjectUtil.isNull(param.getProjectId())){ throw new BaseException(CodeEnum.PARAM_ERROR); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java index 81038f85..8f8dbc2d 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java @@ -9,10 +9,7 @@ import com.ccsens.util.message.SwitchoverProjectUtil; import com.ccsens.wisdomcar.bean.dto.ProjectDto; import com.ccsens.wisdomcar.bean.po.*; import com.ccsens.wisdomcar.bean.vo.ProjectVo; -import com.ccsens.wisdomcar.persist.dao.PatientDataDao; -import com.ccsens.wisdomcar.persist.dao.StepDao; -import com.ccsens.wisdomcar.persist.dao.StepTaskDao; -import com.ccsens.wisdomcar.persist.dao.WisdomCarRecordDao; +import com.ccsens.wisdomcar.persist.dao.*; import com.ccsens.wisdomcar.persist.mapper.PatientWisdomCarMapper; import com.ccsens.wisdomcar.util.Constant; import com.fasterxml.jackson.core.JsonProcessingException; @@ -45,6 +42,8 @@ public class ProjectService implements IProjectService { @Resource private StepDao stepDao; @Resource + private PatientWisdomCarDao patientWisdomCarDao; + @Resource private PatientWisdomCarMapper patientWisdomCarMapper; @Resource private IAsyncService asyncService; @@ -147,4 +146,12 @@ public class ProjectService implements IProjectService { userIds.add(userId.toString()); SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId()); } + + @Override + public void end(ProjectDto.End param, Long userId) { + PatientWisdomCar patientWisdomCar = new PatientWisdomCar(); + patientWisdomCar.setId(param.getId()); + patientWisdomCar.setEndTime(param.getEndTime()); + patientWisdomCarDao.updateByPrimaryKeySelective(patientWisdomCar); + } } 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 ce62a6a7..e827ee85 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; /** @@ -370,13 +371,13 @@ public class WisdomCarService implements IWisdomCarService { } @Override - public List queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId) { - List queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); + public List queryBindingCarRun(WisdomCarDto.QueryBindingCarRun param, Long userId) { + List queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId()); if(CollectionUtil.isEmpty(queryBindingCarRunList)){ log.info("未找到对应的平车在运行"); throw new BaseException(CodeEnum.PARAM_ERROR); } - for (WisdomCarVo.queryBindingCarRun queryBindingCarRun : queryBindingCarRunList) { + for (WisdomCarVo.QueryBindingCarRun queryBindingCarRun : queryBindingCarRunList) { //通过平车id把 平车的平车编号信息存入 WisdomCar wisdomCar = wisdomcarDao.selectByPrimaryKey(param.getCarId()); if (ObjectUtil.isNotNull(wisdomCar)){ @@ -396,5 +397,47 @@ public class WisdomCarService implements IWisdomCarService { return queryBindingCarRunList; } + @Override + public List queryAllCar(WisdomCarDto.QueryAllCar param, Long userId) { + HospitalMemberExample example = new HospitalMemberExample(); + example.createCriteria().andUserIdEqualTo(userId); + List hospitalMembers = hospitalMemberDao.selectByExample(example); + if (CollectionUtil.isEmpty(hospitalMembers)) { + return new ArrayList<>(); + } + Long hospitalId = hospitalMembers.get(0).getHospitalId(); + List queryAllCarList = wisdomcarDao.queryAllCar(hospitalId); + if(CollectionUtil.isEmpty(queryAllCarList)){ + 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)){ + //未绑定 + queryAllCar.setType((byte) 0); + } else { + queryAllCar.setPatientCarId(patientWisdomCars.get(0).getId()); + queryAllCar.setPatientId(patientWisdomCars.get(0).getPatientId()); + PatientProject patientProject = patientProjectDao.selectByPrimaryKey(queryAllCar.getPatientId()); + if(ObjectUtil.isNotNull(patientProject)){ + queryAllCar.setMedicalRecordNum(patientProject.getMedicalRecordNum()); + queryAllCar.setName(patientProject.getName()); + queryAllCar.setSex(patientProject.getSex()); + queryAllCar.setAge(patientProject.getAge()); + queryAllCar.setIdCard(patientProject.getIdCard()); + queryAllCar.setPhone(patientProject.getPhone()); + queryAllCar.setType((byte) 1); + } + } + + } + //根据类型进行排序 0 1 未绑定是0 绑定是1 + queryAllCarList.sort(Comparator.comparing(obj -> ((WisdomCarVo.QueryAllCar) obj).getType())); + return queryAllCarList; + } + } diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index 6550091a..b57d4481 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -38,7 +38,7 @@ id = #{id} - select a.car_id as carId, a.id as patientCarId, diff --git a/wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml index 2ca722ba..a188d3b6 100644 --- a/wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/WisdomCarDao.xml @@ -53,5 +53,12 @@ WHERE AND rec_status = 0 - + \ No newline at end of file