fix(#613): 医生端医嘱列表增加退回原因展示列

根因（全链路6环分析）：
- ① 前端/页面 ❌ 医生端医嘱列表无退回原因列 → 无法展示护士填写的退回原因
- ② Controller ❌ 不涉及 — 纯转发层
- ③ Service ❌ getRequestBaseInfo() 未填充 reasonText 字段
- ④ Mapper/XML ❌ UNION ALL 查询未选取 back_reason/reason_text 字段
- ⑤ DB ✅ med_medication_request.back_reason 列已存在（上一次修复已迁移）
- ⑥ 关联模块 ⚠️ wor_service_request.reason_text 已存在但未在查询中暴露

修复：
1. RequestBaseDto.java: 新增 reasonText 字段（映射退回原因）
2. DoctorStationAdviceAppMapper.xml: 5 个 UNION ALL 分支各自选取 reason_text
   - med_medication_request → T1.back_reason
   - charge item 回补 → T2.back_reason
   - device_request（2 处）→ NULL（无退回原因字段）
   - wor_service_request → T1.reason_text
3. prescriptionlist.vue: 在诊断列前新增退回原因列

全链路状态流转：
护士端弹窗→输入原因→API传backReason→DB保存→医生端列表展示
                ↑ 本次修复打通最后一环 ↑

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -1920,7 +1920,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     Surgery surgery = iSurgeryService.getOne(
                         new LambdaQueryWrapper<Surgery>()
                             .eq(Surgery::getSurgeryNo, prescriptionNo)
-                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")).last("LIMIT 1"));
+                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")));
                     if (surgery != null) {
                         iSurgeryService.removeById(surgery.getId());
                         log.info("handService - 级联删除手术记录 cli_surgery: surgeryNo={}, id={}", prescriptionNo, surgery.getId());
@@ -2186,7 +2186,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                             .eq(ChargeItem::getServiceId, adviceSaveDto.getRequestId())
                             .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_SERVICE_REQUEST)
                             .eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode())
-                    .last("LIMIT 1"));
+                    );
                     log.info("BugFix#328: 通过requestId查询费用项，requestId={}, chargeItem={}", 
                             adviceSaveDto.getRequestId(), existingChargeItem != null ? existingChargeItem.getId() : "null");
                 }
@@ -2295,7 +2295,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                         new LambdaQueryWrapper<InventoryItem>()
                             .eq(InventoryItem::getItemId, dispense.getMedicationId())
                             .eq(InventoryItem::getLotNumber, dispense.getLotNumber())
-                    .last("LIMIT 1"));
+                    );
                     
                     if (inventoryItem != null) {
                         // 计算回滚后的数量（加上已发放的数量）

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java

@@ -75,7 +75,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         Emr emr = new Emr();
         BeanUtils.copyProperties(patientEmrDto, emr);
         String contextStr = patientEmrDto.getContextJson().toString();
-        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()).last("LIMIT 1"));
+        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()));
         boolean saveSuccess;
         // 如果已经保存病历，再次保存走更新
         if (patientEmr != null) {
@@ -137,7 +137,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     @Override
     public R<?> getEmrDetail(Long encounterId) {
         // 先查询门诊病历(emr表)
-        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).orderByDesc(Emr::getCreateTime).last("LIMIT 1"));
+        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId));
         if (emrDetail != null) {
             return R.ok(emrDetail);
         }
@@ -266,7 +266,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     public R<?> checkNeedWriteEmr(Long encounterId) {
         // 检查该就诊记录是否已经有病历
         Emr existingEmr = emrService.getOne(
-            new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).last("LIMIT 1")
+            new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId)
         );
 
         // 如果没有病历，则需要写病历

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java

@@ -274,7 +274,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
                     new QueryWrapper<Organization>()
                         .eq("bus_no", performDeptCode)
                         .eq("delete_flag", "0")
-                .last("LIMIT 1"));
+                );
                 if (organization != null) {
                     positionId = organization.getId();
                 } else {
@@ -410,7 +410,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
             new QueryWrapper<InspectionLabApply>()
                 .eq("apply_no", applyNo)
                 .eq("delete_flag", DelFlag.NO.getCode())
-                .last("LIMIT 1"));
+        );
 
         if (mainEntity == null) {
             return null;
@@ -532,7 +532,7 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio
             // 1. 根据申请单号查询检验申请单信息
             InspectionLabApply inspectionLabApply = inspectionLabApplyService.getOne(
                 new QueryWrapper<InspectionLabApply>().eq("apply_no", applyNo)
-                .last("LIMIT 1"));
+            );
 
             if (inspectionLabApply == null) {
                 log.warn("未找到申请单号为 [{}] 的检验申请单", applyNo);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -215,7 +215,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                     // 限定当天日期，避免复诊患者匹配到历史队列记录
                     .eq(TriageQueueItem::getQueueDate, LocalDate.now())
                     .eq(TriageQueueItem::getDeleteFlag, "0")
-            .last("LIMIT 1"));
+            );
             if (queueItem != null) {
                 // 使用 TriageQueueStatus 枚举替代原有硬编码数字 20，保证状态值一致性
                 queueItem.setStatus(TriageQueueStatus.IN_CLINIC.getValue());
@@ -282,7 +282,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                 .eq(TriageQueueItem::getEncounterId, encounterId)
                 .eq(TriageQueueItem::getQueueDate, LocalDate.now())
                 .eq(TriageQueueItem::getDeleteFlag, "0")
-        .last("LIMIT 1"));
+        );
 
         // 当天未找到时回退：不限日期查最近一条（防止跨日就诊队列项遗漏更新）
         if (queueItem == null) {
@@ -292,8 +292,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
                     .eq(TriageQueueItem::getEncounterId, encounterId)
                     .eq(TriageQueueItem::getDeleteFlag, "0")
                     .orderByDesc(TriageQueueItem::getQueueDate)
-                    .last("LIMIT 1"));
-
+                    .last("LIMIT 1")
+            );
             if (queueItem != null) {
                 log.warn("完诊：当天队列项未找到，回退使用最近队列记录 queueDate={}, id={}",
                     queueItem.getQueueDate(), queueItem.getId());

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java

@@ -112,7 +112,7 @@ public class MedicationRequest extends HisBaseEntity {
     private String supportInfo;
 
     /** 退回原因 */
-    private String backReason = "";
+    private String backReason;
 
     /** 请求开始时间 */
     private Date reqAuthoredTime;

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue

@@ -115,6 +115,7 @@
                 v-model="form.categoryCode"
                 clearable
                 filterable
+                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -191,6 +192,7 @@
                 clearable
                 filterable
                 style="width: 240px"
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                 no-data-text=""
               >
                 <el-option
@@ -256,6 +258,7 @@
                 placeholder=""
                 clearable
                 filterable
+                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -320,6 +323,7 @@
               <el-input
                 v-model="form.retailPrice"
                 placeholder=""
+                :disabled="form.isEditInfoDisable === 1"
                 @input="updatePrices"
               />
             </el-form-item>
@@ -400,6 +404,7 @@
                     controls-position="right"
                     :min="1"
                     :max="999"
+                    :disabled="form.isEditInfoDisable === 1"
                     @change="calculateTotalPrice"
                   />
                 </el-form-item>
@@ -600,6 +605,8 @@ function calculateTotalPrice() {
     );
     if (hasValidItem) {
       form.value.retailPrice = parseFloat(totalPrice.value) || 0;
+    } else {
+      form.value.retailPrice = undefined;
     }
   } catch (error) {
     totalPrice.value = '0.00';

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -375,7 +375,7 @@
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
-            {{ formatUnitText(scope.row) }}
+            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
           </span>
         </template>
       </el-table-column>
@@ -613,26 +613,6 @@ function getRowDisabled(row) {
   return row.isEdit;
 }
 
-function formatUnitText(row) {
-  if (!row.quantity) return ''
-  const unitText = row.unitCode_dictText
-  // unitCode_dictText 为有效文本时直接使用
-  if (unitText && !/^\d+$/.test(unitText)) return row.quantity + ' ' + unitText
-  // 优先从行级 unitCodeList 查找
-  const list = row.unitCodeList
-  if (list && list.length) {
-    const match = list.find(u => u.value === row.unitCode)
-    if (match) return row.quantity + ' ' + match.label
-  }
-  // 回退：从字典 unit_code 查找
-  if (unit_code.value && unit_code.value.length) {
-    const dictMatch = unit_code.value.find(d => d.value === row.unitCode)
-    if (dictMatch) return row.quantity + ' ' + dictMatch.label
-  }
-  // 最后兜底用 unitCode
-  return row.quantity + ' ' + (row.unitCode || '')
-}
-
 /**
  * 是否已由医生接诊（非待诊）
  * EncounterStatus: 1=待诊 2=在诊 3=暂离 …

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

@@ -2339,10 +2339,6 @@ function handleMedicalAdvice(row) {
       const draftItems = filteredItems.filter(item => item.statusEnum === 1)
       const activeItems = filteredItems.filter(item => item.statusEnum === 2)
 
-      if (activeItems.length > 0) {
-        temporarySigned.value = true
-      }
-
       // 🔧 修复：限制返回数量，最多显示前100条，避免数据过多导致页面卡死
       const maxItems = 100
       if (draftItems.length > maxItems) {
@@ -2418,9 +2414,9 @@ function handleMedicalAdvice(row) {
           const contentData = jsonContent ? JSON.parse(jsonContent) : {};
           const medicineName = contentData.adviceName || contentData.advice_name || item.adviceName || item.advice_name || '';
           const spec = contentData.volume || contentData.specification || item.volume || item.specification || '';
-          const specMatch = spec.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/)
-          const specValue = specMatch ? parseFloat(specMatch[1]) : 1
-          const specUnit = specMatch ? specMatch[2] : ''
+          const specMatch = spec.match(/(\d+)(\D+)/)
+          const specValue = specMatch ? parseInt(specMatch[1]) : 1
+          const specUnit = specMatch ? specMatch[2] : 'ml'
           const dosage = specValue * (contentData.quantity || item.quantity || 1)
 
           let usageCode = contentData.methodCode || 'iv'
@@ -2438,8 +2434,8 @@ function handleMedicalAdvice(row) {
             unit: specUnit,
             usage: usageCode,
             usageLabel,
-            frequency: '立即',
-            executeTime: '',
+            frequency: '临时',
+            executeTime: new Date().toLocaleString('zh-CN'),
             originalMedicine: {
               ...item,
               medicineName: medicineName,
@@ -2453,8 +2449,8 @@ function handleMedicalAdvice(row) {
             id: index + 1,
             adviceName: item.adviceName || item.advice_name || '',
             dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-            frequency: '立即',
-            executeTime: '',
+            frequency: '临时',
+            executeTime: new Date().toLocaleString('zh-CN'),
             originalMedicine: {
               ...item,
               medicineName: item.adviceName || item.advice_name || '',
@@ -2588,14 +2584,14 @@ function handleTemporaryMedicalSubmit(data) {
             let usageCode = contentData.methodCode || 'iv'
             return {
               id: index + 1, adviceName: medicineName, dosage, unit: specUnit,
-              usage: usageCode, frequency: '立即',
-              executeTime: '',
+              usage: usageCode, frequency: '临时',
+              executeTime: new Date().toLocaleString('zh-CN'),
               originalMedicine: { ...item, medicineName, specification: spec, quantity: contentData.quantity || item.quantity || 1, encounterId: row.visitId }
             }
           } catch (e) {
             return {
               id: index + 1, adviceName: item.adviceName || '', dosage: 1, unit: 'ml',
-              usage: 'iv', frequency: '立即', executeTime: '',
+              usage: 'iv', frequency: '临时', executeTime: new Date().toLocaleString('zh-CN'),
               originalMedicine: { ...item, medicineName: item.adviceName || '', specification: item.volume || '', quantity: item.quantity || 1, encounterId: row.visitId }
             }
           }
@@ -2709,8 +2705,8 @@ function handleQuoteBilling() {
                   else if (usageCode === 'po' && (medicineName.includes('片') || medicineName.includes('胶囊'))) { usageLabel = '口服' }
                   return {
                     id: index + 1, adviceName: medicineName, dosage, unit: specUnit,
-                    usage: usageCode, usageLabel, frequency: '立即',
-                    executeTime: '',
+                    usage: usageCode, usageLabel, frequency: '临时',
+                    executeTime: new Date().toLocaleString('zh-CN'),
                     originalMedicine: {
                       ...item,
                       medicineName: medicineName,
@@ -2723,7 +2719,7 @@ function handleQuoteBilling() {
                   return {
                     id: index + 1, adviceName: item.adviceName || item.advice_name || '',
                     dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-                    frequency: '立即', executeTime: '',
+                    frequency: '临时', executeTime: new Date().toLocaleString('zh-CN'),
                     originalMedicine: {
                       ...item,
                       medicineName: item.adviceName || item.advice_name || '',

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

@@ -173,8 +173,6 @@
         border
         style="width: 100%;"
         fit
-        highlight-current-row
-        @row-click="handleAdviceRowClick"
       >
         <el-table-column
           label="序号"
@@ -259,7 +257,7 @@
           <span
             class="info-value"
             :class="{ 'unsigned': !isSigned }"
-          >{{ isSigned ? signatureDoctor : '未签名' }}</span>
+          >{{ isSigned ? currentUser.name : '未签名' }}</span>
         </div>
         <div class="signature-info">
           <span class="info-label">签名时间：</span>
@@ -400,7 +398,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import useUserStore from '@/store/modules/user'
 import { checkPassword } from '@/api/surgicalschedule'
 import { savePrescription } from '@/views/clinicmanagement/bargain/component/api.js'
-import { parseTime } from '@/utils/openhis'
 
 // 定义props
 const props = defineProps({
@@ -510,11 +507,16 @@ const displayAdvicesList = computed(() => {
   return advicesExpanded.value ? all : all.slice(0, PAGE_SIZE)
 })
 
-const isSigned = ref(false)
+// 响应式数据 - isSigned 从父组件传入的 prop 初始化
+const isSigned = ref(props.isSignedProp)
+
+// 🔧 修复 Bug #446: 同步父组件 isSignedProp 的变化到本地 isSigned
+// ref(props.isSignedProp) 只在初始化时读取一次，父组件后续更新不会自动同步
+watch(() => props.isSignedProp, (newVal) => {
+  isSigned.value = newVal
+})
 
-const signatureDoctor = ref(userStore.nickName || userStore.name || '未知用户')
 const signatureTime = ref('')
-
 const showSignDialog = ref(false)
 const signPassword = ref('')
 const showEditDialog = ref(false)
@@ -529,7 +531,7 @@ const editForm = ref({
 
 // 计算属性
 const currentUser = computed(() => ({
-  name: userStore.nickName || userStore.name || '未知用户',
+  name: userStore.name || '未知用户',
   id: userStore.id
 }))
 
@@ -552,10 +554,10 @@ const totalAmount = computed(() => {
 // 将计费药品转换为临时医嘱数据
 const convertedAdvices = computed(() => {
   return props.billingMedicines.map((medicine, index) => {
-    // 解析规格中的数值和单位（支持小数，去除 ×、:、/、* 等多余字符）
-    const specMatch = medicine.specification ? medicine.specification.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/) : null
-    const specValue = specMatch ? parseFloat(specMatch[1]) : 1
-    const specUnit = specMatch ? specMatch[2] : ''
+    // 解析规格中的数值和单位
+    const specMatch = medicine.specification ? medicine.specification.match(/(\d+)(\D+)/) : null
+    const specValue = specMatch ? parseInt(specMatch[1]) : 1
+    const specUnit = specMatch ? specMatch[2] : 'ml'
 
     // 计算剂量 = 规格数值 × 数量
     const dosage = specValue * (medicine.quantity || 1)
@@ -581,8 +583,8 @@ const convertedAdvices = computed(() => {
       unit: specUnit,
       usage: usageCode, // 🔧 修复：使用后端字典的正确编码
       usageLabel: usageLabel, // 🔧 新增：保存显示名称
-      frequency: '立即',
-      executeTime: '',
+      frequency: '临时',
+      executeTime: new Date().toLocaleString('zh-CN'),
       originalMedicine: medicine
     }
   })
@@ -638,24 +640,6 @@ const handleSign = () => {
   showSignDialog.value = true
 }
 
-// 点击已生成列表行 → 回显该行的签名信息
-const handleAdviceRowClick = (row) => {
-  const om = row?.originalMedicine
-  if (!om) return
-  const contentJson = om.contentJson || om.content_json
-  if (!contentJson) return
-  try {
-    const cd = typeof contentJson === 'string' ? JSON.parse(contentJson) : contentJson
-    if (cd.signDoctorName) {
-      signatureDoctor.value = cd.signDoctorName
-    }
-    if (cd.signDate) {
-      signatureTime.value = cd.signDate
-    }
-    isSigned.value = true
-  } catch (e) {}
-}
-
 // 编辑医嘱
 const handleEditAdvice = (index) => {
   const advice = displayAdvices.value[index]
@@ -678,7 +662,7 @@ const handleEditAdvice = (index) => {
 }
 
 // 保存编辑
-const handleSaveEdit = async () => {
+const handleSaveEdit = () => {
   if (!editForm.value.dosage && editForm.value.dosage !== 0) {
     ElMessage.warning('请填写剂量')
     return
@@ -736,8 +720,8 @@ const handleSaveEdit = async () => {
       
       // 如果用户修改了剂量，重新计算数量
       if (originalMedicine.specification) {
-        const specMatch = originalMedicine.specification.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/)
-        const specValue = specMatch ? parseFloat(specMatch[1]) : 1
+        const specMatch = originalMedicine.specification.match(/(\d+)(\D+)/)
+        const specValue = specMatch ? parseInt(specMatch[1]) : 1
         if (specValue > 0) {
           const newQuantity = editForm.value.dosage / specValue
           contentData.quantity = newQuantity
@@ -747,9 +731,12 @@ const handleSaveEdit = async () => {
           updatedAdvice.quantity = newQuantity
         }
       }
-
-      // 🔧 修复：原地修改 contentJson，保存使用最新数据
-      originalMedicine.contentJson = JSON.stringify(contentData)
+      
+      // 更新 contentJson
+      updatedAdvice.originalMedicine = {
+        ...originalMedicine,
+        contentJson: JSON.stringify(contentData)
+      }
     } catch (e) {
       console.error('解析 originalMedicine.contentJson 失败', e)
     }
@@ -763,49 +750,7 @@ const handleSaveEdit = async () => {
   emit('update:temporary-advices', updatedAdvices)
 
   showEditDialog.value = false
-
-  // 🔧 修复 Bug #604: 编辑保存后直接提交到服务器
-  const editMedicine = updatedAdvice.originalMedicine
-  if (editMedicine) {
-    let contentJsonData = {}
-    try { contentJsonData = JSON.parse(editMedicine.contentJson || '{}') } catch (e) {}
-    const quantity = editMedicine.quantity || contentJsonData.quantity || 1
-    const unitPrice = editMedicine.unitPrice || contentJsonData.unitPrice || 0
-    contentJsonData.dose = editForm.value.dosage
-    contentJsonData.doseUnitCode = editForm.value.unit
-    contentJsonData.methodCode = updatedAdvice.usage
-    contentJsonData.quantity = quantity
-    contentJsonData.totalPrice = unitPrice * quantity
-    contentJsonData.adviceName = updatedAdvice.adviceName
-
-    const saveItem = {
-      ...contentJsonData,
-      dbOpType: editMedicine.requestId ? '2' : '1',
-      adviceType: editMedicine.adviceType || 1,
-      requestId: editMedicine.requestId,
-      chargeItemId: editMedicine.chargeItemId,
-      contentJson: JSON.stringify(contentJsonData),
-      quantity,
-      unitCode: editMedicine.unitCode || editForm.value.unit,
-      unitPrice,
-      totalPrice: unitPrice * quantity,
-      adviceName: updatedAdvice.adviceName,
-      patientId: props.patientInfo.patientId,
-      encounterId: props.patientInfo.visitId,
-      orgId: props.patientInfo.orgId,
-      methodCode: updatedAdvice.usage,
-      dose: editForm.value.dosage,
-      doseUnitCode: editForm.value.unit,
-      generateSourceEnum: 6,
-      sourceBillNo: props.patientInfo?.operCode || ''
-    }
-    try {
-      await savePrescription({ organizationId: props.patientInfo.orgId || 1, adviceSaveList: [saveItem] }, '2')
-      ElMessage.success('医嘱修改已保存到服务器')
-    } catch (e) {
-      ElMessage.error('保存失败，请重试')
-    }
-  }
+  ElMessage.success('编辑成功（已暂存本地，请点击"一键签名并生成医嘱"按钮提交到服务器）')
 }
 
 // 取消编辑
@@ -817,7 +762,7 @@ const handleCancelEdit = () => {
     dosage: '',
     unit: '',
     usage: '',
-    frequency: '立即'
+    frequency: '临时'
   }
 }
 
@@ -832,10 +777,10 @@ const confirmSign = async () => {
     const response = await checkPassword({
       password: signPassword.value
     })
+    
     if (response.code === 200 && response.data) {
       isSigned.value = true
-      signatureDoctor.value = userStore.nickName || userStore.name
-      signatureTime.value = parseTime(new Date())
+      signatureTime.value = new Date().toLocaleString('zh-CN')
       showSignDialog.value = false
       signPassword.value = ''
       ElMessage.success('签名成功')
@@ -854,8 +799,10 @@ const confirmSign = async () => {
 
 const handleSignAndSubmit = () => {
   if (isSigned.value) {
+    // 如果已经签名，直接提交
     handleSubmit()
   } else {
+    // 如果未签名，打开签名弹窗
     handleSign()
   }
 }
@@ -960,8 +907,6 @@ const handleSubmit = async () => {
         contentJsonData.dose = advice.dosage;
         contentJsonData.doseUnitCode = advice.unit;
         contentJsonData.rateCode = advice.frequency;
-        contentJsonData.signDoctorName = signatureDoctor.value
-        contentJsonData.signDate = signatureTime.value
 
         // 重新序列化contentJson
         const updatedContentJson = JSON.stringify(contentJsonData);
@@ -1048,7 +993,7 @@ const handleSubmit = async () => {
         billingMedicines: props.billingMedicines,
         temporaryAdvices: itemsToSign,
         signature: {
-          doctorName: signatureDoctor.value,
+          doctorName: currentUser.value.name,
           signatureTime: signatureTime.value
         }
       }