feat(surgicalschedule): 添加手术单号查询功能并优化收费状态 BUG#306

- 在手术申请查询界面添加手术单号输入框
- 将收费项目状态从草稿改为待收费状态
- 在请求表单DTO中添加手术单号字段
- 在数据库查询中关联手术安排表并添加手术单号过滤条件
- 添加筛选条件确保只查询未安排手术的申请记录

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()); // 患者

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;
     /**
      * 申请时间开始
      */

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'
             <where>
+                <if test="requestFormDto.surgeryNo != null and requestFormDto.surgeryNo != ''">
+                    AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
+                </if>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}
                 </if>
@@ -112,6 +116,7 @@
                     AND cs.apply_dept_id = #{requestFormDto.applyDeptId}
                 </if>
                 AND drf.delete_flag = '0'
+                AND os.schedule_id IS NULL
             </where>
             ORDER BY drf.create_time DESC
     </select>

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

@@ -692,6 +692,15 @@
     <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog">
       <!-- 查询条件区 -->
       <el-form :model="applyQueryParams" ref="applyQueryRef" :inline="true" class="query-form">
+        <el-form-item label="手术单号" prop="surgeryNo">
+          <el-input
+            v-model="applyQueryParams.surgeryNo"
+            placeholder="请输入手术单号"
+            clearable
+            @keyup.enter="handleApplyQuery"
+            style="width: 200px"
+          />
+        </el-form-item>
         <el-form-item label="申请时间范围" prop="applyTimeRange">
           <el-tooltip :content="applyQueryParams.applyTimeRange ? applyQueryParams.applyTimeRange.join(' 至 ') : ''" placement="top" :disabled="!applyQueryParams.applyTimeRange || applyQueryParams.applyTimeRange.length === 0">
             <el-date-picker