549【住院医生站-临床医嘱-检验】打开“检验申请单”弹窗获取项目列表响应极其缓慢

546 【患者管理】-【患者列表】-【新增患者】，新增患者，保存成功，但没有数据
536 [门诊手术安排]“手术申请查询”弹窗底部，分页组件与界底部元素重叠，影响操作。

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java

@@ -147,6 +147,6 @@ public interface IDoctorStationAdviceAppService {
      */
     IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
 
-    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
+    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode);
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -2566,12 +2566,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     }
 
     @Override
-    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
+    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode) {
         IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getExaminationPage(
                 new Page<>(pageNo, pageSize),
                 PublicationStatus.ACTIVE.getValue(),
                 organizationId,
-                searchKey);
+                searchKey,
+                categoryCode);
         return result;
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -226,8 +226,9 @@ public class DoctorStationAdviceController {
             @RequestParam(value = "organizationId", required = false) Long organizationId,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
-            @RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
-        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey));
+            @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+            @RequestParam(value = "categoryCode", defaultValue = "23") String categoryCode) {
+        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey, categoryCode));
     }
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -203,6 +203,7 @@ public interface DoctorStationAdviceAppMapper {
     IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
             @Param("statusEnum") Integer statusEnum,
             @Param("organizationId") Long organizationId,
-            @Param("searchKey") String searchKey);
+            @Param("searchKey") String searchKey,
+            @Param("categoryCode") String categoryCode);
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java

@@ -133,47 +133,13 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     @Override
     public IPage<PatientBaseInfoDto> getPatientInfo(PatientBaseInfoDto patientBaseInfoDto, String searchKey,
             Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        // 获取登录者信息
+        // 构建基础查询条件
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long userId = loginUser.getUserId();
-        Integer tenantId = loginUser.getTenantId().intValue();
-        
-        // 先构建基础查询条件
         QueryWrapper<PatientBaseInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
                 patientBaseInfoDto, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name,
                         CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
                 request);
         
-        // 检查是否是精确ID查询（从门诊挂号页面跳转时使用）
-        boolean hasExactIdQuery = (patientBaseInfoDto.getId() != null);
-        
-        // 只有非精确ID查询时，才添加医生患者过滤条件
-        if (!hasExactIdQuery) {
-            // 查询当前用户对应的医生信息
-            LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
-            practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
-            // 使用list()避免TooManyResultsException异常，然后取第一个记录
-            List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
-            com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
-            
-            // 如果当前用户是医生，添加医生患者过滤条件
-            if (practitioner != null) {
-                // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
-                List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
-                        practitioner.getId(),
-                        Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()),
-                        tenantId);
-                
-                if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
-                    // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
-                    queryWrapper.in("id", doctorPatientIds);
-                } else {
-                    // 如果没有相关患者，返回空结果
-                    queryWrapper.eq("id", -1); // 设置一个不存在的ID
-                }
-            }
-            // 如果不是医生，查询所有患者
-        }
         
         IPage<PatientBaseInfoDto> patientInformationPage
                 = patientManageMapper.getPatientPage(new Page<>(pageNo, pageSize), queryWrapper);

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -897,7 +897,7 @@
         LIMIT #{limit} OFFSET #{offset}
     </select>
 
-    <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <!-- 检查/检验项目专用分页查询：仅查指定 category_code + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
     <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
@@ -919,7 +919,7 @@
             ON t3.id = t1.org_id
             AND t3.delete_flag = '0'
         WHERE t1.delete_flag = '0'
-          AND t1.category_code = '23'
+          AND t1.category_code = #{categoryCode}
           <if test="searchKey != null and searchKey != ''">
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>