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

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<OtherRecordsDto.PicturesAndRecords> 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<List<OtherRecordsVo.TypeAndComment>> queryList(@ApiParam @Validated @RequestBody QueryDto<OtherRecordsDto.QueryId> params){
         log.info("查询上传图片和记录：{}", params);

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<PatientAndFamilyVo.PatientInfo> queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.queryPatientInfo> params) {
         log.info("查询患者：{}", params);

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<List<WisdomCarVo.BindingCarInfo>> queryBindingCar(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.QueryInfo> params) {
         log.info("查询绑定平车：{}", params);
@@ -83,6 +83,17 @@ public class WisdomCarController {
         return JsonResponse.newInstance().ok(list);
     }
 
+    @MustLogin
+    @ApiOperation(value = "查询正在运行的平车绑定的患者信息", notes = "1007")
+    @RequestMapping(value = "/queryBindingCarRun", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<WisdomCarVo.queryBindingCarRun>> queryBindingCarRun(@ApiParam @Validated @RequestBody QueryDto<WisdomCarDto.queryBindingCarRun> params) {
+        log.info("查询正在运行的平车绑定的患者信息：{}", params);
+        List<WisdomCarVo.queryBindingCarRun> list = wisdomCarService.queryBindingCarRun(params.getParam(),params.getUserId());
+        log.info("查询正在运行的平车绑定的患者信息成功");
+        return JsonResponse.newInstance().ok(list);
+    }
+
+
 
 
 

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

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

@@ -75,4 +75,33 @@ 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 String carNumber;
+        @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;
+    }
 }

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<WisdomCarVo.queryBindingCarRun> queryBindingCarIsRun(@Param("carId")Long carId);
 }

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

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

@@ -48,4 +48,11 @@ public interface IWisdomCarService {
      *
      */
     List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param);
+
+    /**
+     * 查询正在运行的平车绑定的患者信息
+     * @param param 参数
+     *
+     */
+    List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId);
 }

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;
@@ -290,7 +291,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 +369,32 @@ public class WisdomCarService implements IWisdomCarService {
         return bindingCarList;
     }
 
+    @Override
+    public List<WisdomCarVo.queryBindingCarRun> queryBindingCarRun(WisdomCarDto.queryBindingCarRun param, Long userId) {
+        List<WisdomCarVo.queryBindingCarRun> queryBindingCarRunList = patientWisdomCarDao.queryBindingCarIsRun(param.getCarId());
+        if(CollectionUtil.isEmpty(queryBindingCarRunList)){
+            log.info("未找到对应的平车在运行");
+            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)){
+                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;
+    }
+
 
 }

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

@@ -37,4 +37,17 @@
 		WHERE
 			id = #{id}
 	</select>
+
+	<select id="queryBindingCarIsRun" resultType="com.ccsens.wisdomcar.bean.vo.WisdomCarVo$queryBindingCarRun">
+		select
+			a.car_id as carId,
+			a.id as patientCarId,
+			a.patient_id as patientId,
+			a.start_time as startTime,
+			a.end_time as endTime
+			from t_patient_wisdom_car a
+			where car_id=#{carId}
+			AND (a.end_time=0 OR (a.end_time &gt; REPLACE(unix_timestamp(NOW(3)),'.','') ))
+			AND a.start_time &lt; REPLACE(unix_timestamp(NOW(3)),'.','')
+	</select>
 </mapper>