Merge branch 'master' of dd.tall.wiki:ccsens_wiki/carbasics

src/main/java/com/ccsens/carbasics/api/FirstAidController.java

@@ -7,6 +7,15 @@ import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.github.pagehelper.PageInfo;
+import com.ccsens.carbasics.bean.dto.FirstAidDto;
+import com.ccsens.carbasics.bean.dto.PatientDto;
+import com.ccsens.carbasics.bean.po.FirstAid;
+import com.ccsens.carbasics.bean.vo.FirstAidVo;
+import com.ccsens.carbasics.bean.vo.PatientVo;
+import com.ccsens.carbasics.service.IFirstAidService;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,9 +36,25 @@ import javax.annotation.Resource;
 @RequestMapping("/firstAid")
 @Slf4j
 public class FirstAidController {
+
     @Resource
     private IFirstAidService firstAidService;
 
+    @MustLogin
+    @ApiOperation(value = "加入急救", notes = "")
+    @RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FirstAidVo.ProjectInfo> joinFirstAid(@ApiParam @Validated @RequestBody QueryDto<FirstAidDto.JoinFirstAid> params) throws Exception{
+        FirstAidVo.ProjectInfo projectInfo = firstAidService.joinFirstAid(params.getParam(), params.getUserId());
+        return JsonResponse.newInstance().ok(projectInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "退出急救", notes = "")
+    @RequestMapping(value = "/quit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse quitFirstAid(@ApiParam @Validated @RequestBody QueryDto<FirstAidDto.QuitFirstAid> params) throws Exception{
+        firstAidService.quitFirstAid(params.getParam(), params.getUserId());
+        return JsonResponse.newInstance().ok();
+    }
     @MustLogin
     @ApiOperation(value = "病例列表", notes = "分诊护士/神内医生/神外医生查看相关病例")
     @RequestMapping(value = "/querySelf", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
@@ -40,4 +65,14 @@ public class FirstAidController {
         return JsonResponse.newInstance().ok(page);
     }
 
+    @MustLogin
+    @ApiOperation(value = "修改病例状态")
+    @RequestMapping(value = "/updateStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateStatus(@ApiParam @Validated @RequestBody QueryDto<FirstAidDto.UpdateStatus> params) throws Exception{
+        log.info("查询自己相关的病例列表：{}", params);
+        firstAidService.updateStatus(params.getParam(), params.getUserId());
+        log.info("查询自己相关的病例列表成功");
+        return JsonResponse.newInstance().ok();
+    }
+
 }

src/main/java/com/ccsens/carbasics/api/PatientController.java

@@ -94,4 +94,14 @@ public class PatientController {
     }
 
 
+    @MustLogin
+    @ApiOperation(value = "秘书修改审核状态", notes = "zy")
+    @RequestMapping(value = "/updateBySecretary", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateStatusBySecretary(@ApiParam @Validated @RequestBody QueryDto<PatientDto.StatusBySecretary> params) throws Exception{
+        log.info("秘书修改审核状态：{}", params);
+        firstAidService.updateStatusBySecretary(params.getParam(), params.getUserId());
+        log.info("秘书修改审核状态成功");
+        return JsonResponse.newInstance().ok();
+    }
+
 }

src/main/java/com/ccsens/carbasics/bean/dto/FirstAidDto.java

@@ -0,0 +1,44 @@
+package com.ccsens.carbasics.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author AUSU
+ */
+@Data
+public class FirstAidDto {
+
+    @Data
+    @ApiModel("加入急救")
+    public static class JoinFirstAid{
+        @NotNull(message = "请选择类型")
+        @ApiModelProperty("急救类型(0-神内,1-神外)")
+        private Byte type;
+        @NotNull(message = "急救id不能为空")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+    }
+
+    @Data
+    @ApiModel("加入急救")
+    public static class QuitFirstAid{
+        @NotNull(message = "急救id不能为空")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+    }
+
+    @Data
+    @ApiModel("修改病例状态")
+    public static class UpdateStatus{
+        @NotNull(message = "急救id不能为空")
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+        @NotNull(message = "请选择状态")
+        @ApiModelProperty("审核状态( 1:急救审核通过  2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 )")
+        private Byte dataStatus;
+    }
+}

src/main/java/com/ccsens/carbasics/bean/dto/PatientDto.java

@@ -112,6 +112,7 @@ public class PatientDto {
     @Data
     @ApiModel("添加病例")
     public static class SavePatient{
+        @NotNull(message = "请输入项目id")
         @ApiModelProperty("项目id")
         private Long projectId;
         @Length(max = 20,message = "名称过长")
@@ -127,6 +128,8 @@ public class PatientDto {
         private String idcard;
         @ApiModelProperty("疑似诊断信息")
         private String suspected;
+        @ApiModelProperty("是否是演示数据 0正式 1演示")
+        private byte valueType;
     }
 
 
@@ -141,6 +144,7 @@ public class PatientDto {
     @Data
     @ApiModel("修改急救信息")
     public static class UpdatePatient{
+        @NotNull(message = "请输入项目id")
         @ApiModelProperty("项目id")
         private Long projectId;
         @NotNull(message = "请输入急救id")
@@ -190,4 +194,15 @@ public class PatientDto {
         @Max(value=100)
         private int pageSize = 10;
     }
+
+
+    @Data
+    @ApiModel("秘书修改急救状态")
+    public static class StatusBySecretary{
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+        @ApiModelProperty("急救状态  0:通过  6:申请拒绝")
+        private byte dataStatus;
+    }
+
 }

src/main/java/com/ccsens/carbasics/bean/vo/FirstAidVo.java

@@ -1,13 +1,23 @@
-package com.ccsens.carbasics.bean.vo;
+package com.ccsens.carbasics.bean.vo;
-
+
-import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.Data;
-
+
-/**
+import javax.validation.constraints.NotNull;
- * @author 逗
+
- */
+/**
-@Data
+ * @author AUSU
-public class FirstAidVo {
+ */
-
+@Data
-}
+public class FirstAidVo {
+
+    @Data
+    @ApiModel("加入急救后的项目id")
+    public static class ProjectInfo{
+        @ApiModelProperty("项目id")
+        private Long projectId;
+
+    }
+
+}

src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java

@@ -27,6 +27,8 @@ public class OrganizationVo {
         private String name;
         @ApiModelProperty("职位id")
         private Long positionId;
+        @ApiModelProperty("联系方式")
+        private String contact;
         @ApiModelProperty("职位code")
         private String positionCode;
         @ApiModelProperty("科室id")

src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.bean.vo;
 
+import com.ccsens.carbasics.util.Constant;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -144,13 +145,13 @@ public class PatientVo {
         private int times;
 
         public int getDataStatus() {
-            if(dataStatus == 1 && times >= 1){
+            if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= Constant.MAX_UPDATE_NUMBER){
                 return 100;
             }
-            if(dataStatus == 3 && times >= 1){
+            if(dataStatus == Constant.DataStatus.DischargePass.status && times >= Constant.MAX_UPDATE_NUMBER){
                 return 100;
             }
-            if(dataStatus == 6 && times >= 1){
+            if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= Constant.MAX_UPDATE_NUMBER){
                 return 101;
             }
             return dataStatus;

src/main/java/com/ccsens/carbasics/persist/dao/FirstAidLogDao.java

@@ -19,4 +19,11 @@ public interface FirstAidLogDao extends FirstAidLogMapper {
      * @return 医生信息
      */
     List<FirstAidLogVo.JoinMember> queryMember(@Param("firstAidIds") List<Long> firstAidIds);
+
+    /**
+     * 查询质控员修改次数
+     * @param firstAidId 急救id
+     * @return 修改次数
+     */
+    Integer countUpdateNumber(@Param("firstAidId") Long firstAidId);
 }

src/main/java/com/ccsens/carbasics/persist/dao/FirstAidMemberDao.java

@@ -0,0 +1,17 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.po.FirstAidMember;
+import com.ccsens.carbasics.persist.mapper.FirstAidMemberMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FirstAidMemberDao extends FirstAidMemberMapper {
+
+    /**
+     * 根据急救id查询急救医生信息
+     * @param firstAidId  急救id
+     * @return  急救医生信息
+     */
+    FirstAidMember findByAidId(@Param("firstAidId") Long firstAidId);
+}

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -6,19 +6,26 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ccsens.carbasics.bean.dto.FirstAidDto;
 import com.ccsens.carbasics.bean.dto.PatientDto;
 import com.ccsens.carbasics.bean.po.*;
 import com.ccsens.carbasics.bean.vo.FirstAidLogVo;
+import com.ccsens.carbasics.bean.vo.FirstAidVo;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.bean.vo.PatientVo;
 import com.ccsens.carbasics.persist.dao.FirstAidDao;
 import com.ccsens.carbasics.persist.dao.FirstAidLogDao;
 
+import com.ccsens.carbasics.persist.dao.FirstAidMemberDao;
 import com.ccsens.carbasics.persist.dao.OrganizationDao;
 import com.ccsens.carbasics.persist.dao.OrganizationMemberDao;
 import com.ccsens.carbasics.persist.mapper.*;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.carbasics.util.DefaultCodeError;
+import com.ccsens.common.bean.dto.CProjectDto;
+import com.ccsens.common.bean.vo.CProjectVo;
+import com.ccsens.common.service.IProjectService;
+import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -49,16 +56,20 @@ public class FirstAidService implements IFirstAidService{
     @Resource
     private Snowflake snowflake;
 
-    @Resource
-    private FirstAidMemberMapper firstAidMemberMapper;
     @Resource
     private FirstAidLogMapper firstAidLogMapper;
     @Resource
+    private FirstAidMemberDao firstAidMemberDao;
+    @Resource
+    private IProjectService projectService;
+    @Resource
     private OrganizationTemplateMapper templateMapper;
     @Resource
     private FirstAidRecordMapper firstAidRecordMapper;
     @Resource
     private FirstAidRecordLogMapper firstAidRecordLogMapper;
+    @Resource
+    private RedisUtil redisUtil;
 
 
     @Override
@@ -93,6 +104,11 @@ public class FirstAidService implements IFirstAidService{
 
     @Override
     public void savePatient(PatientDto.SavePatient param, Long userId) {
+        // 判断有无权限添加
+        OrganizationVo.Basic basic = organizationDao.getOrganization(param.getProjectId(), userId);
+        if (basic == null) {
+            throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+        }
         //查找当前用户的职位和科室
         OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
         log.info("当前用户的科室职位信息：{}",memberPosition);
@@ -120,8 +136,11 @@ public class FirstAidService implements IFirstAidService{
         firstAid.setName(param.getName());
         firstAid.setGender(param.getGender());
         firstAid.setNation(param.getNation());
+        firstAid.setHospitalId(basic.getOrganizationId());
+        firstAid.setValueType(param.getValueType());
+        firstAid.setOperator(userId);
         if(StrUtil.isNotEmpty(param.getIdcard())){
-            if(IdcardUtil.isValidCard(param.getIdcard())){
+            if(!IdcardUtil.isValidCard(param.getIdcard())){
                 throw new BaseException(DefaultCodeError.IDCARD_ERROR);
             }
             firstAid.setIdcard(param.getIdcard());
@@ -131,11 +150,12 @@ public class FirstAidService implements IFirstAidService{
         //添加急救成员
         FirstAidMember firstAidMember = new FirstAidMember();
         firstAidMember.setId(snowflake.nextId());
+        firstAidMember.setFirstAidId(firstAid.getId());
         firstAidMember.setCreateUserId(userId);
         if(position == 1){
             firstAidMember.setRecordUserId(userId);
         }
-        firstAidMemberMapper.insertSelective(firstAidMember);
+        firstAidMemberDao.insertSelective(firstAidMember);
         //添加急救日志表(创建信息)
         FirstAidLog firstAidLog = new FirstAidLog();
         firstAidLog.setId(snowflake.nextId());
@@ -154,16 +174,17 @@ public class FirstAidService implements IFirstAidService{
             firstAidLogJoin.setOperationUserId(userId);
             firstAidLogJoin.setOperationType((byte) 7);
             firstAidLogJoin.setOperationRole(position);
-            firstAidLogMapper.insertSelective(firstAidLog);
+            firstAidLogMapper.insertSelective(firstAidLogJoin);
         }
         //添加疑似诊断信息
         FirstAidRecord firstAidRecord = new FirstAidRecord();
         firstAidRecord.setId(snowflake.nextId());
         firstAidRecord.setFirstAidId(firstAid.getId());
-        firstAidRecord.setQuestionCode("CJBL-YSBL");
+        firstAidRecord.setQuestionCode(Constant.QuestionCode.CJBL_YSBL);
         firstAidRecord.setAnswer(param.getSuspected());
         firstAidRecord.setSubmitUserId(userId);
         firstAidRecord.setSubmitUserType((byte) 1);
+        firstAidRecord.setOperator(userId);
         firstAidRecordMapper.insertSelective(firstAidRecord);
         //加日志
         FirstAidRecordLog firstAidRecordLog = new FirstAidRecordLog();
@@ -197,13 +218,13 @@ public class FirstAidService implements IFirstAidService{
             throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
         }
         //判断急救状态
-        if(firstAid.getDataStatus() == 1 || firstAid.getDataStatus() == 3){
+        if(firstAid.getDataStatus() == Constant.DataStatus.FirstAidPass.status || firstAid.getDataStatus() == Constant.DataStatus.DischargePass.status){
             throw new BaseException(DefaultCodeError.NO_POWER);
         }
         //判断操作人的权限
         FirstAidMemberExample firstAidMemberExample = new FirstAidMemberExample();
         firstAidMemberExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId());
-        List<FirstAidMember> firstAidMembers = firstAidMemberMapper.selectByExample(firstAidMemberExample);
+        List<FirstAidMember> firstAidMembers = firstAidMemberDao.selectByExample(firstAidMemberExample);
         if(CollectionUtil.isEmpty(firstAidMembers)){
             throw new BaseException(DefaultCodeError.NO_POWER);
         }
@@ -215,7 +236,7 @@ public class FirstAidService implements IFirstAidService{
         firstAid.setNation(param.getNation());
         firstAid.setGender(param.getGender());
         if(StrUtil.isNotEmpty(param.getIdcard())){
-            if(IdcardUtil.isValidCard(param.getIdcard())){
+            if(!IdcardUtil.isValidCard(param.getIdcard())){
                 throw new BaseException(DefaultCodeError.IDCARD_ERROR);
             }
             firstAid.setIdcard(param.getIdcard());
@@ -227,7 +248,7 @@ public class FirstAidService implements IFirstAidService{
             //修改急救记录信息
             FirstAidRecord firstAidRecord = new FirstAidRecord();
             FirstAidRecordExample recordExample = new FirstAidRecordExample();
-            recordExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId()).andQuestionCodeEqualTo("CJBL-YSBL");
+            recordExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId()).andQuestionCodeEqualTo(Constant.QuestionCode.CJBL_YSBL);
             List<FirstAidRecord> firstAidRecords = firstAidRecordMapper.selectByExample(recordExample);
             if(CollectionUtil.isNotEmpty(firstAidRecords)){
                 firstAidRecord = firstAidRecords.get(0);
@@ -235,7 +256,7 @@ public class FirstAidService implements IFirstAidService{
                 firstAidRecordMapper.updateByPrimaryKeySelective(firstAidRecord);
             }else {
                 firstAidRecord.setId(snowflake.nextId());
-                firstAidRecord.setQuestionCode("CJBL-YSBL");
+                firstAidRecord.setQuestionCode(Constant.QuestionCode.CJBL_YSBL);
                 firstAidRecord.setFirstAidId(firstAid.getId());
                 firstAidRecord.setAnswer(param.getSuspected());
                 firstAidRecord.setSubmitUserId(userId);
@@ -261,7 +282,7 @@ public class FirstAidService implements IFirstAidService{
         OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
         //用户的科室必须是医院的科室
         Organization organization = organizationDao.selectByPrimaryKey(memberPosition.getOrganizationId());
-        if(organization.getOrganizationType() != 3){
+        if(organization.getOrganizationType() != Constant.OrganizationType.HOSPITAL.status){
             throw new BaseException(DefaultCodeError.NO_HOSPITAL);
         }
         //根据科室查找模板
@@ -294,4 +315,265 @@ public class FirstAidService implements IFirstAidService{
         List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListBySecretary(hospitalList,param);
         return new PageInfo<>(patientList);
     }
+
+    @Override
+    public void updateStatusBySecretary(PatientDto.StatusBySecretary param, Long userId) {
+        //判断当前用户的职位是否是秘书
+        OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
+        if(!memberPosition.getPositionCode().equalsIgnoreCase(Constant.Position.MI_SHU)){
+            throw new BaseException(DefaultCodeError.NO_POWER);
+        }
+        //查找急救记录
+        FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if(ObjectUtil.isNull(firstAid)){
+            throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
+        }
+        //判断当前病例的状态和要修改的是否一致
+        if(firstAid.getDataStatus() == param.getDataStatus()){
+            throw new BaseException(DefaultCodeError.DATA_STATUS_SAME);
+        }
+        //判断病例状态是否是申请
+        if(firstAid.getDataStatus() != Constant.DataStatus.ApplyFor.status){
+            throw new BaseException(DefaultCodeError.NOT_APPLY_FOR);
+        }
+        //修改状态
+        firstAid.setDataStatus(param.getDataStatus());
+        firstAidDao.updateByPrimaryKeySelective(firstAid);
+        //添加日志
+        FirstAidLog firstAidLog = new FirstAidLog();
+        firstAidLog.setId(snowflake.nextId());
+        firstAidLog.setFirstAidId(firstAid.getId());
+        firstAidLog.setOperationTime(System.currentTimeMillis());
+        firstAidLog.setOperationUserId(userId);
+        firstAidLog.setOperationUserId(userId);
+        firstAidLog.setOperationRole((byte) 4);
+        if(param.getDataStatus() == 0){
+            firstAidLog.setOperationType((byte) 1);
+        }
+        if (param.getDataStatus() == 6){
+            firstAidLog.setOperationType((byte) 2);
+        }
+        firstAidLogDao.insertSelective(firstAidLog);
+    }
+
+    @Override
+    public FirstAidVo.ProjectInfo joinFirstAid(FirstAidDto.JoinFirstAid param, Long userId) {
+        //判断角色是否神内/神外医生
+        OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
+        log.info("当前用户的科室职位信息：{}",memberPosition);
+        if(ObjectUtil.isNull(memberPosition)){
+            throw new BaseException(DefaultCodeError.NO_POWER);
+        }
+        //部门
+        Byte position = null;
+        if (Constant.Department.SHEN_NEI.equals(memberPosition.getDepartmentCode()) || Constant.Department.SHEN_WAI.equals(memberPosition.getDepartmentCode())) {
+            if (Constant.Position.YI_SHENG.equals(memberPosition.getPositionCode())) {
+                position = 1;
+            }
+        }
+        if (ObjectUtil.isNull(position)) {
+            throw new BaseException(DefaultCodeError.NO_POWER);
+        }
+
+        //判断病例是否已有医生加入
+        FirstAidMember firstAidMember = firstAidMemberDao.findByAidId(param.getFirstAidId());
+        if (ObjectUtil.isNotNull(firstAidMember)) {
+            throw new BaseException(DefaultCodeError.DOCTOR_HAS_JOINED);
+        }
+
+        //根据模板类型创建项目
+
+        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        CProjectVo.CopyProjectInfo copyProjectInfo = new CProjectVo.CopyProjectInfo();
+        //如果已有项目则不创建,使用旧项目
+        if (firstAidInfo.getType().equals(param.getType()) && ObjectUtil.isNotNull(firstAidInfo.getProjectId())) {
+            copyProjectInfo.setId(firstAidInfo.getProjectId());
+        }else {
+            CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
+            String newProjectName = "";
+            long incr = redisUtil.incr("hospital_" + firstAidInfo.getHospitalId().toString(), 1L);
+            if (0 == param.getType()){
+                //TODO 设置项目id为神内模板 和 项目名字
+                newProjectName = incr+"-"+"急救(神内)-"+firstAidInfo.getName();
+                copyProject.setProjectName(newProjectName);
+                copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_SHENNEI));
+            }else{
+                //TODO 设置项目id为神外模板 和 项目名字
+                newProjectName = incr+"-"+"急救(神外)-"+firstAidInfo.getName();
+                copyProject.setProjectName(newProjectName);
+                copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_SHENWAI));
+            }
+            log.info("加入急救-开始创建项目{}",copyProject);
+            copyProjectInfo = projectService.copyProject(copyProject, userId);
+            log.info("加入急救-创建项目结束{}",copyProjectInfo);
+        }
+
+
+        //将医生添加为项目成员
+        CProjectDto.MemberForProject memberForProject = new CProjectDto.MemberForProject();
+        List<CProjectDto.MemberInfo> memberInfoList = new ArrayList<>();
+        CProjectDto.MemberInfo memberInfo = new CProjectDto.MemberInfo();
+        memberInfo.setUserId(userId);
+        memberInfo.setMemberName(memberPosition.getName());
+        memberInfo.setPhone(memberPosition.getContact());
+        if (0 == param.getType()){
+            memberInfo.setRoleName(Constant.RoleName.SHEN_NEI);
+        }else{
+            memberInfo.setRoleName(Constant.RoleName.SHEN_WAI);
+        }
+        memberInfoList.add(memberInfo);
+        memberForProject.setProjectId(copyProjectInfo.getId());
+        memberForProject.setMemberInfoList(memberInfoList);
+        log.info("加入急救-开始添加成员{}",memberForProject);
+        projectService.addMemberForCopy(memberForProject,userId);
+        log.info("加入急救-添加成员结束");
+
+        //添加医生为病例的录入者 t_qcp_first_aid_member
+        FirstAidMember newFirstAidMember = new FirstAidMember();
+        newFirstAidMember.setId(snowflake.nextId());
+        newFirstAidMember.setFirstAidId(param.getFirstAidId());
+        newFirstAidMember.setCreateUserId(userId);
+        newFirstAidMember.setRecordUserId(userId);
+        firstAidMemberDao.insertSelective(newFirstAidMember);
+
+        //急救信息和项目关联
+        FirstAid firstAid = new FirstAid();
+        firstAid.setId(param.getFirstAidId());
+        firstAid.setProjectId(copyProjectInfo.getId());
+        firstAidDao.updateByPrimaryKeySelective(firstAid);
+
+        //添加急救日志(类型:加入)
+        FirstAidLog firstAidLog = new FirstAidLog();
+        firstAidLog.setId(snowflake.nextId());
+        firstAidLog.setFirstAidId(param.getFirstAidId());
+        firstAidLog.setOperationTime(System.currentTimeMillis());
+        firstAidLog.setOperationUserId(userId);
+        firstAidLog.setOperationType((byte)7);
+        if (0 == param.getType()){
+            firstAidLog.setOperationRole((byte)1);
+        }else{
+            firstAidLog.setOperationRole((byte)2);
+        }
+        firstAidLogDao.insertSelective(firstAidLog);
+        //返回项目id
+        FirstAidVo.ProjectInfo projectInfo = new FirstAidVo.ProjectInfo();
+        projectInfo.setProjectId(copyProjectInfo.getId());
+        return projectInfo;
+    }
+
+
+    @Override
+    public void quitFirstAid(FirstAidDto.QuitFirstAid param, Long userId) {
+        FirstAidMember byAidId = firstAidMemberDao.findByAidId(param.getFirstAidId());
+        if (ObjectUtil.isNull(byAidId)) {
+            throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
+        }
+        if (!userId.equals(byAidId.getRecordUserId())) {
+            throw new BaseException(DefaultCodeError.REPEAT_QUIT);
+        }
+
+        //添加急救日志(退出)
+        FirstAidLog firstAidLog = new FirstAidLog();
+        firstAidLog.setId(snowflake.nextId());
+        firstAidLog.setFirstAidId(param.getFirstAidId());
+        firstAidLog.setOperationTime(System.currentTimeMillis());
+        firstAidLog.setOperationUserId(userId);
+        firstAidLog.setOperationType((byte)8);
+        //判断角色是否神内/神外医生
+        OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
+        log.info("当前用户的科室职位信息：{}",memberPosition);
+        if (Constant.Department.SHEN_NEI.equals(memberPosition.getDepartmentCode())) {
+            if (Constant.Position.YI_SHENG.equals(memberPosition.getPositionCode())) {
+                firstAidLog.setOperationRole((byte)1);
+            }
+        }
+        if (Constant.Department.SHEN_WAI.equals(memberPosition.getDepartmentCode())) {
+            if (Constant.Position.YI_SHENG.equals(memberPosition.getPositionCode())) {
+                firstAidLog.setOperationRole((byte)2);
+            }
+        }
+        firstAidLogDao.insertSelective(firstAidLog);
+        //修改录入者userId为0
+        byAidId.setRecordUserId(0L);
+        firstAidMemberDao.updateByPrimaryKeySelective(byAidId);
+    }
+
+
+    @Override
+    public void updateStatus(FirstAidDto.UpdateStatus param, Long userId) {
+        //修改病例状态
+        FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        if (ObjectUtil.isNull(firstAid)) {
+            throw new BaseException(DefaultCodeError.NOT_FIRST_AID_ID);
+        }
+        //判断权限
+        OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
+        log.info("当前用户的科室职位信息：{}",memberPosition);
+        if (!Constant.Position.ZHI_KONG.equals(memberPosition.getPositionCode())) {
+            throw new BaseException(DefaultCodeError.NO_POWER);
+        }
+        if (0 == firstAid.getType()) {
+            if (!Constant.Department.SHEN_NEI.equals(memberPosition.getDepartmentCode())) {
+                throw new BaseException(DefaultCodeError.NO_POWER);
+            }
+        }
+        if (1 == firstAid.getType()) {
+            if (!Constant.Department.SHEN_WAI.equals(memberPosition.getDepartmentCode())) {
+                throw new BaseException(DefaultCodeError.NO_POWER);
+            }
+        }
+
+        switch (param.getDataStatus()) {
+            case 1:
+                if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus() && Constant.DataStatus.DischargeRefuse.status != firstAid.getDataStatus()) {
+                    throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+                }
+                break;
+            case 2:
+                if (Constant.DataStatus.Create.status != firstAid.getDataStatus()) {
+                    throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+                }
+                break;
+            case 3:
+                if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus() && Constant.DataStatus.DischargeRefuse.status != firstAid.getDataStatus()) {
+                    throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+                }
+                break;
+            case 4:
+                if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus()) {
+                    throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+                }
+                break;
+            case 5:
+                if (Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.DischargePass.status != firstAid.getDataStatus() && Constant.DataStatus.ApplyForRefuse.status != firstAid.getDataStatus()) {
+                    throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+                }
+                Integer updateNumber = firstAidLogDao.countUpdateNumber(param.getFirstAidId());
+                if (updateNumber >= Constant.MAX_UPDATE_NUMBER) {
+                    throw new BaseException(DefaultCodeError.SURPASS_MAX_NUMBER);
+                }
+                break;
+            default:
+                throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
+        }
+        firstAid.setDataStatus(param.getDataStatus());
+        firstAidDao.updateByPrimaryKeySelective(firstAid);
+        //添加日志
+        FirstAidLog firstAidLog = new FirstAidLog();
+        firstAidLog.setId(snowflake.nextId());
+        firstAidLog.setFirstAidId(param.getFirstAidId());
+        firstAidLog.setOperationTime(System.currentTimeMillis());
+        firstAidLog.setOperationUserId(userId);
+        if (1 == param.getDataStatus() || 3 == param.getDataStatus()){
+            firstAidLog.setOperationType((byte)1);
+        }
+        if (2 == param.getDataStatus() || 4 == param.getDataStatus()){
+            firstAidLog.setOperationType((byte)2);
+        }
+        if (5 == param.getDataStatus()){
+            firstAidLog.setOperationType((byte)3);
+        }
+        firstAidLog.setOperationRole((byte)3);
+        firstAidLogDao.insertSelective(firstAidLog);
+    }
 }

src/main/java/com/ccsens/carbasics/service/IFirstAidService.java

@@ -1,6 +1,9 @@
 package com.ccsens.carbasics.service;
 
+
+import com.ccsens.carbasics.bean.dto.FirstAidDto;
 import com.ccsens.carbasics.bean.dto.PatientDto;
+import com.ccsens.carbasics.bean.vo.FirstAidVo;
 import com.ccsens.carbasics.bean.vo.PatientVo;
 import com.github.pagehelper.PageInfo;
 
@@ -51,4 +54,34 @@ public interface IFirstAidService {
      * @return 返回急救信息列表
      */
     PageInfo<PatientVo.PatientListByQuality> queryPatientListBySecretary(PatientDto.QueryListByQuality param, Long userId);
+
+    /**
+     * 秘书修改急救状态
+     * @param param 修改的状态
+     * @param userId userId
+     */
+    void updateStatusBySecretary(PatientDto.StatusBySecretary param, Long userId);
+
+    /**
+     * 医生加入急救
+     * @param param 参数
+     * @param userId 用户id
+     * @return 项目id
+     */
+    FirstAidVo.ProjectInfo joinFirstAid(FirstAidDto.JoinFirstAid param, Long userId);
+
+    /**
+     * 退出急救
+     * @param param 急救id
+     * @param userId 当前用户id
+     */
+    void quitFirstAid(FirstAidDto.QuitFirstAid param, Long userId);
+
+    /**
+     * 修改病例状态
+     * @param param 急救状态/FirstAidId
+     * @param userId    当前用户id
+     */
+    void updateStatus(FirstAidDto.UpdateStatus param, Long userId);
+
 }

src/main/java/com/ccsens/carbasics/util/Constant.java

@@ -36,11 +36,37 @@ public class Constant {
         public static final String HU_SHI = "HuShi";
         /**医生*/
         public static final String YI_SHENG = "YiSheng";
+        /**秘书*/
+        public static final String MI_SHU = "MiShu";
+        /**质控员*/
+        public static final String ZHI_KONG = "ZhiKong";
     }
+    public enum OrganizationType {
+        /**
+         * 职位归属 0：省卫健委 1：省质控 2：市质控 3：医院'
+         */
+        SWJW((byte) 0, "省卫健委"),
+        PROVINCE_QUALITY((byte) 1, "省质控"),
+        CITY_QUALITY((byte) 2, "市质控"),
+        HOSPITAL((byte) 3, "医院");
+        public byte status;
+        public String message;
 
+        OrganizationType(byte status, String message) {
+            this.status = status;
+            this.message = message;
+        }
+    }
+    /** 项目中的角色名称 */
+    public static final class RoleName {
+        /**神内医生*/
+        public static final String SHEN_NEI = "神内医生";
+        /**神外医生*/
+        public static final String SHEN_WAI = "神外医生";
+    }
     public enum DataStatus {
         /**
-         *
+         * 病例状态
          */
         Create((byte) 0,"创建"),
         FirstAidPass((byte) 1,"急救审核通过"),
@@ -113,6 +139,8 @@ public class Constant {
         public static final String JMRSSJ = "JMRSSJ";
         /**CT开始时间*/
         public static final String CT_START = "CT-START";
+        /**意思诊断*/
+        public static final String CJBL_YSBL = "CJBL-YSBL";
     }
 
 
@@ -141,7 +169,18 @@ public class Constant {
     }
 
     /**
-     * 创建病例:模板项目id
+     * 创建病例:模板项目id神内
      */
-    public static final String TEMPLATE_PROJECT_KEY = "template_project_key";
+    public static final String TEMPLATE_PROJECT_KEY_SHENNEI = "template_project_key_shennei";
+    /**
+     * 创建病例:模板项目id神外
+     */
+    public static final String TEMPLATE_PROJECT_KEY_SHENWAI = "template_project_key_shenwai";
+
+
+    /**
+     * 最大修改次数
+     */
+    public static final Integer MAX_UPDATE_NUMBER = 1;
+
 }

src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java

@@ -8,33 +8,40 @@ import com.ccsens.util.CodeError;
 public class DefaultCodeError extends CodeError {
 
     public static final Code NOT_WBS_SHEET = new Code(1,"找不到wbs表",true);
-    public static final Code NOT_MEMBER_SHEET = new Code(1,"找不到项目成员表",true);
+    public static final Code NOT_MEMBER_SHEET = new Code(2,"找不到项目成员表",true);
-    public static final Code WSB_NOT_PROJECT_HEADER = new Code(2,"读取项目信息异常",true);
+    public static final Code WSB_NOT_PROJECT_HEADER = new Code(3,"读取项目信息异常",true);
-    public static final Code WSB_NOT_TASK_HEADER = new Code(3,"读取任务分解异常",true);
+    public static final Code WSB_NOT_TASK_HEADER = new Code(4,"读取任务分解异常",true);
-    public static final Code WBS_PROJECT_TIME_ERROR = new Code(4,"时间格式异常", true);
+    public static final Code WBS_PROJECT_TIME_ERROR = new Code(5,"时间格式异常", true);
-    public static final Code WBS_PHONE_ERROR = new Code(5,"手机号格式错误", true);
+    public static final Code WBS_PHONE_ERROR = new Code(6,"手机号格式错误", true);
-    public static final Code WBS_NOT_FIRST_ROLE = new Code(6,"系统角色名称错误", true);
+    public static final Code WBS_NOT_FIRST_ROLE = new Code(7,"系统角色名称错误", true);
-    public static final Code WBS_NOT_FIND_ROLE = new Code(7,"未找到对应的角色", true);
+    public static final Code WBS_NOT_FIND_ROLE = new Code(8,"未找到对应的角色", true);
-    public static final Code FILE_FORMAT_ERROR = new Code(8,"不支持的格式类型", true);
+    public static final Code FILE_FORMAT_ERROR = new Code(9,"不支持的格式类型", true);
-    public static final Code WBS_NOT_PROJECT_TIME = new Code(9,"项目时间不能为空", true);
+    public static final Code WBS_NOT_PROJECT_TIME = new Code(10,"项目时间不能为空", true);
-    public static final Code TASK_VITAL_LABEL_ERROR = new Code(9,"任务标签异常", true);
+    public static final Code TASK_VITAL_LABEL_ERROR = new Code(11,"任务标签异常", true);
-    public static final Code WBS_NOT_PROJECT_NAME = new Code(10,"项目名称不能为空", true);
+    public static final Code WBS_NOT_PROJECT_NAME = new Code(12,"项目名称不能为空", true);
-    public static final Code PLUGIN_NAME_ERROR = new Code(10,"请填写正确的插件名称", true);
+    public static final Code PLUGIN_NAME_ERROR = new Code(13,"请填写正确的插件名称", true);
-    public static final Code NOT_QUESTION_CODE = new Code(11,"请输入题目code", true);
+    public static final Code NOT_QUESTION_CODE = new Code(14,"请输入题目code", true);
-    public static final Code NOT_HOSPITAL_SERIAL = new Code(12,"请填入正确的医院编号", true);
+    public static final Code NOT_HOSPITAL_SERIAL = new Code(15,"请填入正确的医院编号", true);
-    public static final Code NOT_FIRST_AID_ID = new Code(13,"请填入正确的急救信息", true);
+    public static final Code NOT_FIRST_AID_ID = new Code(16,"请填入正确的急救信息", true);
-    public static final Code PARAM_ERROR = new Code(14,"请检查输入内容后重新尝试。", true);
+    public static final Code PARAM_ERROR = new Code(17,"请检查输入内容后重新尝试。", true);
-    public static final Code PROJECT_ERROR = new Code(15,"项目信息异常", true);
+    public static final Code PROJECT_ERROR = new Code(18,"项目信息异常", true);
-    public static final Code ARRIVE_WORKER_ERROR = new Code(16,"到场人员信息错误", true);
+    public static final Code ARRIVE_WORKER_ERROR = new Code(19,"到场人员信息错误", true);
-    public static final Code NO_POWER = new Code(17,"权限不足", true);
+    public static final Code NO_POWER = new Code(20,"权限不足", true);
-    public static final Code NO_HOSPITAL = new Code(18,"未查到对应的医院信息", true);
+    public static final Code NO_HOSPITAL = new Code(21,"未查到对应的医院信息", true);
-    public static final Code NO_DATA_MODIFY_PRIVILEGE = new Code(19,"没有操作权限", true);
+    public static final Code NO_DATA_MODIFY_PRIVILEGE = new Code(22,"没有操作权限", true);
-    public static final Code IDCARD_ERROR = new Code(20,"请输入正确的身份证号", true);
+    public static final Code IDCARD_ERROR = new Code(23,"请输入正确的身份证号", true);
-    public static final Code NOT_TEMPLATE = new Code(21,"科室没有病例类型配置，请联系运维人员", true);
+    public static final Code NOT_TEMPLATE = new Code(24,"科室没有病例类型配置，请联系运维人员", true);
-    public static final Code NOT_HOSPITAL_ID = new Code(22,"医院信息尚未配置，请联系运维人员", true);
+    public static final Code NOT_HOSPITAL_ID = new Code(25,"医院信息尚未配置，请联系运维人员", true);
-    public static final Code NOT_ORGANIZATION = new Code(23,"机构信息尚未配置，请联系运维人员", true);
+    public static final Code NOT_ORGANIZATION = new Code(26,"机构信息尚未配置，请联系运维人员", true);
-    public static final Code PROJECT_NAME_REPEAT = new Code(24,"项目名称重复", true);
+    public static final Code PROJECT_NAME_REPEAT = new Code(27,"项目名称重复", true);
-    public static final Code FEIGN_ERROR = new Code(25,"导入项目失败", true);
+    public static final Code FEIGN_ERROR = new Code(28,"导入项目失败", true);
+    public static final Code DOCTOR_HAS_JOINED = new Code(29,"已有医生加入", true);
+    public static final Code REPEAT_QUIT = new Code(30,"您已经不是录入者,无需重复退出", true);
+    public static final Code DATA_STATUS_ERROR = new Code(31,"请先完成之前的审核", true);
+    public static final Code SURPASS_MAX_NUMBER = new Code(32,"超过最大申请修改次数", true);
+    public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
+    public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改，无法修改状态", true);
+
 
 
 

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: test.tall.wiki
+    host: dd.tall.wiki
     password: 111111
     port: 5672
     username: admin

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -124,16 +124,18 @@
         FROM
         (
             SELECT
-            id,
+            id as firstAidId,
-            NAME,
+            `name`,
             gender,
             age,
-            type,
+            `type`,
+            nation,
+            idcard,
             data_status AS dataStatus
             FROM
             t_qcp_first_aid
             WHERE
-            data_status = #{param.dataStatus}
+            data_status in (1,3,5,6)
             <if test="param.name!=null and param.name!=''">
                 AND `name` LIKE concat('%',#{param.name},'%')
             </if>
@@ -145,7 +147,6 @@
             <foreach collection="hospitalList" open="(" close=")" separator="," item="hospitalId">
                 #{hospitalId}
             </foreach>
-            AND data_status in (1,3,5,6)
         ) t
         LEFT JOIN t_qcp_first_aid_record t1 ON t.id = t1.first_aid_id
         AND t1.question_code = 'JBXX-ZYH'

src/main/resources/mapper_dao/FirstAidLogDao.xml

@@ -32,4 +32,16 @@
             AND l.rec_status = 0
             AND m.rec_status = 0
     </select>
+
+    <select id="countUpdateNumber" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            t_qcp_first_aid_log
+        WHERE
+            rec_status = 0
+        AND first_aid_id = #{firstAidId}
+        AND operation_type = 3
+        AND operation_role = 3
+    </select>
 </mapper>

src/main/resources/mapper_dao/FirstAidMemberDao.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.carbasics.persist.dao.FirstAidMemberDao">
+
+    <select id="findByAidId" resultType="com.ccsens.carbasics.bean.po.FirstAidMember">
+        SELECT
+            id,
+            first_aid_id,
+            create_user_id,
+            record_user_id
+        FROM
+            t_qcp_first_aid_member
+        WHERE
+            rec_status = 0
+        AND first_aid_id = #{firstAidId}
+        LIMIT 1
+    </select>
+
+</mapper>

src/main/resources/mapper_dao/OrganizationMemberDao.xml

@@ -7,6 +7,7 @@
         m.id,
         m.`name`,
         p.id as positionId,
+        m.`contact`,
         p.`code` as positionCode,
         d.id as departmentId,
         d.`code` as departmentCode,