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

2. manage:添加修改病历状态的接口
3. 重构queryMedicalRecManagePage接口入参
pull/1/head
xueqingkun 11 months ago
parent 9c6e740441
commit 91f5b56466

@ -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;

@ -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);
}
}

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

@ -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.DiseasePhysicalResVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import com.supervision.vo.manage.MedicalRecPageResVO;
import com.supervision.vo.manage.*;
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();
}
}

@ -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 selfDescKeyword
* @param gender
* @param diseaseId ID
* @param page
* @return
* @param medicalRecPageReqVO
* @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

@ -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 gender
* @param diseaseId ID
* @return
*
* @param medicalRecPageReqVO
* @param pageNum
* @param pageSize
* @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

@ -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 gender
* @param diseaseId ID
* @return
* -
* @param medicalRecPageReqVO
* @param pageNum
* @param pageSize
* @return
*/
@Override
public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName, String diseaseId, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryMedicalRecManagePage(selfDescKeyword, gender, patientName, diseaseId, new Page<>(pageNum,pageSize));
public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(MedicalRecPageReqVO medicalRecPageReqVO, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryMedicalRecManagePage(medicalRecPageReqVO, new Page<>(pageNum,pageSize));
}
/**

@ -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;
}

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

@ -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 != ''">
AND t1.patient_self_desc like concat("%",#{selfDescKeyword}, "%")
<if test="medicalRecPageReqVO.selfDescKeyword != null and medicalRecPageReqVO.selfDescKeyword != ''">
AND t1.patient_self_desc like concat("%",#{medicalRecPageReqVO.selfDescKeyword}, "%")
</if>
<if test="gender != null and gender != ''">
AND t1.patient_gender = #{gender}
<if test="medicalRecPageReqVO.gender != null and medicalRecPageReqVO.gender != ''">
AND t1.patient_gender = #{medicalRecPageReqVO.gender}
</if>
<if test="diseaseId != null and diseaseId != ''">
AND t1.disease_id = #{diseaseId}
<if test="medicalRecPageReqVO.diseaseId != null and medicalRecPageReqVO.diseaseId != ''">
AND t1.disease_id = #{medicalRecPageReqVO.diseaseId}
</if>
<if test="patientName != null and patientName != ''">
AND t1.patient_name like concat("%",#{patientName}, "%")
<if test="medicalRecPageReqVO.patientName != null and medicalRecPageReqVO.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

@ -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) {
IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(null, null, null,null, pageNum, pageSize);
MedicalRecPageReqVO medicalRecPageReqVO = new MedicalRecPageReqVO();
medicalRecPageReqVO.setStatus(2);// 设置为已发布的数据
IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(medicalRecPageReqVO, pageNum, pageSize);
if (CollUtil.isEmpty(medicalRecPageResVOIPage.getRecords())){
return medicalRecPageResVOIPage;
}

Loading…
Cancel
Save