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

4 years ago · 84fa9bb783
9 changed files with 96 additions and 42 deletions
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/PatientAndFamilyController.java
+++ b/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);
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java
+++ b/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();
+    }
 }
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java
+++ b/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;

    }

--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/ProjectDto.java
@ -31,4 +31,11 @@ public class ProjectDto {
        @ApiModelProperty("分解任务ID")
        private Long taskSubId;
    }
+
+    @Data
+    @ApiModel("切换项目")
+    public static class SwitchProject {
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
 }
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IProjectService.java
+++ b/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;
 }
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/PatientAndFamilyService.java
@ -66,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);
        }
@ -75,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());
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
+++ b/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());
+    }
 }
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
+++ b/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);
+//            }
        }

        //查找正在值班得急救医生和急救护士
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@ -1,6 +1,6 @@
 spring:
  profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test