1: 问诊大厅 分页查询病例信息列表接口设置查询结果为已发布的数据

2. manage：添加修改病历状态的接口
3. 重构queryMedicalRecManagePage接口入参

docker/v3.0.0/step1.sql

@@ -91,4 +91,6 @@ alter table vp_process
     add evaluate_remark varchar(1024) null comment '评价备注内容';
 
 alter table vp_medical_rec
-    add status integer default 1 null comment '上线状态 1：未上线 2：已经上线   状态为未上线且病历未出现在vp_process表中使用可以进行删除' after medical_record_ai;
+    add status integer default 1 null comment '上线状态 1：未上线 2：已经上线   状态为未上线且病历未出现在vp_process表中使用可以进行删除' after medical_record_ai;
+-- 把原有的数据状态改成上线
+update vp_medical_rec set status = 2;

virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java

@@ -132,5 +132,13 @@ public class MedicalRecManageController {
     }
 
 
+    @Operation(summary = "修改病历状态")
+    @GetMapping("/updateMedicalStatus")
+    public Boolean updateMedicalStatus(@Parameter(name = "medicalRecId", description = "病例id") String medicalRecId,
+                                                    @Parameter(name = "status", description = "病历状态 1：未上线 2：上线") Integer status) {
+
+        return medicalRecManageService.updateMedicalStatus(medicalRecId,status);
+    }
+
 
 }

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

@@ -48,4 +48,6 @@ public interface MedicalRecManageService {
     List<MedicalRecQaVO> queryMedicalDefaultAnswer(String medicalRecId);
 
     void downloadMedicalAnswerTemplate(HttpServletResponse response) throws Exception;
+
+    Boolean updateMedicalStatus(String medicalRecId, Integer status);
 }

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

@@ -16,10 +16,7 @@ import com.supervision.manage.service.*;
 import com.supervision.model.*;
 import com.supervision.model.Process;
 import com.supervision.service.*;
-import com.supervision.vo.manage.DiseaseAncillaryResVo;
+import com.supervision.vo.manage.*;
-import com.supervision.vo.manage.DiseasePhysicalResVo;
-import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
-import com.supervision.vo.manage.MedicalRecPageResVO;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -83,7 +80,12 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
     public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName,
                                                                 String diseaseId, Integer pageNum, Integer pageSize) {
         // 注意,这里的diseaseId不支持查询复杂疾病,如果需要支持复杂疾病,这里需要单独进行改造
-        return medicalRecService.queryMedicalRecManagePage(selfDescKeyword, gender, patientName, diseaseId, pageNum, pageSize);
+        MedicalRecPageReqVO medicalRecPageReqVO = new MedicalRecPageReqVO();
+        medicalRecPageReqVO.setSelfDescKeyword(selfDescKeyword);
+        medicalRecPageReqVO.setGender(gender);
+        medicalRecPageReqVO.setPatientName(patientName);
+        medicalRecPageReqVO.setDiseaseId(diseaseId);
+        return medicalRecService.queryMedicalRecManagePage(medicalRecPageReqVO, pageNum, pageSize);
     }
 
     @Override
@@ -401,4 +403,15 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
 
         IoUtil.copy(resource.getInputStream(),outputStream);
     }
+
+    @Override
+    public Boolean updateMedicalStatus(String medicalRecId, Integer status) {
+
+        Assert.notEmpty(medicalRecId, "medicalRecId不能为空");
+        MedicalRec medicalRec = medicalRecService.getById(medicalRecId);
+        Assert.notNull(medicalRec, "未找到该病历");
+
+        return medicalRecService.lambdaUpdate().eq(MedicalRec::getId, medicalRecId).set(MedicalRec::getStatus, status).update();
+
+    }
 }

virtual-patient-model/src/main/java/com/supervision/mapper/MedicalRecMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.model.MedicalRec;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.manage.MedicalRecPageReqVO;
 import com.supervision.vo.manage.MedicalRecPageResVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,17 +18,13 @@ public interface MedicalRecMapper extends BaseMapper<MedicalRec> {
 
     /**
      * 后台管理-病历管理-列表查询
-     *
+     * @param medicalRecPageReqVO 查询参数
-     * @param selfDescKeyword 主诉
+     * @param page 分页参数
-     * @param gender          性别
+     * @return
-     * @param diseaseId       疾病ID
-     * @param page            分页
-     * @return 结果
      */
-    IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@Param("selfDescKeyword") String selfDescKeyword,
-                                                         @Param("gender") String gender,@Param("patientName") String patientName,
-                                                         @Param("diseaseId") String diseaseId, @Param("page") Page<MedicalRecPageResVO> page);
 
+    IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@Param("medicalRecPageReqVO") MedicalRecPageReqVO medicalRecPageReqVO,
+                                                         @Param("page") Page<MedicalRecPageResVO> page);
     /**
      * 生成一个病历编码,是最大的病历编码+1
      * @param code 医院名称缩写

virtual-patient-model/src/main/java/com/supervision/service/MedicalRecService.java

@@ -1,9 +1,9 @@
 package com.supervision.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.supervision.model.AskPatientAnswer;
 import com.supervision.model.MedicalRec;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.supervision.vo.manage.MedicalRecPageReqVO;
 import com.supervision.vo.manage.MedicalRecPageResVO;
 
 /**
@@ -14,13 +14,13 @@ import com.supervision.vo.manage.MedicalRecPageResVO;
 public interface MedicalRecService extends IService<MedicalRec> {
 
     /**
-     * 后台管理-病历管理-列表查询
+     * 分页查询病历管理列表
-     * @param selfDescKeyword 主诉
+     * @param medicalRecPageReqVO
-     * @param gender 性别
+     * @param pageNum
-     * @param diseaseId 疾病ID
+     * @param pageSize
-     * @return 结果
+     * @return
      */
-    IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName, String diseaseId, Integer pageNum, Integer pageSize);
+    IPage<MedicalRecPageResVO> queryMedicalRecManagePage(MedicalRecPageReqVO medicalRecPageReqVO, Integer pageNum, Integer pageSize);
 
     /**
      * 生成一个病历编码,是最大的病历编码+1

virtual-patient-model/src/main/java/com/supervision/service/impl/MedicalRecServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.MedicalRec;
 import com.supervision.service.MedicalRecService;
 import com.supervision.mapper.MedicalRecMapper;
+import com.supervision.vo.manage.MedicalRecPageReqVO;
 import com.supervision.vo.manage.MedicalRecPageResVO;
 import org.springframework.stereotype.Service;
 
@@ -18,16 +19,17 @@ import org.springframework.stereotype.Service;
 public class MedicalRecServiceImpl extends ServiceImpl<MedicalRecMapper, MedicalRec>
     implements MedicalRecService{
 
+
     /**
-     * 后台管理-病历管理-列表查询
+     * 病历管理-列表查询
-     * @param selfDescKeyword 主诉
+     * @param medicalRecPageReqVO
-     * @param gender 性别
+     * @param pageNum
-     * @param diseaseId 疾病ID
+     * @param pageSize
-     * @return 结果
+     * @return
      */
     @Override
-    public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName, String diseaseId, Integer pageNum, Integer pageSize) {
+    public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(MedicalRecPageReqVO medicalRecPageReqVO, Integer pageNum, Integer pageSize) {
-        return this.baseMapper.queryMedicalRecManagePage(selfDescKeyword, gender, patientName, diseaseId, new Page<>(pageNum,pageSize));
+        return this.baseMapper.queryMedicalRecManagePage(medicalRecPageReqVO, new Page<>(pageNum,pageSize));
     }
 
     /**

virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageReqVO.java

@@ -0,0 +1,17 @@
+package com.supervision.vo.manage;
+
+import lombok.Data;
+
+@Data
+public class MedicalRecPageReqVO {
+
+    private String selfDescKeyword;
+
+    private String gender;
+
+    private String patientName;
+
+    private String diseaseId;
+
+    private Integer status;
+}

virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java

@@ -30,5 +30,7 @@ public class MedicalRecPageResVO {
      */
     private String diagnosisPrimaryStr;
 
+    @Schema(description = "病历状态 1：未上线 2：上线")
+    private String status;
 
 }

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

@@ -68,21 +68,25 @@
         t1.patient_gender as gender,
         t1.patient_head_pic as patientHeadPic,
         t1.patient_self_desc as patientSelfDesc,
+        t1.status as status,
         if(t1.update_time is null, t1.create_time, t1.update_time) as time
         from vp_medical_rec t1
         left join vp_disease t3 on t1.disease_id = t3.id
         <where>
-            <if test="selfDescKeyword != null and selfDescKeyword != ''">
+            <if test="medicalRecPageReqVO.selfDescKeyword != null and medicalRecPageReqVO.selfDescKeyword != ''">
-                AND t1.patient_self_desc like concat("%",#{selfDescKeyword}, "%")
+                AND t1.patient_self_desc like concat("%",#{medicalRecPageReqVO.selfDescKeyword}, "%")
             </if>
-            <if test="gender != null and gender != ''">
+            <if test="medicalRecPageReqVO.gender != null and medicalRecPageReqVO.gender != ''">
-                AND t1.patient_gender = #{gender}
+                AND t1.patient_gender = #{medicalRecPageReqVO.gender}
             </if>
-            <if test="diseaseId != null and diseaseId != ''">
+            <if test="medicalRecPageReqVO.diseaseId != null and medicalRecPageReqVO.diseaseId != ''">
-                AND t1.disease_id = #{diseaseId}
+                AND t1.disease_id = #{medicalRecPageReqVO.diseaseId}
             </if>
-            <if test="patientName != null and patientName != ''">
+            <if test="medicalRecPageReqVO.patientName != null and medicalRecPageReqVO.patientName != ''">
-                AND t1.patient_name like concat("%",#{patientName}, "%")
+                AND t1.patient_name like concat("%",#{medicalRecPageReqVO.patientName}, "%")
+            </if>
+            <if test="medicalRecPageReqVO.status != null">
+                AND t1.status = #{medicalRecPageReqVO.status}
             </if>
         </where>
         order by time desc

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.model.*;
 import com.supervision.service.*;
 import com.supervision.vo.ask.DiagnosisPrimaryVO;
+import com.supervision.vo.manage.MedicalRecPageReqVO;
 import com.supervision.vo.manage.MedicalRecPageResVO;
 import com.supervision.vo.result.DiagnoseProcessReqVo;
 import com.supervision.vo.result.DiagnoseProcessResVo;
@@ -74,8 +75,9 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService {
 
     @Override
     public IPage<MedicalRecPageResVO> queryMedicalRecPageList(Integer pageNum, Integer pageSize) {
-
+        MedicalRecPageReqVO medicalRecPageReqVO = new MedicalRecPageReqVO();
-        IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(null, null, null,null, pageNum, pageSize);
+        medicalRecPageReqVO.setStatus(2);// 设置为已发布的数据
+        IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(medicalRecPageReqVO, pageNum, pageSize);
         if (CollUtil.isEmpty(medicalRecPageResVOIPage.getRecords())){
             return medicalRecPageResVOIPage;
         }