web: 问诊大厅添加删除问诊功能

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

@@ -64,6 +64,9 @@ public class Process implements Serializable {
     @ApiModelProperty("结束问诊时间")
     private LocalDateTime finishAskTime;
 
+    @ApiModelProperty("删除标识 0:未删除 1:删除")
+    private Integer deleteFlag;
+
     /**
      * 创建人ID
      */

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

@@ -11,4 +11,7 @@ public class DiagnoseProcessReqVo {
 
     @ApiModelProperty("主诉")
     private String patientSelfDesc;
+
+    @ApiModelProperty("删除标识 0:未删除 1:删除")
+    private Integer deleteFlag;
 }

virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml

@@ -14,6 +14,7 @@
         <result property="status" column="status" jdbcType="INTEGER"/>
         <result property="processType" column="process_type" jdbcType="INTEGER"/>
         <result property="finishAskTime" column="finish_ask_time" jdbcType="TIMESTAMP"/>
+        <result property="deleteFlag" column="delete_flag" jdbcType="INTEGER"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -21,8 +22,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id
+        id,process_no,patient_id,user_id,status,process_type,
-        ,process_no,patient_id,user_id,status,process_type,finish_ask_time,graph_id,
+          finish_ask_time,graph_id,delete_flag,
         create_user_id,create_time,update_user_id,update_time
     </sql>
 
@@ -48,6 +49,9 @@
         <if test="diagnoseProcess.patientSelfDesc != null and diagnoseProcess.patientSelfDesc != ''">
             AND mre.patient_self_desc like concat("%",#{diagnoseProcess.patientSelfDesc}, "%")
         </if>
+        <if test="diagnoseProcess.deleteFlag != null ">
+            AND pro.delete_flag = #{diagnoseProcess.deleteFlag}
+        </if>
         ORDER BY pro.update_time desc
     </sql>
 

virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java

@@ -37,6 +37,7 @@ public class AskProcessServiceImpl implements AskProcessService {
         process.setCreateUserId(user.getId());
         process.setUpdateUserId(user.getId());
         process.setProcessType(0);//默认学习类型
+        process.setDeleteFlag(0);//默认未删除
         process.setProcessNo(RedisSequenceUtil.getProcessNo());
         processService.save(process);
         return process;
@@ -51,6 +52,9 @@ public class AskProcessServiceImpl implements AskProcessService {
     public boolean deleteDiagnosisProcess(String processId) {
         Assert.notEmpty(processId,"问诊实例不能为空");
 
-        return processService.removeById(processId);
+        Process process = processService.getById(processId);
+        Assert.notNull(process,"未找到该实例");
+        process.setDeleteFlag(1);
+        return processService.updateById(process);
     }
 }

virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java

@@ -43,6 +43,7 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService {
         Assert.notEmpty(diagnoseProcessReqVo.getUserId(),"用户id不允许为空");
 
         // 1.查询诊断列表
+        diagnoseProcessReqVo.setDeleteFlag(0);
         Page<DiagnoseProcessResVo> diagnoseProcessResVoPage = processService.queryUserDiagnoseProcessPageList(new Page<>(pageNum, pageSize), diagnoseProcessReqVo);
         if (diagnoseProcessResVoPage.getSize()==0){
             return diagnoseProcessResVoPage;

virtual-patient-web/src/main/resources/sqlScript/todo.sql

@@ -112,4 +112,8 @@ alter table vp_process
     add graph_id varchar(64) null comment '图谱ID' after disease_id;
 
 alter table vp_ask_patient_answer
-    add question varchar(512) null comment '问题 用于病例问题展示' after code;
+    add question varchar(512) null comment '问题 用于病例问题展示' after code;
+
+
+alter table vp_process
+    add delete_flag int default 0 null comment '删除标识 0:未删除 1:删除' after finish_ask_time;