From 8e534feb2e9932d29562f1b157c742db1279ea2f Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Tue, 11 Jun 2024 09:49:34 +0800
Subject: [PATCH] =?UTF-8?q?1:=20=E7=97=85=E5=8E=86=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=97=85=E4=BA=BA=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/medicalrec/MedicalRecManageController.java | 3 ++-
.../supervision/manage/service/MedicalRecManageService.java | 3 ++-
.../manage/service/impl/MedicalRecManageServiceImpl.java | 5 +++--
.../main/java/com/supervision/mapper/MedicalRecMapper.java | 2 +-
.../main/java/com/supervision/service/MedicalRecService.java | 2 +-
.../com/supervision/service/impl/MedicalRecServiceImpl.java | 4 ++--
.../src/main/resources/mapper/MedicalRecMapper.xml | 3 +++
.../supervision/service/impl/DiagnoseHallServiceImpl.java | 2 +-
8 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
index 09237949..a80b4a15 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java
@@ -46,9 +46,10 @@ public class MedicalRecManageController {
@GetMapping("queryMedicalRecPage")
public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@Parameter(name = "selfDescKeyword", description = "主诉") String selfDescKeyword,
@Parameter(name = "gender", description = "性别") String gender,
+ @Parameter(name = "patientName", description = "患者姓名 v1.3 新加字段") String patientName,
@Parameter(name = "diseaseId", description = "疾病ID") String diseaseId,
Integer pageNum, Integer pageSize) {
- return medicalRecManageService.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, pageNum, pageSize);
+ return medicalRecManageService.queryMedicalRecManagePage(selfDescKeyword, gender,patientName, diseaseId, pageNum, pageSize);
}
@Operation(summary = "创建病历")
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
index b03570fd..97f420b4 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java
@@ -21,7 +21,8 @@ public interface MedicalRecManageService {
List<Disease> queryDiseaseListByCreat();
- IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender, String diseaseId, Integer pageNum, Integer pageSize);
+ IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName,
+ String diseaseId, Integer pageNum, Integer pageSize);
void createMedicalRec(MedicalRecManageVO reqVO);
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java
index 2f913b6d..686f4ddb 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java
@@ -77,9 +77,10 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
}
@Override
- public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender, String diseaseId, Integer pageNum, Integer pageSize) {
+ public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName,
+ String diseaseId, Integer pageNum, Integer pageSize) {
// 注意,这里的diseaseId不支持查询复杂疾病,如果需要支持复杂疾病,这里需要单独进行改造
- return medicalRecService.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, pageNum, pageSize);
+ return medicalRecService.queryMedicalRecManagePage(selfDescKeyword, gender, patientName, diseaseId, pageNum, pageSize);
}
@Override
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/MedicalRecMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/MedicalRecMapper.java
index a3f11ab2..b7be1907 100644
--- a/virtual-patient-model/src/main/java/com/supervision/mapper/MedicalRecMapper.java
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/MedicalRecMapper.java
@@ -25,7 +25,7 @@ public interface MedicalRecMapper extends BaseMapper<MedicalRec> {
* @return 结果
*/
IPage<MedicalRecPageResVO> queryMedicalRecManagePage(@Param("selfDescKeyword") String selfDescKeyword,
- @Param("gender") String gender,
+ @Param("gender") String gender,@Param("patientName") String patientName,
@Param("diseaseId") String diseaseId, @Param("page") Page<MedicalRecPageResVO> page);
/**
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/MedicalRecService.java b/virtual-patient-model/src/main/java/com/supervision/service/MedicalRecService.java
index a7335ccd..8b415c9c 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/MedicalRecService.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/MedicalRecService.java
@@ -20,7 +20,7 @@ public interface MedicalRecService extends IService<MedicalRec> {
* @param diseaseId 疾病ID
* @return 结果
*/
- IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender, String diseaseId, Integer pageNum, Integer pageSize);
+ IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender,String patientName, String diseaseId, Integer pageNum, Integer pageSize);
/**
* 生成一个病历编码,是最大的病历编码+1
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/MedicalRecServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/MedicalRecServiceImpl.java
index eab1f5a8..0c2e0b08 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/MedicalRecServiceImpl.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/MedicalRecServiceImpl.java
@@ -26,8 +26,8 @@ public class MedicalRecServiceImpl extends ServiceImpl<MedicalRecMapper, Medical
* @return 结果
*/
@Override
- public IPage<MedicalRecPageResVO> queryMedicalRecManagePage(String selfDescKeyword, String gender, String diseaseId, Integer pageNum, Integer pageSize) {
- return this.baseMapper.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, new Page<>(pageNum,pageSize));
+ 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));
}
/**
diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
index b369cb20..a43638a3 100644
--- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
@@ -79,6 +79,9 @@
<if test="diseaseId != null and diseaseId != ''">
AND t1.disease_id = #{diseaseId}
</if>
+ <if test="patientName != null and patientName != ''">
+ AND t1.patient_name like concat("%",#{patientName}, "%")
+ </if>
</where>
order by time desc
</select>
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java
index 7b46f283..86a90ea2 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java
@@ -75,7 +75,7 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService {
@Override
public IPage<MedicalRecPageResVO> queryMedicalRecPageList(Integer pageNum, Integer pageSize) {
- IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(null, null, null, pageNum, pageSize);
+ IPage<MedicalRecPageResVO> medicalRecPageResVOIPage = medicalRecService.queryMedicalRecManagePage(null, null, null,null, pageNum, pageSize);
if (CollUtil.isEmpty(medicalRecPageResVOIPage.getRecords())){
return medicalRecPageResVOIPage;
}