429 433 438 476 477 478

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java

@@ -246,6 +246,16 @@ public class OpCreateScheduleDto {
      */
     private String communicationInfo;
 
+    /**
+     * 是否外请专家 1-是 0-否
+     */
+    private Integer isExternalExpert;
+
+    /**
+     * 外请专家姓名
+     */
+    private String externalExpertName;
+
     /**
      * 备注
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java

@@ -39,10 +39,9 @@ public interface IRequestFormManageAppService {
      * @param typeCode 申请单类型
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
      * @return 申请单列表
      */
-    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status);
+    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate);
 
     /**
      * 分页查询申请单

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -414,7 +414,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Override
     public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode) {
         // 调用重载方法，不传筛选参数
-        return getRequestForm(encounterId, typeCode, null, null, null);
+        return getRequestForm(encounterId, typeCode, null, null);
     }
 
     /**
@@ -424,17 +424,16 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
      * @param typeCode 申请单类型
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
      * @return 申请单列表
      */
     @Override
-    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status) {
+    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate) {
         // 检查参数
         if (encounterId == null) {
-            return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库
+            return new java.util.ArrayList<>();
         }
 
-        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, null);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate,null,null);
         for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
             // 查询处方详情
             List<RequestFormDetailQueryDto> requestFormDetail =

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -109,7 +109,7 @@ public class RequestFormManageController {
         if (encounterId == null) {
             return R.fail("就诊ID不能为空");
         }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate));
     }
 
     /**

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -98,9 +98,6 @@
                 INNER JOIN adm_organization_location AS T6 ON T6.distribution_category_code = t1.category_code AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
                 WHERE t1.delete_flag = '0'
                 AND T2.status_enum = #{statusEnum}
-                <if test="pricingFlag == 1">
-                    AND 1 = 2
-                </if>
                 <if test="categoryCode != null and categoryCode != ''">
                     <!-- 🔧 BugFix: 支持两种匹配方式 -->
                     <!-- 1. 直接匹配：distribution_category_code = category_code（都是数字代码） -->

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

@@ -12,7 +12,6 @@
                drf.desc_json,
                drf.requester_id,
                drf.create_time,
-               drf.status,
                ap.NAME AS patient_name
         FROM doc_request_form AS drf
                  LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
@@ -28,9 +27,6 @@
           <if test="endDate != null and endDate != ''">
               AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
-          <if test="status != null and status != ''">
-              AND drf.status = #{status}::integer
-          </if>
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -187,6 +187,12 @@ public class OpSchedule extends HisBaseEntity {
     /** 沟通信息 */
     private String communicationInfo;
 
+    /** 是否外请专家 1-是 0-否 */
+    private Integer isExternalExpert;
+
+    /** 外请专家姓名 */
+    private String externalExpertName;
+
     /** 备注信息 */
     private String remark;