Fix Bug #405 : 住院医生工作站：临床医嘱保存成功后，医嘱条目仍处于可编辑状态（未锁定展示）

- handleSaveSign: 新增行点击确定后调用savePrescription持久化到后端，而非仅设置isEdit=false后调用handleAddPrescription - handleSaveBatch: 修复nextId.value == 1 为赋值操作(=) - handleSaveBatch: catch块增加错误提示，保存失败时用户可感知 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #408 : 门诊医生站检查明细标签页显示暂无数据 - 修复handleRowClick中resp.items被d.data覆盖后丢失的问题
2026-05-13 13:35:47 +08:00 · 2026-05-13 13:35:47 +08:00 · 2026-05-13 13:35:47 +08:00 · 2026-05-13 13:35:47 +08:00 · 2026-05-13 13:35:47 +08:00
19 changed files with 277 additions and 44 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java
+++ b/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));
+    }
+
    /**
     * 导出手术安排列表
     *
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
@@ -59,6 +59,16 @@ public interface IDoctorStationAdviceAppService {
     */
    R<?> getRequestBaseInfo(Long encounterId);

+    /**
+     * 查询医嘱请求数据（支持按生成来源和来源单据号过滤）
+     *
+     * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选）
+     * @return 医嘱请求数据
+     */
+    R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo);
+
    /**
     * 门诊签退医嘱
     *
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -1987,13 +1987,25 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     */
    @Override
    public R<?> getRequestBaseInfo(Long encounterId) {
+        return this.getRequestBaseInfo(encounterId, null, null);
+    }
+
+    @Override
+    public R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo) {
        // 当前账号的参与者id
        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 未指定generateSourceEnum时，默认只查询医生开立的医嘱
+        int sourceEnum = (generateSourceEnum != null) ? generateSourceEnum : GenerateSource.DOCTOR_PRESCRIPTION.getValue();
        // 医嘱请求数据
        List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, null,
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                sourceEnum, sourceBillNo);
+        // 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
+        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
+            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
+                    && (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
+        }
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
@@ -2114,7 +2126,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, patientId,
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue(), null);
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
@@ -112,11 +112,16 @@ public class DoctorStationAdviceController {
     * 查询医嘱请求数据
     *
     * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，用于按来源过滤，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选，用于按来源单据过滤）
     * @return 医嘱请求数据
     */
    @GetMapping(value = "/request-base-info")
-    public R<?> getRequestBaseInfo(@RequestParam(required = false) Long encounterId) {
-        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId);
+    public R<?> getRequestBaseInfo(
+            @RequestParam(required = false) Long encounterId,
+            @RequestParam(required = false) Integer generateSourceEnum,
+            @RequestParam(required = false) String sourceBillNo) {
+        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId, generateSourceEnum, sourceBillNo);
    }

    /**
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
@@ -122,7 +122,8 @@ public interface DoctorStationAdviceAppMapper {
            @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
            @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
            @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
-            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
+            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum,
+            @Param("sourceBillNo") String sourceBillNo);

    /**
     * 查询就诊费用性质
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -92,14 +92,10 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                return R.fail("无待签发的医嘱,该申请单不可编辑");
            }
        } else {
-            // 诊疗处方号 - 按申请单类型生成不同规则的单号
-            if (ActivityDefCategory.TEST.getCode().equals(typeCode)) {
-                // 检查申请单：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
-                String dateStr = new SimpleDateFormat("yyMMdd").format(new Date());
-                prescriptionNo = "JCZ" + dateStr + assignSeqUtil.getSeq("JCZ_" + dateStr, 5);
-            } else {
-                prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
-            }
+            // 检查申请单号：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
+            String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
+            int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix());
+            prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq);
        }

        // 当前时间
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
@@ -16,6 +16,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

+import java.time.LocalDate;
 import java.util.List;

 /**
@@ -142,6 +143,32 @@ public class RequestFormManageController {
        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.getCode()));
    }
 /**
+     * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+     *
+     * @param surgeryNo     手术单号（模糊查询，可选）
+     * @param applyTimeStart 申请时间起始（可选）
+     * @param applyTimeEnd   申请时间截止（可选）
+     * @param mainDoctorId   主刀医生ID（可选）
+     * @param applyDeptId    申请科室ID（可选）
+     * @param pageNo   页码，默认1
+     * @param pageSize 每页数量，默认10
+     * @return 分页手术申请单列表
+     */
+    @GetMapping(value = "/get-surgery-page")
+    public R<IPage<RequestFormPageDto>> getSurgeryRequestFormPage(
+            @RequestParam(required = false) String surgeryNo,
+            @RequestParam(required = false) LocalDate applyTimeStart,
+            @RequestParam(required = false) LocalDate applyTimeEnd,
+            @RequestParam(required = false) Long mainDoctorId,
+            @RequestParam(required = false) Long applyDeptId,
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize) {
+        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+                mainDoctorId, applyDeptId, pageNo, pageSize);
+        return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
+    }
+
+    /**
     * 分页查询申请单
     * @return 申请单
     */
--- 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
@@ -14,6 +14,10 @@ public class RequestFormDto {
     * 手术单号
     */
    private String surgeryNo;
+    /**
+     * 申请单类型编码
+     */
+    private String typeCode;
    /**
     * 申请时间开始
     */
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -527,6 +527,9 @@
        LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
        LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0
+        <if test="generateSourceEnum != null">
+            AND T1.generate_source_enum = #{generateSourceEnum}
+        </if>
        <if test="historyFlag == '0'.toString()">
            AND T1.encounter_id = #{encounterId}
        </if>
@@ -695,6 +698,9 @@
        -- based_on_table='med_medication_request' → 输液/皮试执行记录，应排除
        -- based_on_table='exam_apply'/'lab_apply' → 申请单原始医嘱，应保留
        AND (T1.based_on_id IS NULL OR T1.based_on_table IS NULL OR T1.based_on_table NOT IN ('med_medication_request', 'med_medication_dispense'))
+        <if test="sourceBillNo != null and sourceBillNo != ''">
+            AND T1.prescription_no = #{sourceBillNo}
+        </if>
        <if test="historyFlag == '0'.toString()">
            AND T1.encounter_id = #{encounterId}
        </if>
--- 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
@@ -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>
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -270,6 +270,10 @@ public enum AssignSeqEnum {
     * 诊疗处方号
     */
    ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
+    /**
+     * 检查申请单号（住院）
+     */
+    CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
    /**
     * b 病历文书
     */
--- a/openhis-ui-vue3/src/api/system/checkType.js
+++ b/openhis-ui-vue3/src/api/system/checkType.js
@@ -163,7 +163,7 @@ export function updateCheckPart(data) {
 // 查询检查套餐列表
 export function listCheckPackage(query) {
  return request({
-    url: '/system/check-package/list',
+    url: '/system/package/list',
    method: 'get',
    params: query
  })
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
@@ -58,10 +58,17 @@ export function singOut(data) {
 /**
 * 获取患者本次就诊处方
 */
-export function getPrescriptionList(encounterId) {
-  // Add timestamp to bypass browser caching and ensure fresh data is loaded
+export function getPrescriptionList(encounterId, generateSourceEnum, sourceBillNo) {
+  let url = '/doctor-station/advice/request-base-info?encounterId=' + encounterId
+  if (generateSourceEnum != null) {
+    url += '&generateSourceEnum=' + generateSourceEnum
+  }
+  if (sourceBillNo != null) {
+    url += '&sourceBillNo=' + encodeURIComponent(sourceBillNo)
+  }
+  url += '&t=' + Date.now()
  return request({
-    url: '/doctor-station/advice/request-base-info?encounterId=' + encounterId + '&t=' + Date.now(),
+    url: url,
    method: 'get',
  })
 }
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -381,6 +381,14 @@ const props = defineProps({
  activeTab: {
    type: String,
  },
+  generateSourceEnum: {
+    type: Number,
+    default: null,
+  },
+  sourceBillNo: {
+    type: String,
+    default: null,
+  },
 });
 const isAdding = ref(false);
 const isSaving = ref(false); // #437 防重复提交锁
@@ -468,7 +476,11 @@ watch(

 function getListInfo(addNewRow) {
  isAdding.value = false;
-  getPrescriptionList(props.patientInfo.encounterId).then((res) => {
+  getPrescriptionList(
+    props.patientInfo.encounterId,
+    props.generateSourceEnum ?? undefined,
+    props.sourceBillNo ?? undefined,
+  ).then((res) => {
    // 为每行数据添加 adviceTypeValue 字段，用于类型下拉框显示
    prescriptionList.value = (res.data || []).map(item => {
      // 根据 adviceType 和 categoryCode 找到对应的 adviceTypeValue
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -402,6 +402,21 @@
                        <span class="method-price">¥{{ method.packagePrice || item.price }}</span>
                      </el-checkbox>
                    </div>
+                    <!-- 选中方法后，显示对应的套餐明细 -->
+                    <div v-if="item.selectedMethod && item.methodPackageDetails && item.methodPackageDetails.length > 0" class="method-package-details">
+                      <div class="method-package-header">
+                        <span class="method-package-title">套餐明细 - {{ item.selectedMethod.name }}</span>
+                      </div>
+                      <div v-for="detail in item.methodPackageDetails" :key="detail.id" class="method-option">
+                        <el-checkbox v-model="detail.checked">
+                          <span class="method-name">{{ detail.name }}</span>
+                          <span class="method-price">数量: {{ detail.quantity }} ¥{{ detail.price }}</span>
+                        </el-checkbox>
+                      </div>
+                    </div>
+                    <div v-if="item.selectedMethod && item.methodPackageLoading" class="method-package-loading">
+                      加载套餐明细中...
+                    </div>
                  </div>
                </div>
              </div>
@@ -419,7 +434,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
 import useUserStore from '@/store/modules/user';
 import request from '@/utils/request';
-import { listCheckMethod, searchCheckMethod } from '@/api/system/checkType';
+import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
 import { getEncounterDiagnosis } from '../api.js';

 const props = defineProps({
@@ -445,7 +460,7 @@ async function loadPackageDetails(row, treeNode, resolve) {
  }
  try {
    const res = await request({
-      url: `/exam/package/${row.packageId}/details`,
+      url: `/system/package/${row.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -474,7 +489,7 @@ async function loadPackageDetailsForItem(item) {
  }
  try {
    const res = await request({
-      url: `/exam/package/${item.packageId}/details`,
+      url: `/system/package/${item.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -992,12 +1007,15 @@ function handleRowClick(row) {
  selectedItems.value = [];
  activeDetailTab.value = 'applyForm';
  request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    const d = res.data || res;
-    if (d.data) Object.assign(form, d.data);
-    if (d.items && Array.isArray(d.items)) {
+    const resp = res.data || res;
+    // 保存 items 在顶层响应中，避免后面 d.data 赋值后丢失
+    const rawItems = resp.items;
+    const d = resp.data || resp;
+    if (d) Object.assign(form, d);
+    if (rawItems && Array.isArray(rawItems)) {
      try {
        // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(d.items.map(async m => {
+        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
          const item = {
            id: m.itemCode, name: m.itemName,
            price: m.itemFee || 0, quantity: 1,
@@ -1228,21 +1246,68 @@ async function toggleItemExpand(item) {
 }

 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
-function selectMethodCheckbox(checked, item, method) {
+async function selectMethodCheckbox(checked, item, method) {
  if (checked) {
    item.selectedMethod = method;
+    // 动态加载该方法对应的套餐明细
+    await loadMethodPackageDetails(item, method);
  } else {
    item.selectedMethod = null;
+    item.methodPackageDetails = [];
  }
  // 联动更新表单检查方法显示字段
  updateMethodDisplay();
-  
+
  // #430: 套餐金额实时同步到申请单
  nextTick(() => {
    form.totalAmount = totalAmountCalc.value;
  });
 }

+// 根据检查方法的packageName加载对应的套餐明细
+async function loadMethodPackageDetails(item, method) {
+  item.methodPackageLoading = true;
+  item.methodPackageDetails = [];
+  try {
+    if (!method.packageName) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    // 通过packageName查询套餐获取packageId
+    const pkgRes = await listCheckPackage({ packageName: method.packageName });
+    let packages = pkgRes?.data || [];
+    if (!Array.isArray(packages)) {
+      packages = packages.records || packages.data || [];
+    }
+    if (packages.length === 0) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    const packageId = packages[0].id;
+    // 查询套餐明细
+    const detailRes = await request({
+      url: `/system/package/${packageId}/details`,
+      method: 'get'
+    });
+    if (detailRes.code === 200 && detailRes.data) {
+      item.methodPackageDetails = detailRes.data.map(d => ({
+        id: d.id,
+        name: d.itemName || d.name,
+        quantity: d.quantity || 1,
+        unit: d.unit || '次',
+        price: d.unitPrice || d.price || 0,
+        amount: d.amount || d.total || 0,
+        checked: true  // 默认勾选
+      }));
+    }
+  } catch (err) {
+    console.error('加载方法套餐明细失败:', err);
+    item.methodPackageDetails = [];
+  } finally {
+    item.methodPackageLoading = false;
+  }
+}
+
 // Bug #384修复: 更新检查方法显示字段（联动）
 function updateMethodDisplay() {
  // 找到第一个有选中检查方法的项目
@@ -1648,6 +1713,29 @@ defineExpose({ getList });
  margin-left: 8px;
 }

+/* 选中方法后显示的套餐明细 */
+.method-package-details {
+  margin-top: 4px;
+  padding: 4px 0;
+  border-top: 1px dashed #dcdfe6;
+}
+
+.method-package-header {
+  padding: 2px 0 4px 24px;
+}
+
+.method-package-title {
+  font-size: 10px;
+  color: #909399;
+  font-weight: 500;
+}
+
+.method-package-loading {
+  padding: 4px 0 4px 24px;
+  font-size: 10px;
+  color: #c0c4cc;
+}
+
 /* 折叠组件细节 */
 :deep(.el-collapse) {
  border: none;
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
@@ -44,6 +44,17 @@ export function getSurgery(queryParams) {
  });
 }

+/**
+ * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+ */
+export function getSurgeryPage(queryParams) {
+  return request({
+    url: '/reg-doctorstation/request-form/get-surgery-page',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
 /**
 * 查询护理医嘱信息
 */
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -1210,7 +1210,7 @@ function handleSave() {
          isSaving.value = false;
          getListInfo(false);
          bindMethod.value = {};
-          nextId.value == 1;
+          nextId.value = 1;
        } else {
          proxy.$modal.msgError(res.message);
          isSaving.value = false;
@@ -1376,13 +1376,21 @@ function handleSaveSign(row, index) {
    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
      if (res.code === 200) {
        proxy.$modal.msgSuccess('保存成功');
-        nextId.value == 1;
+        nextId.value = 1;
      }
    });
  } else {
-    if (prescriptionList.value[0].adviceName) {
-      handleAddPrescription();
-    }
+    // 新增行：调用保存接口将数据持久化到后端
+    row.dbOpType = '1';
+    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('保存成功');
+        nextId.value = 1;
+        // 保存成功后刷新列表，确保后端返回的数据带 requestId
+        getListInfo(false);
+      }
+    });
+    // 不需要再添加空行，保存成功后由 getListInfo 处理
  }
  adviceQueryParams.value.adviceType = undefined;
 }
@@ -1429,12 +1437,13 @@ function handleSaveBatch() {
          if (row) row.isEdit = false;
        });
        getListInfo(false);
-        nextId.value == 1;
+        nextId.value = 1;
        isSaving.value = false;
      }
    })
    .catch((error) => {
      isSaving.value = false;
+      proxy.$modal.msgError(error?.msg || '保存失败，请重试');
    });
 }

--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
@@ -453,6 +453,10 @@ const loadPatientInfo = () => {
      interventionForm.value.startTime = dayjs(res.data.startTime).format(
        'YYYY-MM-DD HH:mm:ss'
      );
+    } else if (res.data.inHosTime) {
+      interventionForm.value.startTime = dayjs(res.data.inHosTime).format(
+        'YYYY-MM-DD HH:mm:ss'
+      );
    } else {
      interventionForm.value.startTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
    }
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -829,7 +829,9 @@
            </el-descriptions>
          </div>
          <div style="padding: 10px">
-            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef" />
+            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef"
+              :generateSourceEnum="1"
+              :sourceBillNo="chargePatientInfo.sourceBillNo" />
            <div class="overlay" v-if="disabled"></div>
          </div>
        </div>
@@ -872,11 +874,17 @@ import { Loading } from '@element-plus/icons-vue' // 🔧 新增：导入 Loadin
 import { getPrescriptionList } from '@/views/clinicmanagement/bargain/component/api'

 // API 导入
-import { getSurgerySchedulePage, addSurgerySchedule, updateSurgerySchedule, deleteSurgerySchedule, getSurgeryScheduleDetail } from '@/api/surgicalschedule'
+import {
+  getSurgerySchedulePage,
+  addSurgerySchedule,
+  updateSurgerySchedule,
+  deleteSurgerySchedule,
+  getSurgeryScheduleDetail
+} from '@/api/surgicalschedule'
 import { listUser } from '@/api/system/user'
 import { deptTreeSelect } from '@/api/system/user'
 import { listOperatingRoom } from '@/api/operatingroom'
-import { getSurgery} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
+import { getSurgeryPage} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
 import { getTenantPage } from '@/api/system/tenant'
 import { getContract } from '@/views/inpatientDoctor/home/components/api.js'
 import SurgeryCharge from '../charge/surgerycharge/index.vue'
@@ -1388,8 +1396,8 @@ async function handleChargeCharge(row) {
    orgId: userStore.organizationId || userStore.orgId || userStore.tenantId || 1,
    // 添加账户ID
    accountId: accountId,
-    // 添加手术申请单号用于追溯
-    sourceBillNo: row.applyId,
+    // 添加手术单号用于关联对应的手术医嘱
+    sourceBillNo: row.operCode,
    //添加计费标志手术计费
    generateSourceEnum: 6
  }
@@ -1450,7 +1458,8 @@ function handleMedicalAdvice(row) {
    role: userStore.roles[0],
    effectiveOrgId : row.effectiveOrgId,
    orgId: userStore.orgId,
-    positionId: userStore.orgId
+    positionId: userStore.orgId,
+    applyId: row.applyId  // 手术申请单ID，用于过滤关联医嘱
  }

  // 🔧 关键修复：如果已有提交的医嘱数据，并且是同一个患者的就诊，则使用保存的数据
@@ -1748,7 +1757,7 @@ function handleQuoteBilling() {
  // 重新拉取计费药品数据
  if (temporaryPatientInfo.value.visitId) {
    temporaryMedicalLoading.value = true // 🔧 新增：开始加载
-    getPrescriptionList(temporaryPatientInfo.value.visitId).then((res) => {
+    getPrescriptionList(temporaryPatientInfo.value.visitId, 6, temporaryPatientInfo.value.operCode).then((res) => {
            if (res.code === 200 && res.data) {
              // 🔧 修复：先清空旧数据，避免数据累积
              temporaryBillingMedicines.value = []
@@ -2023,7 +2032,7 @@ function handleFindApply() {
  getSurgicalScheduleList()
 }

-// 获取手术申请列表（用于“查找”弹窗）
+// 获取手术申请列表（用于”查找”弹窗）
 function getSurgicalScheduleList() {
  applyLoading.value = true
  const params = { ...applyQueryParams }
@@ -2032,8 +2041,7 @@ function getSurgicalScheduleList() {
    params.applyTimeEnd = params.applyTimeRange[1]
    delete params.applyTimeRange
  }
-  getSurgery(params).then((res) => {
-    // Check if data is nested under data.data or directly under data
+  getSurgeryPage(params).then((res) => {
    const responseData = res.data.data || res.data
    applyList.value = responseData.records || []
    applyTotal.value = responseData.total || 0
@@ -2282,4 +2290,4 @@ function getRowClassName({ row, rowIndex }) {
  border-bottom: 1px solid #d9ecff !important;
 }

-</style>
+</style>
Author	SHA1	Message	Date
关羽	6e0e78cd8d	Fix Bug #405 : 住院医生工作站：临床医嘱保存成功后，医嘱条目仍处于可编辑状态（未锁定展示） - handleSaveSign: 新增行点击确定后调用savePrescription持久化到后端，而非仅设置isEdit=false后调用handleAddPrescription - handleSaveBatch: 修复nextId.value == 1 为赋值操作(=) - handleSaveBatch: catch块增加错误提示，保存失败时用户可感知 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:35:47 +08:00
赵云	763c822574	Fix Bug #408 : 门诊医生站检查明细标签页显示暂无数据 - 修复handleRowClick中resp.items被d.data覆盖后丢失的问题根因：后端 getInfo 返回 { data: ExamApply, items: ExamApplyItem[] }，前端先将 resp 赋值给 d，随后又执行 d = resp.data，导致 d 变成 ExamApply 对象，后续 d.items 永远为 undefined，明细列表无法加载。修复：提前保存 resp.items 到 rawItems 变量，后续使用 rawItems 而非 d.items。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:35:47 +08:00
Ranyunqiao	9bec956b4f	bug 362 428 436	2026-05-13 13:35:47 +08:00
陈琳	65a772c7b2	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准 1. 前端列标题：处方号 → 申请单号（表格列 + 详情弹窗） 2. 后端单号生成：原用 PAR 处方号前缀 → 改为 JCZ + yyMMdd + 5位顺序号 3. 新增 AssignSeqEnum.CHECK_APPLY_NO 枚举项（JCZ 前缀） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:35:47 +08:00
xiaoming	994fd9bacc	bug471 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）	2026-05-13 13:35:47 +08:00