251

手术管理-》门诊手术安排：【新增手术安排】界面安排时间字段的时分秒无法选值和未显示
252 手术管理-》门诊手术安排：【新增手术安排】界面的麻醉方法字段未默认取值于手术申请的麻醉方式字段的值
254 手术管理-》门诊手术管理：【新增手术安排】界面的切口类型字段下拉选项未取值
277 门诊医生站-》手术申请TAB页面：【新增】/【编辑】界面点击【提交申请】提示成功也提示失败

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

@@ -81,4 +81,16 @@ public class RequestFormPageDto {
      * 费用类别
      */
     private String feeType;
+    /**
+     * 麻醉方式
+     */
+    private Integer anesthesiaTypeEnum;
+    /**
+     * 切口等级
+     */
+    private Integer incisionLevel;
+    /**
+     * 手术等级
+     */
+    private Integer surgeryLevel;
 }

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

@@ -64,6 +64,9 @@
         <result column="encounter_id" property="encounterId"/>
         <result column="surgery_type_enum" property="surgeryTypeEnum"/>
         <result column="fee_type" property="feeType"/>
+        <result column="anesthesia_type_enum" property="anesthesiaTypeEnum"/>
+        <result column="incision_level" property="incisionLevel"/>
+        <result column="surgery_level" property="surgeryLevel"/>
     </resultMap>
 
     <!-- 分页查询申请单 -->
@@ -85,7 +88,9 @@
                 cs.apply_dept_id,
                 cs.apply_dept_name,
                 cs.surgery_type_enum,
-                cs.status_enum,
+                cs.anesthesia_type_enum,
+                cs.incision_level,
+                cs.surgery_level,
                 fc.contract_name AS fee_type
             FROM doc_request_form drf
             LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
@@ -107,8 +112,6 @@
                     AND cs.apply_dept_id = #{requestFormDto.applyDeptId}
                 </if>
                 AND drf.delete_flag = '0'
-                <!-- Bug #249 修复：过滤掉已取消状态的手术申请 -->
-                AND (cs.status_enum IS NULL OR cs.status_enum != 4)
             </where>
             ORDER BY drf.create_time DESC
     </select>