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>

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

@@ -1107,9 +1107,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
             }
-            medicationRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                    ? adviceSaveDto.getGenerateSourceEnum()
-                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
             medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1155,9 +1153,7 @@ 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(adviceSaveDto.getGenerateSourceEnum() != null
-                        ? adviceSaveDto.getGenerateSourceEnum()
-                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -1251,9 +1247,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             deviceRequest.setCreateBy(currentUsername);
             deviceRequest.setCreateTime(curDate);
             deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
-            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                    ? adviceSaveDto.getGenerateSourceEnum()
-                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
             deviceRequest.setQuantity(boundDevice.getQuantity());
             deviceRequest.setUnitCode(boundDevice.getUnitCode());
             deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum());
@@ -1319,9 +1313,7 @@ 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(adviceSaveDto.getGenerateSourceEnum() != null
-                    ? adviceSaveDto.getGenerateSourceEnum()
-                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceChargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
             deviceChargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号，与药品一致
             deviceChargeItem.setPatientId(adviceSaveDto.getPatientId());
             deviceChargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 耗材类型
@@ -1550,9 +1542,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
             }
-            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                    ? adviceSaveDto.getGenerateSourceEnum()
-                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
             deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1615,9 +1605,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setCreateTime(curDate);          // 补全创建时间
                 chargeItem.setStatusEnum(2); // 已生成医嘱
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                        ? adviceSaveDto.getGenerateSourceEnum()
-                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -1918,9 +1906,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
             }
-            serviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                    ? adviceSaveDto.getGenerateSourceEnum()
-                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
             serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1971,9 +1957,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setCreateTime(curDate);          // 补全创建时间
                 chargeItem.setStatusEnum(2); // 已生成医嘱
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
-                        ? adviceSaveDto.getGenerateSourceEnum()
-                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -178,8 +178,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
-        // requestStatus由前端tab控制，需在后端过滤
-        Integer requestStatus = inpatientAdviceParam.getRequestStatus();
+        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
         inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
@@ -293,16 +292,6 @@ 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);
     }
 

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -75,8 +75,7 @@
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
-        SELECT wsr.activity_id AS activity_id,
-               wsr.quantity,
+        SELECT wsr.quantity,
                wsr.unit_code,
                COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
                aci.total_price
@@ -148,9 +147,9 @@
                 fc.contract_name AS fee_type,
                 COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
             FROM doc_request_form drf
-            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 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'
             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'
@@ -185,8 +184,6 @@
                 </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>

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java

@@ -39,12 +39,7 @@ public enum GenerateSource implements HisEnumInterface {
     /**
      * 自动滚费
      */
-    AUTO_ROLL_FEES(5, "5", "自动滚费"),
-
-    /**
-     * 手术计费
-     */
-    SURGERY_BILLING(6, "6", "手术计费");
+    AUTO_ROLL_FEES(5, "5", "自动滚费");
 
     private final Integer value;
     private final String code;

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -830,6 +830,7 @@
           </div>
           <div style="padding: 10px">
             <prescriptionlist :patientInfo="chargePatientInfo" ref="prescriptionRef"
+              :generateSourceEnum="1"
               :sourceBillNo="chargePatientInfo.sourceBillNo" />
             <div class="overlay" v-if="disabled"></div>
           </div>