1: 病历查询添加 病人名称过滤字段

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 = "创建病历")

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

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

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);
 
     /**

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

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));
     }
 
     /**

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>

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