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 294f1355..62ad0764 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java @@ -5,6 +5,8 @@ import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.wisdomcar.bean.dto.CreateCaseDto; import com.ccsens.wisdomcar.bean.dto.PatientAndFamilyDto; +import com.ccsens.wisdomcar.bean.vo.OtherRecordsVo; +import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo; import com.ccsens.wisdomcar.service.IPatientAndFamilyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author 马 @@ -51,4 +54,13 @@ public class PatientAndFamilyController { } + @ApiOperation(value = "查询患者", notes = "") + @RequestMapping(value = "/queryPatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询患者：{}", params); + PatientAndFamilyVo.PatientInfo patientInfo = patientAndFamilyService.queryPatientInfo(params.getParam()); + log.info("查询患者"); + return JsonResponse.newInstance().ok(patientInfo); + } + } 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 d6f89665..0ffd1fc4 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -2,16 +2,10 @@ package com.ccsens.wisdomcar.api; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; -import com.ccsens.wisdomcar.bean.dto.RecordDto; import com.ccsens.wisdomcar.bean.dto.WisdomCarDto; -import com.ccsens.wisdomcar.bean.vo.RecordVo; import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; import com.ccsens.cloudutil.annotation.MustLogin; -import com.ccsens.util.JsonResponse; -import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.wisdomcar.bean.dto.CreateCaseDto; -import com.ccsens.wisdomcar.bean.dto.StatisticsDto; -import com.ccsens.wisdomcar.bean.vo.StatisticsVo; import com.ccsens.wisdomcar.service.IWisdomCarService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -68,15 +62,31 @@ public class WisdomCarController { return JsonResponse.newInstance().ok(); } -// @MustLogin -// @ApiOperation(value = "平车数据上传", notes = "") -// @RequestMapping(value = "/uploadCarData", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse uploadCarData(@ApiParam @Validated @RequestBody QueryDto params) { -// log.info("平车数据上传：{}", params); -// wisdomCarService.uploadCarData(params.getParam(),params.getUserId()); -// log.info("平车数据上传"); -// return JsonResponse.newInstance().ok(); -// } + + /* @MustLogin + @ApiOperation(value = "平车数据上传", notes = "") + @RequestMapping(value = "/uploadCarData", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse uploadCarData(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("平车数据上传：{}", params); + wisdomCarService.uploadCarData(params.getParam(),params.getUserId()); + log.info("平车数据上传"); + return JsonResponse.newInstance().ok(); + }*/ + + + @ApiOperation(value = "查询绑定平车", notes = "") + @RequestMapping(value = "/queryBindingCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询绑定平车：{}", params); + List list = wisdomCarService.queryBindingCar(params.getParam()); + log.info("查询绑定平车成功"); + 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 fc1b09af..1322e3a0 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 @@ -42,4 +42,11 @@ public class PatientAndFamilyDto { } + @Data + @ApiModel("查询患者") + public static class queryPatientInfo{ + @ApiModelProperty("项目ID") + private Long projectId; + } + } 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 b3ce5777..d604d3b3 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 @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import java.util.List; /** * @description: 平车相关 @@ -45,4 +46,12 @@ public class WisdomCarDto { @ApiModel("平车数据上传") public static class UploadCarData { } + + @Data + @ApiModel("查询绑定平车") + public static class QueryBindingCar { + @ApiModelProperty("分解任务id") + private Long taskSubId; + + } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/PatientAndFamilyVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/PatientAndFamilyVo.java new file mode 100644 index 00000000..59b9eef9 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/PatientAndFamilyVo.java @@ -0,0 +1,26 @@ +package com.ccsens.wisdomcar.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PatientAndFamilyVo { + + @Data + @ApiModel("查询患者") + public static class PatientInfo { + @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/bean/vo/WisdomCarVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java index 3994199f..ed20a68e 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 @@ -20,6 +20,35 @@ public class WisdomCarVo { private String carNumber; } + + + @Data + @ApiModel("查询绑定平车") + public static class BindingCar{ + @ApiModelProperty("患者id") + private Long patientId; + @ApiModelProperty("平车id") + private Long carNumber; + @ApiModelProperty("平车信息id") + private Long carId; + @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; + } + @Data public static class CarStepRecord{ @ApiModelProperty("平车记录ID") @@ -28,5 +57,6 @@ public class WisdomCarVo { private Long time; @ApiModelProperty("对应任务") private StepTask stepTask; + } } 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 0599761a..9e3a8446 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 @@ -2,6 +2,7 @@ package com.ccsens.wisdomcar.persist.dao; import com.ccsens.wisdomcar.bean.po.PatientProject; import com.ccsens.wisdomcar.bean.po.PatientProjectExample; +import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo; import com.ccsens.wisdomcar.persist.mapper.PatientProjectMapper; import org.apache.ibatis.annotations.Param; @@ -12,4 +13,5 @@ import java.util.List; */ public interface PatientProjectDao extends PatientProjectMapper { + PatientAndFamilyVo.PatientInfo queryPatientInfo(@Param("projectId")Long projectId); } \ No newline at end of file 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 bc76abab..2d4f2da5 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 @@ -1,5 +1,6 @@ package com.ccsens.wisdomcar.persist.dao; +import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; import com.ccsens.wisdomcar.persist.mapper.PatientWisdomCarMapper; import org.apache.ibatis.annotations.Param; @@ -8,4 +9,6 @@ import java.util.List; public interface PatientWisdomCarDao extends PatientWisdomCarMapper { List queryByNew(@Param("id")Long id); + + List queryBindingCarList(@Param("taskSubId")Long taskSubId); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/mapper/PatientProjectMapper.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/mapper/PatientProjectMapper.java index 1c2670b0..eb024d65 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/mapper/PatientProjectMapper.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/mapper/PatientProjectMapper.java @@ -27,4 +27,5 @@ public interface PatientProjectMapper { int updateByPrimaryKeySelective(PatientProject record); int updateByPrimaryKey(PatientProject record); + } \ No newline at end of file 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 b05301c1..642836a8 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IPatientAndFamilyService.java @@ -2,6 +2,7 @@ package com.ccsens.wisdomcar.service; import com.ccsens.wisdomcar.bean.dto.PatientAndFamilyDto; +import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo; /** * @author 马 @@ -20,4 +21,10 @@ public interface IPatientAndFamilyService { * @param param 家属信息 */ void updatePatientFamilyInfo(PatientAndFamilyDto.PatientFamilyInfo param); + + /** + * 查询患者信息 + * @param param 家属信息 + */ + PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.queryPatientInfo param); } 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 b0d6e797..284c41f7 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java @@ -3,7 +3,6 @@ package com.ccsens.wisdomcar.service; import com.ccsens.wisdomcar.bean.dto.CreateCaseDto; import com.ccsens.wisdomcar.bean.dto.WisdomCarDto; import com.ccsens.wisdomcar.bean.vo.WisdomCarVo; -import com.ccsens.wisdomcar.bean.dto.CreateCaseDto; import java.util.List; @@ -42,4 +41,11 @@ public interface IWisdomCarService { * @param userId 当前用户id */ void uploadCarData(WisdomCarDto.UploadCarData param, Long userId); + + /** + * 查询绑定平车 + * @param param 参数 + * + */ + List queryBindingCar(WisdomCarDto.QueryBindingCar param); } 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 30afcf2c..827b2d2d 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java @@ -2,9 +2,11 @@ package com.ccsens.wisdomcar.service; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.util.CodeEnum; import com.ccsens.util.exception.BaseException; import com.ccsens.wisdomcar.bean.dto.PatientAndFamilyDto; import com.ccsens.wisdomcar.bean.po.PatientProject; +import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo; import com.ccsens.wisdomcar.persist.dao.PatientProjectDao; import com.ccsens.wisdomcar.util.Constant; import lombok.extern.slf4j.Slf4j; @@ -55,4 +57,13 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{ public void updatePatientFamilyInfo(PatientAndFamilyDto.PatientFamilyInfo param) { } + + @Override + public PatientAndFamilyVo.PatientInfo queryPatientInfo(PatientAndFamilyDto.queryPatientInfo param) { + if(ObjectUtil.isNull(param.getProjectId())){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + PatientAndFamilyVo.PatientInfo patientInfo = patientProjectDao.queryPatientInfo(param.getProjectId()); + return patientInfo; + } } 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 db016b9c..b78b8950 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -44,6 +44,8 @@ public class WisdomCarService implements IWisdomCarService { @Resource private HospitalMemberDao hospitalMemberDao; @Resource + private PatientWisdomCarDao patientWisdomCarDao; + @Resource private Snowflake snowflake; @Resource private RedisUtil redisUtil; @@ -56,8 +58,6 @@ public class WisdomCarService implements IWisdomCarService { @Resource private WisdomCarRecordDao wisdomCarRecordDao; @Resource - private PatientWisdomCarDao patientWisdomCarDao; - @Resource private StepDao stepDao; @Resource private StepTaskDao stepTaskDao; @@ -300,5 +300,23 @@ public class WisdomCarService implements IWisdomCarService { } + @Override + public List queryBindingCar(WisdomCarDto.QueryBindingCar param) { + List bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId()); + for (WisdomCarVo.BindingCar bindingCar : bindingCarList) { + //拿到患者id把 患者的信息存入 + PatientProject patientProject = patientProjectDao.selectByPrimaryKey(bindingCar.getPatientId()); + if(ObjectUtil.isNotNull(patientProject)){ + bindingCar.setMedicalRecordNum(patientProject.getMedicalRecordNum()); + bindingCar.setName(patientProject.getName()); + bindingCar.setSex(patientProject.getSex()); + bindingCar.setAge(patientProject.getAge()); + bindingCar.setIdCard(patientProject.getIdCard()); + bindingCar.setPhone(patientProject.getPhone()); + } + } + return bindingCarList; + } + } diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml index 36fa92ab..7a810087 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientProjectDao.xml @@ -2,4 +2,16 @@ + \ No newline at end of file diff --git a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml index f22a1afe..c2e21c11 100644 --- a/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml @@ -14,4 +14,16 @@ desc limit 1 + + \ No newline at end of file