查询患者

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

@@ -76,9 +76,9 @@ public class WisdomCarController {
 
     @ApiOperation(value = "查询绑定平车", notes = "")
     @RequestMapping(value = "/queryBindingCar", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<WisdomCarVo.BindingCar>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryBindingCar> params) {
+    public JsonResponse<List<WisdomCarVo.BindingCarInfo>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryInfo> params) {
         log.info("查询绑定平车：{}", params);
-        List<WisdomCarVo.BindingCar> list = wisdomCarService.queryBindingCar(params.getParam());
+        List<WisdomCarVo.BindingCarInfo> list = wisdomCarService.queryBindingCar(params.getParam());
         log.info("查询绑定平车");
         return JsonResponse.newInstance().ok(list);
     }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java

@@ -43,7 +43,7 @@ public class PatientAndFamilyDto {
     }
 
     @Data
-    @ApiModel("查询患者")
+    @ApiModel("查询患者参数")
     public static class  queryPatientInfo{
         @ApiModelProperty("项目ID")
         private Long projectId;

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
  * @author: whj
  * @time: 2021/6/1 13:34
  */
+@Data
 public class ProjectDto {
 
     @Data

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java

@@ -13,6 +13,7 @@ import java.util.List;
  * @author: whj
  * @time: 2021/6/1 13:01
  */
+@Data
 public class WisdomCarDto {
 
     @Data
@@ -48,8 +49,8 @@ public class WisdomCarDto {
     }
 
     @Data
-    @ApiModel("查询绑定平车")
+    @ApiModel("查询绑定平车参数")
-    public static class QueryBindingCar {
+    public static class QueryInfo {
         @ApiModelProperty("分解任务id")
         private Long taskSubId;
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/PatientAndFamilyVo.java

@@ -8,8 +8,10 @@ import lombok.Data;
 public class PatientAndFamilyVo {
 
     @Data
-    @ApiModel("查询患者")
+    @ApiModel("查询患者结果")
     public static class PatientInfo {
+        @ApiModelProperty("患者家属表id")
+        private Long id;
         @ApiModelProperty("病案号")
         private String medicalRecordNum;
         @ApiModelProperty("患者姓名")
@@ -22,5 +24,10 @@ public class PatientAndFamilyVo {
         private String idCard;
         @ApiModelProperty("患者联系电话")
         private String phone;
+        @ApiModelProperty("患者家属姓名")
+        private String familyName;
+        @ApiModelProperty("患者家属联系电话")
+        private String familyPhone;
+
     }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/ProjectVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
  * @author: whj
  * @time: 2021/6/1 13:34
  */
+@Data
 public class ProjectVo {
     public static class Start {
     }

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java

@@ -10,6 +10,7 @@ import lombok.Data;
  * @author: whj
  * @time: 2021/6/1 13:02
  */
+@Data
 public class WisdomCarVo {
     @Data
     @ApiModel("查询空闲平车--响应参数")
@@ -23,8 +24,8 @@ public class WisdomCarVo {
 
 
     @Data
-    @ApiModel("查询绑定平车")
+    @ApiModel("查询绑定平车结果")
-    public static class BindingCar{
+    public static class BindingCarInfo {
         @ApiModelProperty("患者id")
         private Long patientId;
         @ApiModelProperty("平车id")

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

@@ -10,5 +10,5 @@ public interface PatientWisdomCarDao extends PatientWisdomCarMapper {
 
     List<Long>  queryByNew(@Param("id")Long id);
 
-    List<WisdomCarVo.BindingCar> queryBindingCarList(@Param("taskSubId")Long taskSubId);
+    List<WisdomCarVo.BindingCarInfo> queryBindingCarList(@Param("taskSubId")Long taskSubId);
 }

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

@@ -47,5 +47,5 @@ public interface IWisdomCarService {
      * @param param 参数
      *
      */
-    List<WisdomCarVo.BindingCar> queryBindingCar(WisdomCarDto.QueryBindingCar param);
+    List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param);
 }

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

@@ -10,10 +10,7 @@ import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.exception.BaseException;
 import com.ccsens.wisdomcar.bean.dto.PatientAndFamilyDto;
-import com.ccsens.wisdomcar.bean.po.HospitalMember;
+import com.ccsens.wisdomcar.bean.po.*;
-import com.ccsens.wisdomcar.bean.po.HospitalMemberExample;
-import com.ccsens.wisdomcar.bean.po.PatientFamily;
-import com.ccsens.wisdomcar.bean.po.PatientProject;
 import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo;
 import com.ccsens.wisdomcar.bean.vo.PatientVo;
 import com.ccsens.wisdomcar.persist.dao.HospitalMemberDao;
@@ -144,6 +141,16 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{
             throw new BaseException(CodeEnum.PARAM_ERROR);
         }
         PatientAndFamilyVo.PatientInfo patientInfo = patientProjectDao.queryPatientInfo(param.getProjectId());
+        if(ObjectUtil.isNull(patientInfo)){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
+        PatientFamilyExample patientFamilyExample = new PatientFamilyExample();
+        patientFamilyExample.createCriteria().andPatientIdEqualTo(patientInfo.getId());
+        List<PatientFamily> patientFamilies = patientFamilyDao.selectByExample(patientFamilyExample);
+        if(CollectionUtil.isNotEmpty(patientFamilies)){
+            patientInfo.setFamilyName(patientFamilies.get(0).getName());
+            patientInfo.setFamilyPhone(patientFamilies.get(0).getPhone());
+        }
         return patientInfo;
     }
 }

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

@@ -301,9 +301,9 @@ public class WisdomCarService implements IWisdomCarService {
     }
 
     @Override
-    public List<WisdomCarVo.BindingCar> queryBindingCar(WisdomCarDto.QueryBindingCar param) {
+    public List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param) {
-        List<WisdomCarVo.BindingCar> bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId());
+        List<WisdomCarVo.BindingCarInfo> bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId());
-        for (WisdomCarVo.BindingCar bindingCar : bindingCarList) {
+        for (WisdomCarVo.BindingCarInfo bindingCar : bindingCarList) {
             //拿到患者id把 患者的信息存入
             PatientProject patientProject = patientProjectDao.selectByPrimaryKey(bindingCar.getPatientId());
             if(ObjectUtil.isNotNull(patientProject)){

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

@@ -23,7 +23,9 @@
     </select>
 
     <select id="queryPatientInfo" resultType="com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo$PatientInfo"  parameterType="java.lang.Long">
-        select medical_record_num as medicalRecordNum,
+        select
+        id as id,
+        medical_record_num as medicalRecordNum,
         name as name,
         sex as sex,
         age as age,

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

@@ -15,7 +15,7 @@
 		limit 1
 	</select>
 
-	<select id="queryBindingCarList"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCar">
+	<select id="queryBindingCarList"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCarInfo">
 		select
 		a.patient_id as patientId,
 		a.car_id as carNumber,