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

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

@@ -34,7 +34,7 @@ public class PatientAndFamilyController {
     IPatientAndFamilyService patientAndFamilyService;
 
     @MustLogin
-    @ApiOperation(value = "修改(补录)患者信息", notes = "mz")
+    @ApiOperation(value = "修改(补录)患者和家属信息信息", notes = "mz")
     @RequestMapping(value = "/updatePatientInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse updatePatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.PatientInfo> params) {
         log.info("修改(补录)患者信息：{}", params);
@@ -72,7 +72,7 @@ public class PatientAndFamilyController {
     public JsonResponse<PatientAndFamilyVo.PatientInfo> queryPatientInfo(@ApiParam @Validated @RequestBody QueryDto<PatientAndFamilyDto.queryPatientInfo> params) {
         log.info("查询患者：{}", params);
         PatientAndFamilyVo.PatientInfo patientInfo = patientAndFamilyService.queryPatientInfo(params.getParam());
-        log.info("查询患者");
+        log.info("查询患者成功");
         return JsonResponse.newInstance().ok(patientInfo);
     }
 

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

@@ -6,6 +6,7 @@ import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.wisdomcar.bean.dto.ProjectDto;
 import com.ccsens.wisdomcar.bean.vo.ProjectVo;
 import com.ccsens.wisdomcar.service.IProjectService;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -51,4 +52,15 @@ public class ProjectController {
         log.info("查询称重和剂量：{}", list);
         return JsonResponse.newInstance().ok(list);
     }
+
+
+    @MustLogin
+    @ApiOperation(value = "选择历史患者切换项目", notes = "mz")
+    @RequestMapping(value = "/switchProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse switchProject(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.SwitchProject> params) throws JsonProcessingException {
+        log.info("选择历史患者切换项目：{}", params);
+        projectService.switchProject(params.getParam(), params.getUserId());
+        log.info("选择历史患者切换项目");
+        return JsonResponse.newInstance().ok();
+    }
 }

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

@@ -76,10 +76,10 @@ 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());
-        log.info("查询绑定平车成功");
+        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

@@ -27,6 +27,10 @@ public class PatientAndFamilyDto {
         private String idCard;
         @ApiModelProperty("患者手机号")
         private String phone;
+        @ApiModelProperty("患者家属姓名")
+        private String familyName;
+        @ApiModelProperty("患者家属手机号")
+        private String familyPhone;
 
     }
 
@@ -43,7 +47,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
@@ -30,4 +31,11 @@ public class ProjectDto {
         @ApiModelProperty("分解任务ID")
         private Long taskSubId;
     }
+
+    @Data
+    @ApiModel("切换项目")
+    public static class SwitchProject {
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
 }

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("查询绑定平车")
-    public static class QueryBindingCar {
+    @ApiModel("查询绑定平车参数")
+    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("查询绑定平车")
-    public static class BindingCar{
+    @ApiModel("查询绑定平车结果")
+    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/persist/dao/StepDao.java

@@ -36,5 +36,5 @@ public interface StepDao extends StepMapper {
      * @param patientCarId 患者平车id
      * @return 环节信息
      */
-    List<StepVo.StepStatus> findStepIsOver(Long patientCarId);
+    List<StepVo.StepStatus> findStepIsOver(@Param("patientCarId") Long patientCarId);
 }

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

@@ -3,6 +3,7 @@ package com.ccsens.wisdomcar.service;
 import com.ccsens.wisdomcar.bean.dto.ProjectDto;
 import com.ccsens.wisdomcar.bean.po.StepTask;
 import com.ccsens.wisdomcar.bean.vo.ProjectVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
 
 import java.util.List;
 
@@ -35,4 +36,10 @@ public interface IProjectService {
      */
     void saveData(Long startTime, StepTask stepTask, Long operationId, byte operation);
 
+    /**
+     * 选择历史患者切换项目
+     * @param param 项目id
+     * @param userId 当前用户id
+     */
+    void switchProject(ProjectDto.SwitchProject param, Long userId) throws JsonProcessingException;
 }

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.HospitalMemberExample;
-import com.ccsens.wisdomcar.bean.po.PatientFamily;
-import com.ccsens.wisdomcar.bean.po.PatientProject;
+import com.ccsens.wisdomcar.bean.po.*;
 import com.ccsens.wisdomcar.bean.vo.PatientAndFamilyVo;
 import com.ccsens.wisdomcar.bean.vo.PatientVo;
 import com.ccsens.wisdomcar.persist.dao.HospitalMemberDao;
@@ -69,6 +66,19 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{
                 patient.setPhone(param.getPhone());
             }
             patientProjectDao.updateByPrimaryKeySelective(patient);
+            //修改患者家属信息
+            PatientFamilyExample patientFamilyExample = new PatientFamilyExample();
+            patientFamilyExample.createCriteria().andPatientIdEqualTo(param.getId());
+            List<PatientFamily> patientFamilies = patientFamilyDao.selectByExample(patientFamilyExample);
+            if (CollectionUtil.isNotEmpty(patientFamilies)){
+                if (ObjectUtil.isNotNull(param.getFamilyName())){
+                    patientFamilies.get(0).setName(param.getFamilyName());
+                }
+                if (ObjectUtil.isNotNull(param.getFamilyPhone())){
+                    patientFamilies.get(0).setPhone(param.getFamilyPhone());
+                }
+                patientFamilyDao.updateByPrimaryKeySelective(patientFamilies.get(0));
+            }
         }else{
             throw new BaseException(Constant.PATIENT_NOT_FOUND);
         }
@@ -78,33 +88,33 @@ public class PatientAndFamilyService implements IPatientAndFamilyService{
     public void updatePatientFamilyInfo(PatientAndFamilyDto.PatientFamilyInfo param) {
         PatientFamily family = patientFamilyDao.selectByPrimaryKey(param.getId());
         //如果手机号为空需要推送tall添加患者家属
-        if (ObjectUtil.isNull(family.getPhone()) && ObjectUtil.isNotNull(param.getPhone())){
-            //查找项目id
-            PatientProject patient = patientProjectDao.selectByPrimaryKey(family.getPatientId());
-            List<String> roleNameList = new ArrayList<>();
-            roleNameList.add(Constant.PATIENT_FAMILY);
-
-            QueryDto<MemberRoleDto.SaveMemberForTemplate> queryDto = new QueryDto<>();
-            MemberRoleDto.SaveMemberForTemplate saveMemberForTemplate = new MemberRoleDto.SaveMemberForTemplate();
-            saveMemberForTemplate.setProjectId(patient.getProjectId());
-            //添加家属手机号和Tall对应角色名称
-            List<MemberRoleDto.MemberForTemplate> memberList = new ArrayList<>();
-            MemberRoleDto.MemberForTemplate member = new MemberRoleDto.MemberForTemplate();
-            member.setPhone(param.getPhone());
-            member.setMemberName(param.getName());
-            member.setRoleName(roleNameList);
-            memberList.add(member);
-            saveMemberForTemplate.setMemberForTemplate(memberList);
-            queryDto.setParam(saveMemberForTemplate);
-
-            log.info("调用tall添加成员接口:{}",queryDto);
-            JsonResponse jsonResponse = tallFeignClient.addMemberForTemplate(queryDto);
-            log.info("调用tall添加成员接口结束返回:{}",jsonResponse);
-            if(!jsonResponse.getCode().equals(Constant.RESPONSE_OK)){
-                log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
-                throw new BaseException(Constant.RETURN_ERROR);
-            }
-        }
+//        if (ObjectUtil.isNull(family.getPhone()) && ObjectUtil.isNotNull(param.getPhone())){
+//            //查找项目id
+//            PatientProject patient = patientProjectDao.selectByPrimaryKey(family.getPatientId());
+//            List<String> roleNameList = new ArrayList<>();
+//            roleNameList.add(Constant.PATIENT_FAMILY);
+//
+//            QueryDto<MemberRoleDto.SaveMemberForTemplate> queryDto = new QueryDto<>();
+//            MemberRoleDto.SaveMemberForTemplate saveMemberForTemplate = new MemberRoleDto.SaveMemberForTemplate();
+//            saveMemberForTemplate.setProjectId(patient.getProjectId());
+//            //添加家属手机号和Tall对应角色名称
+//            List<MemberRoleDto.MemberForTemplate> memberList = new ArrayList<>();
+//            MemberRoleDto.MemberForTemplate member = new MemberRoleDto.MemberForTemplate();
+//            member.setPhone(param.getPhone());
+//            member.setMemberName(param.getName());
+//            member.setRoleName(roleNameList);
+//            memberList.add(member);
+//            saveMemberForTemplate.setMemberForTemplate(memberList);
+//            queryDto.setParam(saveMemberForTemplate);
+//
+//            log.info("调用tall添加成员接口:{}",queryDto);
+//            JsonResponse jsonResponse = tallFeignClient.addMemberForTemplate(queryDto);
+//            log.info("调用tall添加成员接口结束返回:{}",jsonResponse);
+//            if(!jsonResponse.getCode().equals(Constant.RESPONSE_OK)){
+//                log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
+//                throw new BaseException(Constant.RETURN_ERROR);
+//            }
+//        }
 
         if (ObjectUtil.isNotNull(param.getName())){
             family.setName(param.getName());
@@ -144,6 +154,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/ProjectService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.exception.BaseException;
+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;
@@ -13,6 +14,7 @@ import com.ccsens.wisdomcar.persist.dao.StepTaskDao;
 import com.ccsens.wisdomcar.persist.dao.WisdomCarRecordDao;
 import com.ccsens.wisdomcar.persist.mapper.PatientWisdomCarMapper;
 import com.ccsens.wisdomcar.util.Constant;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -20,7 +22,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @description:
@@ -124,4 +128,11 @@ public class ProjectService implements IProjectService {
         }
         return wisdomCarRecordDao.queryRecent(bindCar.getCarId(), bindCar.getStartTime(), bindCar.getEndTime(), (byte)1,(byte)8,(byte)9,(byte)10);
     }
+
+    @Override
+    public void switchProject(ProjectDto.SwitchProject param, Long userId) throws JsonProcessingException {
+        Set<String> userIds = new HashSet<>();
+        userIds.add(userId.toString());
+        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId());
+    }
 }

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

@@ -114,18 +114,18 @@ public class WisdomCarService implements IWisdomCarService {
             patientFamily.setPhone(param.getFamilyPhone());
             patientFamily.setPatientId(patient.getId());
             patientFamilyDao.insertSelective(patientFamily);
-            if (ObjectUtil.isNotNull(param.getFamilyPhone())){
-                MemberRoleDto.MemberForTemplate memberForTemplate = new MemberRoleDto.MemberForTemplate();
-                //添加对应角色名称
-                List<String> roleName = new ArrayList<>();
-                roleName.add(Constant.PATIENT_FAMILY);
-                memberForTemplate.setRoleName(roleName);
-                memberForTemplate.setPhone(param.getFamilyPhone());
-                if (ObjectUtil.isNotNull(param.getFamilyName())){
-                    memberForTemplate.setMemberName(param.getFamilyName());
-                }
-                memberList.add(memberForTemplate);
-            }
+//            if (ObjectUtil.isNotNull(param.getFamilyPhone())){
+//                MemberRoleDto.MemberForTemplate memberForTemplate = new MemberRoleDto.MemberForTemplate();
+//                //添加对应角色名称
+//                List<String> roleName = new ArrayList<>();
+//                roleName.add(Constant.PATIENT_FAMILY);
+//                memberForTemplate.setRoleName(roleName);
+//                memberForTemplate.setPhone(param.getFamilyPhone());
+//                if (ObjectUtil.isNotNull(param.getFamilyName())){
+//                    memberForTemplate.setMemberName(param.getFamilyName());
+//                }
+//                memberList.add(memberForTemplate);
+//            }
         }
 
         //查找正在值班得急救医生和急救护士
@@ -301,9 +301,9 @@ 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) {
+    public List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param) {
+        List<WisdomCarVo.BindingCarInfo> bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId());
+        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,

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

@@ -51,10 +51,11 @@
 		FROM
 			t_step AS s
 			LEFT JOIN t_patient_data AS pd ON s.id = pd.step_id
-			AND pd.patient_car_id = 0
+			AND pd.patient_car_id = #{patientCarId}
 			LEFT JOIN t_hospital_member AS hm ON pd.user_id = hm.user_id
 		WHERE
 			s.step_type = 0
+		ORDER BY s.`code`+1
 	</select>
 
 

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

@@ -26,7 +26,7 @@ WHERE
 		FROM
 			t_patient_wisdom_car
 		WHERE
-			car_id = 1
+			car_id = #{carId}
 			AND
 			((end_time = 0
 			AND start_time >=  #{startTime} - 2 * 60 * 60 * 1000)