diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
index 8e49158b..9be2fe68 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
@@ -347,7 +347,7 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
// 生成收费项目
ChargeItem chargeItem = new ChargeItem();
- chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+ chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 收费状态:待收费
chargeItem.setBusNo("CI" + serviceRequest.getBusNo());
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
chargeItem.setPatientId(surgeryDto.getPatientId()); // 患者
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
index 4f32af5f..a5d87254 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
@@ -10,6 +10,10 @@ import java.time.LocalDate;
@AllArgsConstructor
@NoArgsConstructor
public class RequestFormDto {
+ /**
+ * 手术单号
+ */
+ private String surgeryNo;
/**
* 申请时间开始
*/
diff --git 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
index 64725f1a..d4ea473f 100644
--- 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
@@ -98,7 +98,11 @@
LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id
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'
+
+ AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
+
AND drf.create_time >= #{requestFormDto.applyTimeStart}
@@ -112,6 +116,7 @@
AND cs.apply_dept_id = #{requestFormDto.applyDeptId}
AND drf.delete_flag = '0'
+ AND os.schedule_id IS NULL
ORDER BY drf.create_time DESC
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
index 99336298..c490f1b0 100644
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -692,6 +692,15 @@
+
+
+