Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java

@@ -17,6 +17,8 @@ import com.supervision.manage.service.ProcessRecordService;
 import com.supervision.service.ProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.supervision.model.Process;
 
 import java.util.*;
 import java.util.function.Function;
@@ -83,6 +85,7 @@ public class ProcessRecordServiceImpl implements ProcessRecordService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ProcessEvaluation saveOrUpdateProcessEvaluation(ProcessEvaluation processEvaluation) {
         // 如果processId不为空,校验是否已经存在
         if (StrUtil.isNotBlank(processEvaluation.getProcessId())) {
@@ -94,6 +97,8 @@ public class ProcessRecordServiceImpl implements ProcessRecordService {
             });
         }
         processEvaluationService.saveOrUpdate(processEvaluation);
+        // 状态更新为已评估
+        processService.lambdaUpdate().set(Process::getStatus, 3).eq(Process::getId, processEvaluation.getProcessId()).update();
         return processEvaluation;
     }
 

virtual-patient-model/src/main/java/com/supervision/model/Process.java

@@ -49,9 +49,10 @@ public class Process implements Serializable {
     /**
      * 待问诊状态:新建成功后默认就是待问诊状态
      * 待处置：诊毕后，进入待处置
-     * 已评估状态：处置结束，系统自动评估，就是已评估状态
+     * 问诊结束：处置结束，系统自动评估，就是系统已评估
+     * 教师已评估:后台系统教师评估
      */
-    @ApiModelProperty("任务状态  0:待问诊 1:待处置 2:已评估")
+    @ApiModelProperty("任务状态  0:待问诊 1:待处置 2:问诊结束(系统已评估) 3 已评估(教师已评估)")
     private Integer status;
 
     @ApiModelProperty("实例类型 0：学习实例 1:考核实例")

virtual-patient-model/src/main/java/com/supervision/vo/result/ProcessRecordVO.java

@@ -35,8 +35,8 @@ public class ProcessRecordVO {
     @ApiModelProperty("疾病分类")
     private String diseaseType;
 
-    @ApiModelProperty("状态 2:已评估 其他未评估")
+    @ApiModelProperty("状态 3:已评估 其他未评估")
-    private String status;
+    private Integer status;
 
     @ApiModelProperty("更新时间(问诊实例的时间)")
     private String updateTime;