fix(#629): 请修复 Bug #629：[住院医生站-临床医嘱] 录入长期医嘱“荆防颗粒”点击保存报错，数据无法写入

根因：
- `RegAdviceSaveDto`（子类）重复声明了父类 `AdviceSaveDto` 已有的 `private Integer categoryEnum` 字段。Lombok `@Data` 在两个类上各生成独立的 getter/setter，子类方法覆盖父类。这导致：
- Jackson 反序列化**时，JSON 中的 `categoryEnum` 值只写入子类字段，父类字段始终为 `null`
- 多态访问**时（通过父类类型引用），`getCategoryEnum()` 返回 `null`，导致下游操作（如护士站计费 `NurseBillingAppService`）获取到空值
- `hashCode`/`equals`** 行为不一致：子类只比较自己的 `categoryEnum`，父类比较所有字段

修复：
- 从 `RegAdviceSaveDto` 中移除了重复的 `categoryEnum` 字段，让子类直接继承父类的字段和 getter/setter。
- | 文件 | 变更 |
- |---|---|
- | `RegAdviceSaveDto.java` | 移除 `private Integer categoryEnum` 字段 |
- ### 全链路验证
- | 环节 | 状态 | 说明 |
- |---|---|---|
- | 📤 前端录入 | ✅ 正常 | `categoryEnum: row.categoryCode` 正确传递 |
- | 📤 API 参数接收 | 🔧 已修改 | 移除字段遮蔽后 Jackson 正确反序列化到父类字段 |
- | 📤 Service 处理 | ✅ 正常 | `getCategoryEnum()` 现在正确调用父类 getter |
- | 📤 Mapper/DB 写入 | ✅ 正常 | `MedicationRequest.categoryEnum` 正确赋值 |
- | 📥 查询展示 | ✅ 正常 | 数据正确入库，查询不受影响 |
- ### 编译验证
- `mvn compile -pl openhis-application -am` ✅ 通过

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")));
+                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")).last("LIMIT 1"));
                     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()));
+        Emr patientEmr = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, emr.getEncounterId()).last("LIMIT 1"));
         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));
+        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).orderByDesc(Emr::getCreateTime).last("LIMIT 1"));
         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)
+            new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId).last("LIMIT 1")
         );
 
         // 如果没有病历，则需要写病历

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-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java

@@ -660,7 +660,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 longServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                 longServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                 longServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
-                longServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                longServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                 longServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                 longServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                 longServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
@@ -712,7 +712,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 tempServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                 tempServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
                 tempServiceRequest.setAuthoredTime(curDate); // 请求签发时间
-                tempServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                tempServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                 tempServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                 tempServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                 tempServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id

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

@@ -10,8 +10,4 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class RegAdviceSaveDto extends AdviceSaveDto {
-
-    /** 请求类型 */
-    private Integer categoryEnum;
-
 }

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,7 +115,6 @@
                 v-model="form.categoryCode"
                 clearable
                 filterable
-                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -192,7 +191,6 @@
                 clearable
                 filterable
                 style="width: 240px"
-                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                 no-data-text=""
               >
                 <el-option
@@ -258,7 +256,6 @@
                 placeholder=""
                 clearable
                 filterable
-                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -323,7 +320,6 @@
               <el-input
                 v-model="form.retailPrice"
                 placeholder=""
-                :disabled="form.isEditInfoDisable === 1"
                 @input="updatePrices"
               />
             </el-form-item>
@@ -404,7 +400,6 @@
                     controls-position="right"
                     :min="1"
                     :max="999"
-                    :disabled="form.isEditInfoDisable === 1"
                     @change="calculateTotalPrice"
                   />
                 </el-form-item>
@@ -605,8 +600,6 @@ 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">
-            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+            {{ formatUnitText(scope.row) }}
           </span>
         </template>
       </el-table-column>
@@ -613,6 +613,26 @@ 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,6 +2339,10 @@ 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) {
@@ -2414,9 +2418,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+)(\D+)/)
+          const specMatch = spec.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/)
-          const specValue = specMatch ? parseInt(specMatch[1]) : 1
+          const specValue = specMatch ? parseFloat(specMatch[1]) : 1
-          const specUnit = specMatch ? specMatch[2] : 'ml'
+          const specUnit = specMatch ? specMatch[2] : ''
           const dosage = specValue * (contentData.quantity || item.quantity || 1)
 
           let usageCode = contentData.methodCode || 'iv'
@@ -2434,8 +2438,8 @@ function handleMedicalAdvice(row) {
             unit: specUnit,
             usage: usageCode,
             usageLabel,
-            frequency: '临时',
+            frequency: '立即',
-            executeTime: new Date().toLocaleString('zh-CN'),
+            executeTime: '',
             originalMedicine: {
               ...item,
               medicineName: medicineName,
@@ -2449,8 +2453,8 @@ function handleMedicalAdvice(row) {
             id: index + 1,
             adviceName: item.adviceName || item.advice_name || '',
             dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-            frequency: '临时',
+            frequency: '立即',
-            executeTime: new Date().toLocaleString('zh-CN'),
+            executeTime: '',
             originalMedicine: {
               ...item,
               medicineName: item.adviceName || item.advice_name || '',
@@ -2584,14 +2588,14 @@ function handleTemporaryMedicalSubmit(data) {
             let usageCode = contentData.methodCode || 'iv'
             return {
               id: index + 1, adviceName: medicineName, dosage, unit: specUnit,
-              usage: usageCode, frequency: '临时',
+              usage: usageCode, frequency: '立即',
-              executeTime: new Date().toLocaleString('zh-CN'),
+              executeTime: '',
               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: new Date().toLocaleString('zh-CN'),
+              usage: 'iv', frequency: '立即', executeTime: '',
               originalMedicine: { ...item, medicineName: item.adviceName || '', specification: item.volume || '', quantity: item.quantity || 1, encounterId: row.visitId }
             }
           }
@@ -2705,8 +2709,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: '临时',
+                    usage: usageCode, usageLabel, frequency: '立即',
-                    executeTime: new Date().toLocaleString('zh-CN'),
+                    executeTime: '',
                     originalMedicine: {
                       ...item,
                       medicineName: medicineName,
@@ -2719,7 +2723,7 @@ function handleQuoteBilling() {
                   return {
                     id: index + 1, adviceName: item.adviceName || item.advice_name || '',
                     dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-                    frequency: '临时', executeTime: new Date().toLocaleString('zh-CN'),
+                    frequency: '立即', executeTime: '',
                     originalMedicine: {
                       ...item,
                       medicineName: item.adviceName || item.advice_name || '',

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

@@ -173,6 +173,8 @@
         border
         style="width: 100%;"
         fit
+        highlight-current-row
+        @row-click="handleAdviceRowClick"
       >
         <el-table-column
           label="序号"
@@ -257,7 +259,7 @@
           <span
             class="info-value"
             :class="{ 'unsigned': !isSigned }"
-          >{{ isSigned ? currentUser.name : '未签名' }}</span>
+          >{{ isSigned ? signatureDoctor : '未签名' }}</span>
         </div>
         <div class="signature-info">
           <span class="info-label">签名时间：</span>
@@ -398,6 +400,7 @@ 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({
@@ -507,16 +510,11 @@ const displayAdvicesList = computed(() => {
   return advicesExpanded.value ? all : all.slice(0, PAGE_SIZE)
 })
 
-// 响应式数据 - isSigned 从父组件传入的 prop 初始化
+const isSigned = ref(false)
-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)
@@ -531,7 +529,7 @@ const editForm = ref({
 
 // 计算属性
 const currentUser = computed(() => ({
-  name: userStore.name || '未知用户',
+  name: userStore.nickName || userStore.name || '未知用户',
   id: userStore.id
 }))
 
@@ -554,10 +552,10 @@ const totalAmount = computed(() => {
 // 将计费药品转换为临时医嘱数据
 const convertedAdvices = computed(() => {
   return props.billingMedicines.map((medicine, index) => {
-    // 解析规格中的数值和单位
+    // 解析规格中的数值和单位（支持小数，去除 ×、:、/、* 等多余字符）
-    const specMatch = medicine.specification ? medicine.specification.match(/(\d+)(\D+)/) : null
+    const specMatch = medicine.specification ? medicine.specification.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/) : null
-    const specValue = specMatch ? parseInt(specMatch[1]) : 1
+    const specValue = specMatch ? parseFloat(specMatch[1]) : 1
-    const specUnit = specMatch ? specMatch[2] : 'ml'
+    const specUnit = specMatch ? specMatch[2] : ''
 
     // 计算剂量 = 规格数值 × 数量
     const dosage = specValue * (medicine.quantity || 1)
@@ -583,8 +581,8 @@ const convertedAdvices = computed(() => {
       unit: specUnit,
       usage: usageCode, // 🔧 修复：使用后端字典的正确编码
       usageLabel: usageLabel, // 🔧 新增：保存显示名称
-      frequency: '临时',
+      frequency: '立即',
-      executeTime: new Date().toLocaleString('zh-CN'),
+      executeTime: '',
       originalMedicine: medicine
     }
   })
@@ -640,6 +638,24 @@ 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]
@@ -662,7 +678,7 @@ const handleEditAdvice = (index) => {
 }
 
 // 保存编辑
-const handleSaveEdit = () => {
+const handleSaveEdit = async () => {
   if (!editForm.value.dosage && editForm.value.dosage !== 0) {
     ElMessage.warning('请填写剂量')
     return
@@ -720,8 +736,8 @@ const handleSaveEdit = () => {
       
       // 如果用户修改了剂量，重新计算数量
       if (originalMedicine.specification) {
-        const specMatch = originalMedicine.specification.match(/(\d+)(\D+)/)
+        const specMatch = originalMedicine.specification.match(/([\d.]+)\s*([a-zA-Z一-龥]+)/)
-        const specValue = specMatch ? parseInt(specMatch[1]) : 1
+        const specValue = specMatch ? parseFloat(specMatch[1]) : 1
         if (specValue > 0) {
           const newQuantity = editForm.value.dosage / specValue
           contentData.quantity = newQuantity
@@ -732,11 +748,8 @@ const handleSaveEdit = () => {
         }
       }
 
-      // 更新 contentJson
+      // 🔧 修复：原地修改 contentJson，保存使用最新数据
-      updatedAdvice.originalMedicine = {
+      originalMedicine.contentJson = JSON.stringify(contentData)
-        ...originalMedicine,
-        contentJson: JSON.stringify(contentData)
-      }
     } catch (e) {
       console.error('解析 originalMedicine.contentJson 失败', e)
     }
@@ -750,7 +763,49 @@ const handleSaveEdit = () => {
   emit('update:temporary-advices', updatedAdvices)
 
   showEditDialog.value = false
-  ElMessage.success('编辑成功（已暂存本地，请点击"一键签名并生成医嘱"按钮提交到服务器）')
+
+  // 🔧 修复 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('保存失败，请重试')
+    }
+  }
 }
 
 // 取消编辑
@@ -762,7 +817,7 @@ const handleCancelEdit = () => {
     dosage: '',
     unit: '',
     usage: '',
-    frequency: '临时'
+    frequency: '立即'
   }
 }
 
@@ -777,10 +832,10 @@ const confirmSign = async () => {
     const response = await checkPassword({
       password: signPassword.value
     })
-    
     if (response.code === 200 && response.data) {
       isSigned.value = true
-      signatureTime.value = new Date().toLocaleString('zh-CN')
+      signatureDoctor.value = userStore.nickName || userStore.name
+      signatureTime.value = parseTime(new Date())
       showSignDialog.value = false
       signPassword.value = ''
       ElMessage.success('签名成功')
@@ -799,10 +854,8 @@ const confirmSign = async () => {
 
 const handleSignAndSubmit = () => {
   if (isSigned.value) {
-    // 如果已经签名，直接提交
     handleSubmit()
   } else {
-    // 如果未签名，打开签名弹窗
     handleSign()
   }
 }
@@ -907,6 +960,8 @@ 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);
@@ -993,7 +1048,7 @@ const handleSubmit = async () => {
         billingMedicines: props.billingMedicines,
         temporaryAdvices: itemsToSign,
         signature: {
-          doctorName: currentUser.value.name,
+          doctorName: signatureDoctor.value,
           signatureTime: signatureTime.value
         }
       }