bug471 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java

@@ -2,9 +2,13 @@ package com.openhis.web.clinicalmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
+import com.openhis.common.enums.ActivityDefCategory;
 import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
 import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
 import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
+import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.openhis.web.regdoctorstation.dto.RequestFormDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +30,7 @@ import java.util.Map;
 public class SurgicalScheduleController {
 
     private final ISurgicalScheduleAppService surgicalScheduleAppService;
+    private final IRequestFormManageAppService requestFormManageAppService;
 
     /**
      * 分页查询手术安排列表
@@ -87,6 +92,27 @@ public class SurgicalScheduleController {
         return surgicalScheduleAppService.deleteSurgerySchedule(scheduleId);
     }
 
+    /**
+     * 分页查询待排期手术申请列表
+     *
+     * @param requestFormDto 查询条件
+     * @return 手术申请列表
+     */
+    @PostMapping(value = "/apply-list")
+    public R<IPage<RequestFormPageDto>> getSurgeryApplyList(@RequestBody RequestFormDto requestFormDto) {
+        if (requestFormDto.getPageNo() == null) {
+            requestFormDto.setPageNo(1);
+        }
+        if (requestFormDto.getPageSize() == null) {
+            requestFormDto.setPageSize(10);
+        }
+        //虽然很想这么写，但是库里的手术申请单的type_code都是直接写的SURGERY
+//        requestFormDto.setTypeCode(ActivityDefCategory.PROCEDURE.getCode());
+        //只查询手术申请单
+        requestFormDto.setTypeCode("SURGERY");
+        return R.ok(requestFormManageAppService.getRequestFormPage(requestFormDto));
+    }
+
     /**
      * 导出手术安排列表
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java

@@ -14,6 +14,10 @@ public class RequestFormDto {
      * 手术单号
      */
     private String surgeryNo;
+    /**
+     * 申请单类型编码
+     */
+    private String typeCode;
     /**
      * 申请时间开始
      */

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

@@ -161,6 +161,9 @@
                 <if test="requestFormDto.surgeryNo != null and requestFormDto.surgeryNo != ''">
                     AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                 </if>
+                <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
+                    AND drf.type_code = #{requestFormDto.typeCode}
+                </if>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}
                 </if>