700 710 711 713 bug 修复

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java

@@ -150,10 +150,21 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
     @Override
     public R<?> getMedicineSummaryFormPage(DispenseFormSearchParam dispenseFormSearchParam, Integer pageNo,
             Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 就诊ID集合
+        String encounterIds = dispenseFormSearchParam.getEncounterIds();
+        dispenseFormSearchParam.setEncounterIds(null);
+
         // 构建查询条件
         QueryWrapper<DispenseFormSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(dispenseFormSearchParam,
                 searchKey, new HashSet<>(List.of(CommonConstants.FieldName.BusNo)), request);
 
+        // 如果传了就诊ID，过滤关联的汇总单
+        if (StringUtils.isNotEmpty(encounterIds)) {
+            queryWrapper.inSql(CommonConstants.FieldName.BusNo,
+                    "SELECT DISTINCT summary_no FROM med_medication_dispense " +
+                    "WHERE encounter_id IN (" + encounterIds + ") AND summary_no IS NOT NULL");
+        }
+
         // 汇总单分页列表
         Page<MedicineSummaryFormDto> medicineSummaryFormPage = medicineSummaryAppMapper.selectMedicineSummaryFormPage(
                 new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.PREPARATION.getValue(),