修改接口问题2021-09-02

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

@@ -69,9 +69,9 @@ public class FirstAidController {
     @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);
+        log.info("修改病例状态：{}", params);
         firstAidService.updateStatus(params.getParam(), params.getUserId());
-        log.info("查询自己相关的病例列表成功");
+        log.info("修改病例状态成功");
         return JsonResponse.newInstance().ok();
     }
 

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

@@ -377,7 +377,7 @@ public class FirstAidService implements IFirstAidService{
 
         //判断病例是否已有医生加入
         FirstAidMember firstAidMember = firstAidMemberDao.findByAidId(param.getFirstAidId());
-        if (ObjectUtil.isNotNull(firstAidMember)) {
+        if (0 != firstAidMember.getRecordUserId() && ObjectUtil.isNotNull(firstAidMember.getRecordUserId())) {
             throw new BaseException(DefaultCodeError.DOCTOR_HAS_JOINED);
         }
 
@@ -386,7 +386,7 @@ public class FirstAidService implements IFirstAidService{
         FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
         CProjectVo.CopyProjectInfo copyProjectInfo = new CProjectVo.CopyProjectInfo();
         //如果已有项目则不创建,使用旧项目
-        if (firstAidInfo.getType().equals(param.getType()) && ObjectUtil.isNotNull(firstAidInfo.getProjectId())) {
+        if (firstAidInfo.getType().equals(param.getType()) && 0 != firstAidInfo.getProjectId()) {
             copyProjectInfo.setId(firstAidInfo.getProjectId());
         }else {
             CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
@@ -429,17 +429,14 @@ public class FirstAidService implements IFirstAidService{
         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);
+        firstAidMember.setRecordUserId(userId);
+        firstAidMemberDao.updateByPrimaryKeySelective(firstAidMember);
 
         //急救信息和项目关联
         FirstAid firstAid = new FirstAid();
         firstAid.setId(param.getFirstAidId());
         firstAid.setProjectId(copyProjectInfo.getId());
+        firstAid.setType(param.getType());
         firstAidDao.updateByPrimaryKeySelective(firstAid);
 
         //添加急救日志(类型:加入)
@@ -545,13 +542,13 @@ public class FirstAidService implements IFirstAidService{
                 }
                 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);
                 }
+                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);
+                }
                 break;
             default:
                 throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
@@ -564,15 +561,7 @@ public class FirstAidService implements IFirstAidService{
         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.setOperationType(param.getDataStatus());
         firstAidLog.setOperationRole((byte)3);
         firstAidLogDao.insertSelective(firstAidLog);
     }

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

@@ -37,7 +37,7 @@ public class DefaultCodeError extends CodeError {
     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 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/mapper_dao/FirstAidLogDao.xml

@@ -41,7 +41,7 @@
         WHERE
             rec_status = 0
         AND first_aid_id = #{firstAidId}
-        AND operation_type = 3
+        AND operation_type = 5
         AND operation_role = 3
     </select>
 </mapper>