Fix Bug #536 : [门诊手术安排]"手术申请查询"弹窗底部，分页组件与界面底部元素重叠，影响操作。

根因：弹窗 body 无高度约束，窗口缩小时内容溢出导致分页与 footer 重叠。修复：为弹窗添加 max-height: 75vh + overflow-y: auto 约束，分页与 footer 增加间距和分隔线。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #535 : 【住院护士站-医嘱校对】已校验过的医嘱错误显示于"未校对"列表中，导致数据状态联动失效
2026-05-15 16:29:31 +08:00 · 2026-05-15 16:29:31 +08:00 · 2026-05-15 16:29:30 +08:00 · 2026-05-15 16:29:30 +08:00 · 2026-05-15 16:29:30 +08:00 · 2026-05-15 15:41:45 +08:00
6 changed files with 68 additions and 18 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -1107,7 +1107,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            if (is_save) {
                medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
            }
-            medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            medicationRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
            medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
            medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
            medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1153,7 +1155,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
                chargeItem.setStatusEnum(2); // 已生成医嘱
                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -1247,7 +1251,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            deviceRequest.setCreateBy(currentUsername);
            deviceRequest.setCreateTime(curDate);
            deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
-            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
            deviceRequest.setQuantity(boundDevice.getQuantity());
            deviceRequest.setUnitCode(boundDevice.getUnitCode());
            deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum());
@@ -1313,7 +1319,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            deviceChargeItem.setCreateTime(curDate);
            deviceChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
            deviceChargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-            deviceChargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceChargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
            deviceChargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号，与药品一致
            deviceChargeItem.setPatientId(adviceSaveDto.getPatientId());
            deviceChargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 耗材类型
@@ -1542,7 +1550,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            if (is_save) {
                deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
            }
-            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
            deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
            deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
            deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1605,7 +1615,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                chargeItem.setCreateTime(curDate);          // 补全创建时间
                chargeItem.setStatusEnum(2); // 已生成医嘱
                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -1906,7 +1918,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            if (is_save) {
                serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
            }
-            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            serviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
            serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
            serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
            serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1957,7 +1971,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                chargeItem.setCreateTime(curDate);          // 补全创建时间
                chargeItem.setStatusEnum(2); // 已生成医嘱
                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -178,7 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
        inpatientAdviceParam.setEncounterIds(null);
        Integer exeStatus = inpatientAdviceParam.getExeStatus();
        inpatientAdviceParam.setExeStatus(null);
-        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
+        // requestStatus由前端tab控制，需在后端过滤
+        Integer requestStatus = inpatientAdviceParam.getRequestStatus();
        inpatientAdviceParam.setRequestStatus(null);
        // 构建查询条件
        QueryWrapper<InpatientAdviceParam> queryWrapper
@@ -292,6 +293,16 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                inpatientAdvicePage.setTotal(filteredList.size());
            }
        }
+
+        // 按请求状态（tab切换）过滤医嘱
+        if (requestStatus != null) {
+            List<InpatientAdviceDto> statusFilteredList = inpatientAdvicePage.getRecords().stream()
+                    .filter(advice -> requestStatus.equals(advice.getRequestStatus()))
+                    .collect(Collectors.toList());
+            inpatientAdvicePage.setRecords(statusFilteredList);
+            inpatientAdvicePage.setTotal(statusFilteredList.size());
+        }
+
        return R.ok(inpatientAdvicePage);
    }

--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
@@ -90,7 +90,6 @@
            drf.create_time AS apply_time,
            os.surgery_nature AS surgeryType,
            cs.incision_level AS incisionLevel,
-            fc.contract_name AS feeType,
            os.fee_type AS feeType,
            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
        FROM op_schedule os
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -75,7 +75,8 @@
    </select>

    <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
-        SELECT wsr.quantity,
+        SELECT wsr.activity_id AS activity_id,
+               wsr.quantity,
               wsr.unit_code,
               COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
               aci.total_price
@@ -147,9 +148,9 @@
                fc.contract_name AS fee_type,
                COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
            FROM doc_request_form drf
-            LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
-            LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
-            LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
+            INNER JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
+            INNER JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
+            INNER JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
            LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
            LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
            LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
@@ -184,6 +185,8 @@
                </if>
                AND drf.delete_flag = '0'
                AND os.schedule_id IS NULL
+                <!-- 已取消(4)、已完成(3)的手术申请不参与门诊手术安排查找 -->
+                AND cs.status_enum NOT IN (3, 4)
            </where>
            ORDER BY drf.create_time DESC
    </select>
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
@@ -39,7 +39,12 @@ public enum GenerateSource implements HisEnumInterface {
    /**
     * 自动滚费
     */
-    AUTO_ROLL_FEES(5, "5", "自动滚费");
+    AUTO_ROLL_FEES(5, "5", "自动滚费"),
+
+    /**
+     * 手术计费
+     */
+    SURGERY_BILLING(6, "6", "手术计费");

    private final Integer value;
    private final String code;
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -689,7 +689,7 @@
    </el-dialog>

    <!-- 手术申请查询弹窗 -->
-    <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog">
+    <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog" class="apply-query-dialog">
      <!-- 查询条件区 -->
      <el-form :model="applyQueryParams" ref="applyQueryRef" :inline="true" class="query-form">
        <el-form-item label="手术单号" prop="surgeryNo">
@@ -781,7 +781,7 @@
      </el-table>

      <!-- 底部分页区 -->
-      <div class="pagination-container" style="margin-top: 10px; padding-bottom: 10px">
+      <div class="pagination-container">
        <pagination
          v-show="applyTotal > 0"
          :total="applyTotal"
@@ -830,7 +830,6 @@
          </div>
          <div style="padding: 10px">
            <prescriptionlist :patientInfo="chargePatientInfo" ref="prescriptionRef"
-              :generateSourceEnum="1"
              :sourceBillNo="chargePatientInfo.sourceBillNo" />
            <div class="overlay" v-if="disabled"></div>
          </div>
@@ -2359,4 +2358,21 @@ function getRowClassName({ row, rowIndex }) {
  border-bottom: 1px solid #d9ecff !important;
 }

+/* 手术申请查询弹窗 — 防止分页与底部重叠 */
+:deep(.apply-query-dialog .el-dialog__body) {
+  max-height: 75vh;
+  overflow-y: auto;
+  padding-bottom: 20px;
+}
+
+:deep(.apply-query-dialog .pagination-container) {
+  margin-top: 16px;
+}
+
+:deep(.apply-query-dialog .dialog-footer) {
+  margin-top: 12px;
+  padding-top: 12px;
+  border-top: 1px solid #ebeef5;
+}
+
 </style>
Author	SHA1	Message	Date
关羽	755a61b573	Fix Bug #536 : [门诊手术安排]"手术申请查询"弹窗底部，分页组件与界面底部元素重叠，影响操作。根因：弹窗 body 无高度约束，窗口缩小时内容溢出导致分页与 footer 重叠。修复：为弹窗添加 max-height: 75vh + overflow-y: auto 约束，分页与 footer 增加间距和分隔线。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 16:29:31 +08:00
荀彧	91b3a0a4ba	Fix Bug #535 : 【住院护士站-医嘱校对】已校验过的医嘱错误显示于"未校对"列表中，导致数据状态联动失效根因：后端 getInpatientAdvicePage 方法中将 requestStatus 置为 null，未按前端 tab 传入的状态值过滤，导致无论切换哪个 tab 都返回全部医嘱。 SQL 中的 CASE 条件仅处理 DRAFT 状态的 performer_check_id 校验，并未按 request_status 字段过滤。修复：保存 requestStatus 后，在查询结果集上按 requestStatus 手动过滤，与 exeStatus 的过滤方式保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 16:29:31 +08:00
关羽	8a68fd9209	Fix Bug #533 : 【门诊手术安排-计费】添加药品费用项目保存提示成功，但列表页未同步显示计费药品项目根因：DoctorStationAdviceAppServiceImpl 中 handMedication/handDevice/handService 方法硬编码 generateSourceEnum=1（医生开立），但前端手术计费传入 generateSourceEnum=6，查询时按 6 过滤导致找不到记录。修复：1. GenerateSource 枚举新增 SURGERY_BILLING(6) 2. 8处 setGenerateSourceEnum 改为优先使用 DTO 的 generateSourceEnum，空时回退到 DOCTOR_PRESCRIPTION Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 16:29:30 +08:00
关羽	433cf82eb4	Fix Bug #533 : 【门诊手术安排-计费】添加药品费用项目保存提示成功，但列表页未同步显示计费药品项目根因：手术计费弹窗中 prescriptionlist 组件的 generateSourceEnum prop 被硬编码为 1，但保存时 handleSaveSign 将 generateSourceEnum 设为 6（手术计费）。保存后调用 getListInfo 刷新列表时，用 generateSourceEnum=1 查询，后端返回 generateSourceEnum=6 的数据不匹配，导致列表为空。修复：移除硬编码的 :generateSourceEnum="1" prop，让组件通过 sourceBillNo 过滤即可正确显示保存的手术计费项目。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 16:29:30 +08:00
yangkexiang	532cd17c10	fix bug249:手术管理-》门诊手术安排：【新增手术安排】-》【查找】在门诊医生站已【删除】作废的手术申请单在查询界面还能查询出来	2026-05-15 16:29:30 +08:00
赵云	b4167c9994	Fix Bug #532 : 【手术管理】点击"查看"或"编辑"按钮弹出 SQL 语法报错。根因：getSurgeryScheduleDetail SQL 查询中引用了 fc.contract_name AS feeType，但 fc (fin_contract) 表从未被 JOIN，导致 SQL 语法错误。修复：删除未关联表的 fc.contract_name 字段，保留已有的 os.fee_type AS feeType。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 15:41:45 +08:00