Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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<PatientAndFamilyVo.PatientInfo> queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.queryPatientInfo> params) {
+        log.info("查询患者：{}", params);
+        PatientAndFamilyVo.PatientInfo patientInfo = patientAndFamilyService.queryPatientInfo(params.getParam());
+        log.info("查询患者");
+        return JsonResponse.newInstance().ok(patientInfo);
+    }
+
 }

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<WisdomCarDto.UploadCarData> 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<WisdomCarDto.UploadCarData> 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<List<WisdomCarVo.BindingCar>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryBindingCar> params) {
+        log.info("查询绑定平车：{}", params);
+        List<WisdomCarVo.BindingCar> list = wisdomCarService.queryBindingCar(params.getParam());
+        log.info("查询绑定平车成功");
+        return JsonResponse.newInstance().ok(list);
+    }
+
+
+
+
+
 }
 
 

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;
+    }
+
 }

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;
+
+    }
 }

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;
+    }
+}

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;
+
     }
 }

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);
 }

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<Long>  queryByNew(@Param("id")Long id);
+
+    List<WisdomCarVo.BindingCar> queryBindingCarList(@Param("taskSubId")Long taskSubId);
 }

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);
+
 }

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);
 }

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<WisdomCarVo.BindingCar> queryBindingCar(WisdomCarDto.QueryBindingCar param);
 }

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;
+    }
 }

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<WisdomCarVo.BindingCar> queryBindingCar(WisdomCarDto.QueryBindingCar param) {
+        List<WisdomCarVo.BindingCar> 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;
+    }
+
 
 }

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

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.wisdomcar.persist.dao.PatientProjectDao">
 
+    <select id="queryPatientInfo" resultType="com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo$PatientInfo"  parameterType="java.lang.Long">
+        select medical_record_num as medicalRecordNum,
+        name as name,
+        sex as sex,
+        age as age,
+        id_card as idCard,
+        phone as phone
+        from t_patient_project
+        where t_patient_project.project_id=#{projectId}
+        ORDER BY t_patient_project.created_at
+        DESC LIMIT 1
+    </select>
 </mapper>

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

@@ -14,4 +14,16 @@
 		desc
 		limit 1
 	</select>
+
+	<select id="queryBindingCarList"  resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$BindingCar">
+		select
+		a.patient_id as patientId,
+		a.car_id as carNumber,
+		b.id as carId,
+		a.start_time as startTime,
+		a.end_time as endTime
+		from t_patient_wisdom_car a,t_wisdom_car b
+		where a.car_id=b.car_number
+		and a.task_sub_id=#{taskSubId}
+	</select>
 </mapper>