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) {
@@ -122,10 +122,6 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      */
     @Override
     public R<?> getPatientEmrHistory(PatientEmrDto patientEmrDto, Integer pageNo, Integer pageSize) {
-        // 校验参数
-        if (patientEmrDto.getPatientId() == null) {
-            return R.ok(new Page<>(pageNo, pageSize));
-        }
         Page<Emr> page = emrService.page(new Page<>(pageNo, pageSize),
             new LambdaQueryWrapper<Emr>().eq(Emr::getPatientId, patientEmrDto.getPatientId()));
         return R.ok(page);
@@ -140,12 +136,8 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      */
     @Override
     public R<?> getEmrDetail(Long encounterId) {
-        // 校验参数
-        if (encounterId == null) {
-            return R.ok(null);
-        }
         // 先查询门诊病历(emr表)
-        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId), false);
+        Emr emrDetail = emrService.getOne(new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounterId));
         if (emrDetail != null) {
             return R.ok(emrDetail);
         }
@@ -274,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-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -582,10 +582,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         // 处理长期已发放的药品
         if (!longMedDispensedList.isEmpty()) {
             // 生成退药单
-            this.creatRefundMedicationList(longMedDispensedList, procedureIdMap);
+            this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap);
-            // 药品退药请求状态变更(待退药)
-            medicationRequestService.updateCancelledStatusBatch(
-                    longMedDispensedList.stream().map(MedicationDispense::getMedReqId).toList(), null, null);
         }
         // 处理临时已发放药品
         if (!tempMedDispensedList.isEmpty()) {

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.getEffectiveOrgId()); // 执行科室
+                longServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
                 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.getEffectiveOrgId()); // 执行科室
+                tempServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
                 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,4 +10,8 @@ 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,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/doctorstation/pendingEmr.vue

@@ -211,37 +211,14 @@ const handleRowClick = (row) => {
 // 写病历
 const handleWriteEmr = (row) => {
   console.log('写病历:', row)
-  // 弹出写病历弹窗
+  // 这里可以触发写病历事件
-  ElMessageBox.confirm('确定要为患者 ' + row.patientName + ' 写病历吗？', '确认', {
+  // 可能需要跳转到病历编辑页面
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'info'
-  }).then(() => {
-    // 这里可以跳转到病历编辑页面或弹出病历编辑弹窗
-    ElMessage.success('正在打开病历编辑页面...')
-    // TODO: 实现写病历的具体逻辑
-    // 例如：router.push({ path: '/doctorstation/emr', query: { encounterId: row.encounterId } })
-  }).catch(() => {
-    // 取消操作
-  })
 }
 
 // 查看患者
 const handleViewPatient = (row) => {
   console.log('查看患者:', row)
-  // 弹出查看患者弹窗
+  // 这里可以触发查看患者事件
-  ElMessageBox.confirm('确定要查看患者 ' + row.patientName + ' 的详细信息吗？', '确认', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'info'
-  }).then(() => {
-    // 这里可以跳转到患者详情页面或弹出患者详情弹窗
-    ElMessage.success('正在打开患者详情页面...')
-    // TODO: 实现查看患者的具体逻辑
-    // 例如：router.push({ path: '/doctorstation/patient-details', query: { encounterId: row.encounterId } })
-  }).catch(() => {
-    // 取消操作
-  })
 }
 
 // 获取性别文本

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/addDiagnosisDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
-    v-model="dialogVisible"
+    v-model="props.openAddDiagnosisDialog"
-    :title="isUpdateMode ? '修改中医诊断' : '添加中医诊断'"
+    title="添加中医诊断"
     width="1500px"
     append-to-body
     destroy-on-close
@@ -51,7 +51,7 @@
         <div class="search-box">
           <el-input
             v-model="searchMiddleDisease"
-            placeholder="搜索证候名称或编码"
+            placeholder="搜索疾病名称或编码"
             clearable
           >
             <template #prefix>
@@ -131,8 +131,8 @@
 </template>
 
 <script setup>
-import { getTcmCondition, getTcmSyndrome, saveTcmDiagnosis, updateTcmDiagnosis, getTcmDiagnosis } from '@/views/doctorstation/components/api';
+import {getTcmCondition, getTcmSyndrome, saveTcmDiagnosis,} from '@/views/doctorstation/components/api';
-import { computed } from 'vue';
+import {computed} from 'vue';
 
 const props = defineProps({
   openAddDiagnosisDialog: {
@@ -143,17 +143,13 @@ const props = defineProps({
     type: Object,
     required: true,
   },
-  updateZy: {
-    type: Array,
-    default: () => [],
-  },
 });
 
 const conditionList = ref([]);
 const syndromeList = ref([]);
 const tcmDiagonsisList = ref([]);
 const tcmDiagonsisSaveList = ref([]);
-const syndromeSelected = ref(false);
+const syndromeSelected = ref(false); // 当前诊断是否选择对应证候
 const timestamp = ref('');
 const selectedDisease = ref(false);
 const searchDisease = ref('');
@@ -161,70 +157,35 @@ const searchMiddleDisease = ref('');
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(['close']);
 
-const dialogVisible = computed({
-  get: () => props.openAddDiagnosisDialog,
-  set: (val) => {
-    if (!val) {
-      emit('close');
-    }
-  },
-});
-
-const isUpdateMode = computed(() => {
-  return props.updateZy && props.updateZy.length > 0;
-});
-
 function handleOpen() {
   getTcmCondition().then((res) => {
     conditionList.value = res.data.records;
   });
-
-  tcmDiagonsisSaveList.value = [];
-  tcmDiagonsisList.value = [];
-  syndromeSelected.value = true;
-
-  if (isUpdateMode.value) {
-    props.updateZy.forEach((item) => {
-      let updateIds = item.updateId ? item.updateId.split('-') : [];
-      let nameParts = item.name ? item.name.split('-') : [item.name || ''];
-      tcmDiagonsisSaveList.value.push({
-        conditionId: updateIds[0] || '',
-        definitionId: item.illnessDefinitionId || item.definitionId || '',
-        ybNo: item.ybNo,
-        syndromeGroupNo: item.syndromeGroupNo,
-        verificationStatusEnum: item.verificationStatusEnum || 4,
-        medTypeCode: item.medTypeCode,
-      });
-      tcmDiagonsisList.value.push({
-        conditionName: nameParts[0] || '',
-        syndromeName: nameParts[1] || '',
-        syndromeGroupNo: item.syndromeGroupNo,
-        illnessDefinitionId: item.illnessDefinitionId,
-      });
-    });
-  }
 }
 
+// 搜索诊断
 const conditionDatas = computed(() => {
-  if (!searchDisease.value) {
-    return conditionList.value;
-  }
   return conditionList.value.filter((item) => {
-    return item.name.includes(searchDisease.value) || item.ybNo.includes(searchDisease.value);
+    if (searchDisease.value) {
-  });
+      return searchDisease.value == item.name || searchDisease.value == item.ybNo;
-});
-
-const syndromeListDatas = computed(() => {
-  if (!searchMiddleDisease.value) {
-    return syndromeList.value;
     }
-  return syndromeList.value.filter((item) => {
+    return conditionList;
-    return item.name.includes(searchMiddleDisease.value) || item.ybNo.includes(searchMiddleDisease.value);
   });
 });
 
+// 后证
+const syndromeListDatas = computed(() => {
+  return syndromeList.value.filter((item) => {
+    if (searchMiddleDisease.value) {
+      return searchMiddleDisease.value == item.name || searchMiddleDisease.value == item.ybNo;
+    }
+    return syndromeList;
+  });
+});
+
+// 点击诊断列表处理，点击以后才显示证候列表
 function handleClickRow(row) {
-  if (syndromeSelected.value || tcmDiagonsisList.value.length === 0) {
+  if (syndromeSelected.value || tcmDiagonsisList.value == 0) {
     selectedDisease.value = true;
     syndromeSelected.value = false;
     timestamp.value = Date.now();
@@ -236,7 +197,7 @@ function handleClickRow(row) {
       ybNo: row.ybNo,
       syndromeGroupNo: timestamp.value,
       verificationStatusEnum: 4,
-      medTypeCode: undefined,
+      medTypeCode: undefined,  // 不设默认值
     });
     tcmDiagonsisList.value.push({
       conditionName: row.name,
@@ -255,6 +216,7 @@ function clickSyndromeRow(row) {
   syndromeSelected.value = true;
 }
 
+// 删除诊断
 function removeDiagnosis(row, index) {
   tcmDiagonsisList.value.splice(index, 1);
   tcmDiagonsisSaveList.value = tcmDiagonsisSaveList.value.filter((item) => {
@@ -263,33 +225,6 @@ function removeDiagnosis(row, index) {
 }
 
 function save() {
-  const newDiagnosisList = tcmDiagonsisSaveList.value.filter((item) => !item.conditionId);
-
-  if (isUpdateMode.value) {
-    updateTcmDiagnosis({
-      patientId: props.patientInfo.patientId,
-      encounterId: props.patientInfo.encounterId,
-      diagnosisChildList: tcmDiagonsisSaveList.value,
-    }).then((res) => {
-      if (res.code == 200) {
-        if (newDiagnosisList.length > 0) {
-          saveTcmDiagnosis({
-            patientId: props.patientInfo.patientId,
-            encounterId: props.patientInfo.encounterId,
-            diagnosisChildList: newDiagnosisList,
-          }).then((res2) => {
-            if (res2.code == 200) {
-              emit('close');
-              proxy.$modal.msgSuccess('诊断已保存');
-            }
-          });
-        } else {
-          emit('close');
-          proxy.$modal.msgSuccess('诊断已保存');
-        }
-      }
-    });
-  } else {
   saveTcmDiagnosis({
     patientId: props.patientInfo.patientId,
     encounterId: props.patientInfo.encounterId,
@@ -300,30 +235,67 @@ function save() {
       proxy.$modal.msgSuccess('诊断已保存');
     }
   });
-  }
 }
 
 function submit() {
-  const hasNewDiagnosis = tcmDiagonsisSaveList.value.some((item) => !item.conditionId);
+  if (tcmDiagonsisSaveList.value.length > 0 && syndromeSelected.value) {
-
-  if (!hasNewDiagnosis && isUpdateMode.value) {
-    emit('close');
-    return;
-  }
-
-  if (syndromeSelected.value || tcmDiagonsisSaveList.value.length % 2 === 0) {
     save();
   } else {
     proxy.$modal.msgWarning('请选择证候');
   }
 }
-
 function close() {
   emit('close');
 }
 </script>
 
 <style scoped>
+:deep(.pagination-container .el-pagination) {
+  right: 20px !important;
+}
+
+.app-container {
+  max-width: 1400px;
+  margin: 20px auto;
+  padding: 20px;
+  background: white;
+  border-radius: 12px;
+  box-shadow: 0 2px 20px rgba(0, 0, 0, 0.08);
+}
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 15px;
+  border-bottom: 1px solid var(--el-border-color);
+  margin-bottom: 20px;
+}
+
+.header h1 {
+  color: var(--el-color-primary);
+  font-size: 24px;
+  font-weight: 600;
+}
+
+.patient-info {
+  background: var(--el-color-primary-light-9);
+  padding: 15px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+}
+
+.patient-info .info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.patient-info .info-label {
+  width: 100px;
+  color: var(--el-text-color-secondary);
+  font-weight: 500;
+}
+
 .main-content {
   display: grid;
   grid-template-columns: 1fr 1fr 1.2fr;
@@ -350,13 +322,125 @@ function close() {
   border-bottom: 1px solid var(--el-border-color);
 }
 
+.disease-list {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.disease-item {
+  padding: 12px 15px;
+  border-bottom: 1px solid var(--el-border-color-lighter);
+  cursor: pointer;
+  transition: all 0.3s;
+  border-radius: 4px;
+}
+
+.disease-item:hover {
+  background-color: var(--el-color-primary-light-9);
+}
+
+.disease-item.active {
+  background-color: var(--el-color-primary-light-8);
+  border-left: 3px solid var(--el-color-primary);
+}
+
+.disease-name {
+  font-weight: 500;
+  margin-bottom: 5px;
+}
+
+.disease-code {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+}
+
 .search-box {
   margin-bottom: 15px;
 }
 
-.diagnosis-list {
+.disease-categories {
-  max-height: 520px;
+  display: flex;
-  overflow-y: auto;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+
+.category-tag {
+  cursor: pointer;
+  padding: 5px 12px;
+  border-radius: 15px;
+  background: var(--el-fill-color-light);
+  font-size: 13px;
+  transition: all 0.3s;
+}
+
+.category-tag.active {
+  background: var(--el-color-primary);
+  color: white;
+}
+
+.relation-container {
+  text-align: center;
+  padding: 30px 0;
+  border: 2px dashed var(--el-border-color);
+  border-radius: 8px;
+  margin: 20px 0;
+  background: var(--el-fill-color-lighter);
+}
+
+.relation-icon {
+  margin-bottom: 15px;
+  color: var(--el-color-primary);
+}
+
+.relation-text {
+  font-size: 18px;
+  font-weight: 500;
+  color: var(--el-text-color-primary);
+}
+
+.syndrome-details {
+  padding: 15px;
+  background: var(--el-color-primary-light-9);
+  border-radius: 8px;
+  border: 1px solid var(--el-color-primary-light-5);
+}
+
+.detail-item {
+  margin-bottom: 12px;
+}
+
+.detail-label {
+  font-weight: 500;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 3px;
+}
+
+.actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 15px;
+  padding-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+}
+
+.empty-state {
+  text-align: center;
+  padding: 40px 0;
+  color: var(--el-text-color-secondary);
+}
+
+.diagnosis-history {
+  margin-top: 20px;
+  border-top: 1px solid var(--el-border-color);
+  padding-top: 20px;
+}
+
+.history-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin-bottom: 12px;
+  color: var(--el-text-color-primary);
 }
 
 .history-item {
@@ -367,6 +451,17 @@ function close() {
   border-radius: 0 4px 4px 0;
 }
 
+.diagnosis-list {
+  max-height: 520px;
+  overflow-y: auto;
+}
+
+.history-date {
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  margin-bottom: 5px;
+}
+
 .history-diagnosis {
   display: flex;
   justify-content: space-between;
@@ -374,9 +469,16 @@ function close() {
   margin-bottom: 5px;
 }
 
-.empty-state {
+.history-note {
-  text-align: center;
+  font-size: 13px;
-  padding: 40px 0;
   color: var(--el-text-color-secondary);
+  padding-top: 5px;
+  border-top: 1px dashed var(--el-border-color);
+  margin-top: 5px;
+}
+
+.empty-list {
+  padding: 20px 0;
+  text-align: center;
 }
 </style>

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/chineseMedicineDialog.vue

@@ -1,60 +1,14 @@
 <template>
   <el-dialog
     v-model="visible"
-    title="中医诊断"
+    top="6vh"
     :width="width"
+    title="中医诊断"
     :z-index="20"
-    append-to-body
-    destroy-on-close
     @open="openAct"
     @closed="closedAct"
   >
-    <el-form
+    中医诊断
-      ref="formRef"
-      :model="formData"
-      :rules="rules"
-      label-width="100px"
-    >
-      <el-form-item
-        label="中医诊断"
-        prop="conditionCode"
-      >
-        <el-select
-          v-model="formData.conditionCode"
-          placeholder="请选择中医诊断"
-          filterable
-          clearable
-          style="width: 100%"
-          @change="handleConditionChange"
-        >
-          <el-option
-            v-for="item in conditionOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="中医证候"
-        prop="syndromeCode"
-      >
-        <el-select
-          v-model="formData.syndromeCode"
-          placeholder="请选择中医证候"
-          filterable
-          clearable
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in syndromeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
     <template #footer>
       <el-button
         size="fixed"
@@ -66,7 +20,7 @@
       <el-button
         size="fixed"
         type="primary"
-        @click="handleSubmit"
+        @click="handleSubmit(signFormRef)"
       >
         保存
       </el-button>
@@ -75,111 +29,113 @@
 </template>
 <script  setup>
 import {onMounted, reactive, ref} from 'vue'
-import { ElMessage } from 'element-plus'
+import {dayjs} from 'element-plus'
-import { getTcmCondition, getTcmSyndrome, saveTcmDiagnosis } from '../api'
+// import { IInPatient } from '@/model/IInPatient'
 
-const { proxy } = getCurrentInstance()
+const currentInPatient = ref({})
+const initCurrentInPatient = () => {
+  currentInPatient.value = {
+    feeType: '08',
+    sexName: '男',
+    age: '0',
+  }
+}
+/* 初始化数据 */
+const init = () => {
+  initCurrentInPatient()
+}
 
-const conditionOptions = ref([])
+/* 入科 */
-const syndromeOptions = ref([])
+const signForm = ref({
-
+  visitCode: '', // 	就诊流水号
-const formData = ref({
+  height: 0, // 身高
-  conditionCode: '',
+  weight: 0, // 体重
-  syndromeCode: '',
+  temperature: 0, // 体温
+  hertRate: 0, // 心率
+  pulse: 0, // 	脉搏
+  highBloodPressure: 0, // 收缩压
+  endBloodPressure: 0, // 舒张压
+  loginDeptCode: '', // 	当前登录科室
+  bingqing: '', //患者病情
+  inDeptDate: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), //入院时间
+  signsId: '',
 })
-
 const rules = reactive({
-  conditionCode: [{ required: true, message: '请选择中医诊断', trigger: ['blur', 'change'] }],
+  admittedDoctor: [{ required: true, message: '请选择住院医生', trigger: ['blur', 'change'] }],
-  syndromeCode: [{ required: true, message: '请选择中医证候', trigger: ['blur', 'change'] }],
+  masterNurse: [{ required: true, message: '请选择责任护士', trigger: ['blur', 'change'] }],
 })
+const printWristband = ref(false)
+const emits = defineEmits(['okAct'])
 
-const props = defineProps({
+const visible = defineModel('visible')
-  patientInfo: {
+const width = '920px'
-    type: Object,
-    default: () => ({}),
-  },
-})
-
-const emit = defineEmits(['ok-act'])
-
-const visible = defineModel<boolean>('visible')
-const width = '500px'
 
+/* 取消 */
 const cancelAct = () => {
   visible.value = false
 }
-
+/* 录入患者体征*/
-function handleConditionChange() {
+const signFormRef = ref()
-  formData.value.syndromeCode = ''
+const handleSubmit = async (formEl) => {
-  loadSyndromeOptions(formData.value.conditionCode)
+  if (!formEl) return
-}
+  await formEl.validate((valid, fields) => {
-
-function loadConditionOptions() {
-  getTcmCondition().then((res) => {
-    if (res.data && res.data.records) {
-      conditionOptions.value = res.data.records.map((item) => ({
-        value: item.ybNo,
-        label: item.name,
-      }))
-    }
-  })
-}
-
-function loadSyndromeOptions(conditionCode) {
-  const params = conditionCode ? { conditionCode } : {}
-  getTcmSyndrome(params).then((res) => {
-    if (res.data && res.data.records) {
-      syndromeOptions.value = res.data.records.map((item) => ({
-        value: item.ybNo,
-        label: item.name,
-      }))
-    }
-  })
-}
-
-const formRef = ref()
-const handleSubmit = async () => {
-  if (!formRef.value) return
-  await formRef.value.validate((valid) => {
     if (valid) {
-      const submitData = {
+      console.log('submit!')
-        conditionCode: formData.value.conditionCode,
+      try {
-        syndromeCode: formData.value.syndromeCode,
+        // 录入患者体征方法(signForm.value).then((res: any) => {
+        //   ElMessage({
+        //     message: '登记成功！',
+        //     type: 'success',
+        //     grouping: true,
+        //     showClose: true,
+        //   })
+        //   emits('okAct')
+        // })
+      } catch (error) {
+        console.log(error)
       }
-      if (props.patientInfo && props.patientInfo.patientId) {
-        submitData.patientId = props.patientInfo.patientId
-        submitData.encounterId = props.patientInfo.encounterId
-      }
-      submitData.diagnosisChildList = [{
-        conditionCode: formData.value.conditionCode,
-        syndromeCode: formData.value.syndromeCode,
-      }]
-      saveTcmDiagnosis(submitData).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('中医诊断保存成功')
-          emit('ok-act')
-          cancelAct()
-        } else {
-          ElMessage.error(res.msg || '保存失败')
-        }
-      }).catch(() => {
-        ElMessage.error('保存失败，请重试')
-      })
     }
   })
 }
-
 const openAct = () => {
-  formData.value = { conditionCode: '', syndromeCode: '' }
+  init()
-  loadConditionOptions()
-  loadSyndromeOptions()
 }
 const closedAct = () => {
   visible.value = false
 }
-onMounted(() => {
+onMounted(() => {})
-  loadConditionOptions()
-})
 </script>
 <style lang="scss" scoped>
+.transferIn-container {
+  width: 100%;
+
+  .admission-signs,
+  .admission-information {
+    width: 888px;
+    .unit {
+      display: inline-block;
+      margin-left: 10px;
+      color: #bbb;
+      font-weight: 400;
+      font-size: 14px;
+      font-family: '思源黑体 CN';
+    }
+  }
+}
+
+.print-wriBtn {
+  margin-left: 565px;
+}
+
+.w-p100 {
+  width: 100%;
+}
+
+.w-80 {
+  width: 80px;
+}
+
+.mb-90 {
+  margin-bottom: 90px !important;
+}
 </style>

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -159,7 +159,7 @@
                     style="width: 150px"
                   >
                     <el-option
-                      v-for="item in diag_type"
+                      v-for="item in med_type"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -281,7 +281,6 @@
     <AddDiagnosisDialog
       :open-add-diagnosis-dialog="openAddDiagnosisDialog"
       :patient-info="props.patientInfo"
-      :update-zy="tcmDiagnosisListForEdit"
       @close="closeDiagnosisDialog"
     />
   </div>
@@ -332,15 +331,13 @@ const props = defineProps({
 const emits = defineEmits(['diagnosisSave']);
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
-// 获取诊断类型字典（住院诊断类别）
+const { med_type } = proxy.useDict('med_type');
-const { diag_type } = proxy.useDict('diag_type');
 const rules = ref({
   name: [{ required: true, message: '请选择诊断', trigger: 'change' }],
   medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
   diagSrtNo: [{ required: true, message: '请输入诊断序号', trigger: 'change' }],
 });
 const diagnosisNetDatas = ref([]);
-const tcmDiagnosisListForEdit = ref([]);
 
 watch(
   () => form.value.diagnosisList,
@@ -451,7 +448,6 @@ function getList() {
 
 init();
 function init() {
-  loadTcmSyndromeOptions();
   diagnosisInit().then((res) => {
     if (res.code == 200) {
       diagnosisOptions.value = res.data.verificationStatusOptions;
@@ -616,13 +612,6 @@ function addDiagnosisItem() {
 
 // 添加中医诊断
 function handleAddTcmDiagonsis() {
-  tcmDiagnosisListForEdit.value = form.value.diagnosisList.filter(
-    (item) => item.diagnosisSystem === '中医'
-  ).map((item) => ({
-    ...item,
-    updateId: item.conditionId ? `${item.conditionId}-${item.syndromeGroupNo || ''}` : '' ,
-    illnessDefinitionId: item.definitionId || '' ,
-  }));
   openAddDiagnosisDialog.value = true;
 }
 

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="diagnose-container">
-    <!-- 常用诊断、个人诊断、科室诊断、历史诊断 -->
+    <!-- 常用诊断、个人诊断、科室诊断、历史诊断、 -->
     <diagnose-folder
       :folder="mockData"
       :level="0"
@@ -10,44 +10,29 @@
         <el-space>
           <el-button
             type="primary"
-            @click="addNewDiagnosis"
+            @click="addNewWestern"
           >
-            新增诊断
+            开立诊断
           </el-button>
           <el-button type="primary">
             既往诊断
           </el-button>
+          <!-- 患者诊断 -->
           <el-button
-            type="primary"
+            type="danger"
             @click="addNewChinese"
           >
             中医诊断
           </el-button>
-          <el-button
-            type="danger"
-            :disabled="!selectedRows.length"
-            @click="handleDelete"
-          >
-            删除诊断
-          </el-button>
-          <el-button
-            type="primary"
-            :loading="saveLoading"
-            @click="handleSaveDiagnosis"
-          >
-            保存诊断
-          </el-button>
         </el-space>
       </div>
       <div class="diagnoseData-container">
         <el-table
-          ref="diagnoseTableRef"
           :data="diagnoseData"
           border
           row-key="id"
           style="width: 100%; height: 100%"
           highlight-current-row
-          @selection-change="handleSelectionChange"
         >
           <el-table-column
             type="selection"
@@ -55,531 +40,166 @@
             width="40"
           />
           <el-table-column
-            label="序号"
+            prop="date"
-            type="index"
+            label="诊断类型"
-            width="50"
+            width="180"
-            fixed="left"
+            sortable
           />
           <el-table-column
-            label="诊断体系"
+            prop="name"
-            prop="diagnosisSystem"
-            width="120"
-          >
-            <template #default="scope">
-              <el-select
-                v-model="scope.row.diagnosisSystem"
-                placeholder=" "
-                style="width: 100%"
-                @change="handleDiagnosisSystemChange(scope.row)"
-              >
-                <el-option
-                  label="西医"
-                  value="西医"
-                />
-                <el-option
-                  label="中医"
-                  value="中医"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="诊断类别"
-            prop="classification"
-            width="120"
-          >
-            <template #default="scope">
-              <el-select
-                v-model="scope.row.classification"
-                placeholder=" "
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in diag_type"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
             label="诊断名称"
-            prop="name"
             width="180"
-          >
-            <template #default="scope">
-              <div
-                class="diagnosis-text"
-                @click="handleDiagnosisNameClick(scope.row, scope.$index)"
-              >
-                <span class="diagnosis-text-content">{{ scope.row.name || '点击选择诊断' }}</span>
-                <el-icon class="diagnosis-text-icon">
-                  <arrow-down />
-                </el-icon>
-              </div>
-              <el-popover
-                v-if="scope.row.showPopover"
-                placement="bottom"
-                :width="400"
-                trigger="manual"
-              >
-                <template #reference>
-                  <span />
-                </template>
-                <div class="diagnosis-popover-container">
-                  <div class="diagnosis-popover-header">
-                    <span class="diagnosis-popover-title">选择诊断</span>
-                    <el-link
-                      type="primary"
-                      class="diagnosis-popover-close"
-                      @click="closeDiagnosisPopover(scope.row)"
-                    >
-                      关闭
-                    </el-link>
-                  </div>
-                  <div class="diagnosis-popover-body">
-                    <diagnosislist
-                      :diagnosis-searchkey="diagnosisSearchkey"
-                      @select-diagnosis="(row) => handleSelectDiagnosis(row, scope.row, scope.$index)"
-                    />
-                  </div>
-                </div>
-              </el-popover>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="中医证候"
-            prop="tcmSyndromeName"
-            width="180"
-          >
-            <template #default="scope">
-              <template v-if="scope.row.diagnosisSystem === '中医'">
-                <div
-                  class="diagnosis-text"
-                  @click="handleTcmSyndromeClick(scope.row, scope.$index)"
-                >
-                  <span class="diagnosis-text-content">{{ scope.row.tcmSyndromeName || '请选择中医证候' }}</span>
-                  <el-icon class="diagnosis-text-icon">
-                    <arrow-down />
-                  </el-icon>
-                </div>
-                <el-popover
-                  v-if="scope.row.showSyndromePopover"
-                  placement="bottom"
-                  :width="400"
-                  trigger="manual"
-                >
-                  <template #reference>
-                    <span />
-                  </template>
-                  <div class="diagnosis-popover-container">
-                    <div class="diagnosis-popover-header">
-                      <span class="diagnosis-popover-title">选择中医证候</span>
-                      <el-link
-                        type="primary"
-                        class="diagnosis-popover-close"
-                        @click="closeSyndromePopover(scope.row)"
-                      >
-                        关闭
-                      </el-link>
-                    </div>
-                    <div class="diagnosis-popover-body">
-                      <el-input
-                        v-model="syndromeSearchkey"
-                        placeholder="搜索证候名称"
-                        clearable
-                        style="margin-bottom: 8px"
-                        @input="handleSyndromeSearch"
-                      />
-                      <el-table
-                        :data="filteredSyndromeList"
-                        highlight-current-row
-                        max-height="300"
-                        @row-click="(row) => handleSelectSyndrome(row, scope.row)"
-                      >
-                        <el-table-column
-                          label="证候名称"
-                          prop="name"
-                          align="center"
           />
           <el-table-column
-                          label="医保编码"
+            prop="address"
-                          prop="ybNo"
+            label="主诊"
-                          align="center"
           />
-                      </el-table>
-                    </div>
-                  </div>
-                </el-popover>
-              </template>
-              <span v-else>—</span>
-            </template>
-          </el-table-column>
           <el-table-column
+            prop="address"
+            label="复诊"
+          />
+          <el-table-column
+            prop="address"
+            label="疑似"
+          />
+          <el-table-column
+            prop="address"
+            label="传染"
+          />
+          <el-table-column
+            prop="address"
             label="入院病情"
-            prop="admissionCondition"
+            width="180"
-            width="120"
           />
           <el-table-column
+            prop="address"
             label="转归"
-            prop="outcome"
+            width="180"
-            width="120"
           />
           <el-table-column
+            prop="address"
             label="转归日期"
-            prop="outcomeDate"
+            width="180"
-            width="140"
           />
           <el-table-column
+            prop="address"
             label="诊断科室"
-            prop="deptName"
+            width="180"
-            width="140"
           />
           <el-table-column
+            prop="address"
             label="诊断医师"
-            prop="diagnosisDoctor"
+            width="180"
-            width="140"
           />
           <el-table-column
+            prop="address"
             label="诊断日期"
-            prop="diagnosisTime"
+            width="180"
-            width="140"
           />
           <el-table-column
             fixed="right"
             label="操作"
             width="120"
           >
-            <template #default="scope">
+            <template #default="props">
               <el-space>
                 <el-tooltip
                   content="删除"
                   placement="bottom"
                 >
-                  <el-icon @click="deleteRow(scope.row, scope.$index)">
+                  <el-icon @click="deleteDiagnose(row)">
                     <Delete />
                   </el-icon>
                 </el-tooltip>
                 <el-tooltip
-                  v-if="scope.$index !== diagnoseData.length - 1"
+                  v-if="props.$index !== diagnoseData.length - 1"
                   content="下移"
                   placement="bottom"
                 >
-                  <el-icon @click="moveDown(scope.row, scope.$index)">
+                  <el-icon @click="download(props.row)">
                     <Download />
                   </el-icon>
                 </el-tooltip>
                 <el-tooltip
-                  v-if="scope.$index !== 0"
+                  v-if="props.$index !== 0"
                   content="上移"
                   placement="bottom"
                 >
-                  <el-icon @click="moveUp(scope.row, scope.$index)">
+                  <el-icon @click="upload(props.row)">
                     <Upload />
                   </el-icon>
                 </el-tooltip>
+                <el-tooltip
+                  v-if="props.$index !== 0"
+                  content="置顶"
+                  placement="bottom"
+                >
+                  <el-icon @click="top(props.row)">
+                    <Top />
+                  </el-icon>
+                </el-tooltip>
+                <el-tooltip
+                  v-if="props.$index !== diagnoseData.length - 1"
+                  content="置底"
+                  placement="bottom"
+                >
+                  <el-icon @click="bottom(props.row)">
+                    <Bottom />
+                  </el-icon>
+                </el-tooltip>
               </el-space>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
-    <WesternMedicineDialog v-model:visible="westernMedicineDialogVisible" />
+    <WesternMedicineDialog v-model:visible="WesternMedicineDialogVisible" />
-    <ChineseMedicineDialog
+    <ChineseMedicineDialog v-model:visible="ChineseMedicineDialogVisible" />
-      v-model:visible="chineseMedicineDialogVisible"
-      :patient-info="patientInfo"
-      @ok-act="loadDiagnosisData"
-    />
   </div>
 </template>
 <script setup>
-import {onMounted, reactive, ref, computed} from 'vue'
+import {onBeforeMount, onMounted, reactive, ref} from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+// const { proxy } = getCurrentInstance()
-import { ArrowDown, Delete, Download, Upload } from '@element-plus/icons-vue'
+// const emits = defineEmits([])
+// const props = defineProps({})
+// import DiagnoseFolder from './diagnoseFolder.vue'
 import WesternMedicineDialog from './westernMedicineDialog.vue'
 import ChineseMedicineDialog from './chineseMedicineDialog.vue'
-import Diagnosislist from './diagnosislist.vue'
-import {
-  saveDiagnosis,
-  delEncounterDiagnosis,
-  getEncounterDiagnosis,
-  getTcmSyndrome,
-} from '../api'
 
-const { proxy } = getCurrentInstance()
+const diagnoseData = ref([
-
+  {
-const props = defineProps({
+    id: 1,
-  patientInfo: {
+    sort: 1,
-    type: Object,
+    name: '新冠',
-    default: () => ({}),
   },
-})
+  {
+    id: 2,
+    sort: 2,
+    name: '新冠as',
+  },
+  {
+    id: 3,
+    sort: 3,
+    name: '新冠12',
+  },
+  {
+    id: 4,
+    sort: 4,
+    name: '新冠2121',
+  },
+  {
+    id: 5,
+    sort: 5,
+    name: '新冠12',
+  },
+  {
+    id: 6,
+    sort: 6,
+    name: '新冠21',
+  },
+])
 
-const diagnoseData = ref([])
+// 模拟数据
-const selectedRows = ref([])
-const saveLoading = ref(false)
-const diagnoseTableRef = ref()
-const diagnosisSearchkey = ref('')
-const syndromeSearchkey = ref('')
-const syndromeList = ref([])
-
-// 获取诊断类型字典（住院诊断类别）
-const { diag_type } = proxy.useDict('diag_type')
-
-const filteredSyndromeList = computed(() => {
-  if (!syndromeSearchkey.value) {
-    return syndromeList.value
-  }
-  const keyword = syndromeSearchkey.value.toLowerCase()
-  return syndromeList.value.filter(item =>
-    (item.name && item.name.toLowerCase().includes(keyword)) ||
-    (item.ybNo && item.ybNo.toLowerCase().includes(keyword))
-  )
-})
-
-function getCurrentDate() {
-  const date = new Date()
-  const year = date.getFullYear()
-  let month = date.getMonth() + 1
-  let day = date.getDate()
-  month = month < 10 ? '0' + month : month
-  day = day < 10 ? '0' + day : day
-  return `${year}-${month}-${day}`
-}
-
-function addNewDiagnosis() {
-  const maxSortNo = diagnoseData.value.length > 0
-    ? Math.max(...diagnoseData.value.map(item => item.sortNo || 0))
-    : 0
-  diagnoseData.value.push({
-    id: Date.now(),
-    sortNo: maxSortNo + 1,
-    diagnosisSystem: '西医',
-    classification: '主诊断',
-    name: '',
-    ybNo: '',
-    definitionId: '',
-    tcmSyndromeCode: '',
-    tcmSyndromeName: '',
-    admissionCondition: '',
-    outcome: '',
-    outcomeDate: '',
-    deptName: '',
-    diagnosisDoctor: proxy.$store?.state?.user?.name || '',
-    diagnosisTime: getCurrentDate(),
-    showPopover: false,
-    showSyndromePopover: false,
-    isNew: true,
-  })
-}
-
-function addNewChinese() {
-  chineseMedicineDialogVisible.value = true
-}
-
-function handleDiagnosisSystemChange(row) {
-  if (row.diagnosisSystem === '西医') {
-    row.tcmSyndromeCode = ''
-    row.tcmSyndromeName = ''
-  }
-  row.name = ''
-  row.ybNo = ''
-  row.showPopover = false
-  row.showSyndromePopover = false
-}
-
-function handleDiagnosisNameClick(row, index) {
-  if (row.diagnosisSystem === '中医') {
-    row.showPopover = false
-    return
-  }
-  diagnoseData.value.forEach((item, idx) => {
-    if (idx !== index) {
-      item.showPopover = false
-    }
-  })
-  row.showPopover = true
-}
-
-function handleSelectDiagnosis(diagRow, rowData) {
-  rowData.name = diagRow.name
-  rowData.ybNo = diagRow.ybNo
-  rowData.definitionId = diagRow.id
-  rowData.showPopover = false
-}
-
-function closeDiagnosisPopover(row) {
-  row.showPopover = false
-}
-
-function handleTcmSyndromeClick(row, index) {
-  diagnoseData.value.forEach((item, idx) => {
-    if (idx !== index) {
-      item.showSyndromePopover = false
-    }
-  })
-  loadSyndromeList()
-  row.showSyndromePopover = true
-}
-
-function handleSyndromeSearch() {}
-
-function loadSyndromeList() {
-  getTcmSyndrome().then((res) => {
-    if (res.data && res.data.records) {
-      syndromeList.value = res.data.records
-    }
-  })
-}
-
-function handleSelectSyndrome(syndromeRow, rowData) {
-  rowData.tcmSyndromeCode = syndromeRow.ybNo
-  rowData.tcmSyndromeName = syndromeRow.name
-  rowData.showSyndromePopover = false
-}
-
-function closeSyndromePopover(row) {
-  row.showSyndromePopover = false
-}
-
-function handleSelectionChange(rows) {
-  selectedRows.value = rows
-}
-
-function deleteRow(row, index) {
-  diagnoseData.value.splice(index, 1)
-}
-
-function moveDown(row, index) {
-  if (index >= diagnoseData.value.length - 1) return
-  const temp = diagnoseData.value[index]
-  diagnoseData.value[index] = diagnoseData.value[index + 1]
-  diagnoseData.value[index + 1] = temp
-  diagnoseData.value = [...diagnoseData.value]
-}
-
-function moveUp(row, index) {
-  if (index <= 0) return
-  const temp = diagnoseData.value[index]
-  diagnoseData.value[index] = diagnoseData.value[index - 1]
-  diagnoseData.value[index - 1] = temp
-  diagnoseData.value = [...diagnoseData.value]
-}
-
-function handleDelete() {
-  if (!selectedRows.value.length) {
-    ElMessage.warning('请先选择要删除的诊断')
-    return
-  }
-  ElMessageBox.confirm('确定删除选中的诊断吗？', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  }).then(() => {
-    const deleteIds = selectedRows.value
-      .filter(item => item.conditionId)
-      .map(item => item.conditionId)
-    const newRows = selectedRows.value.filter(item => !item.conditionId)
-
-    newRows.forEach(item => {
-      const idx = diagnoseData.value.findIndex(d => d.id === item.id)
-      if (idx > -1) {
-        diagnoseData.value.splice(idx, 1)
-      }
-    })
-
-    deleteIds.forEach(id => {
-      delEncounterDiagnosis(id).then(() => {
-        const idx = diagnoseData.value.findIndex(d => d.conditionId === id)
-        if (idx > -1) {
-          diagnoseData.value.splice(idx, 1)
-        }
-      })
-    })
-
-    selectedRows.value = []
-    ElMessage.success('删除成功')
-  }).catch(() => {})
-}
-
-async function handleSaveDiagnosis() {
-  if (!diagnoseData.value.length) {
-    ElMessage.warning('没有需要保存的诊断')
-    return
-  }
-
-  for (let i = 0; i < diagnoseData.value.length; i++) {
-    const item = diagnoseData.value[i]
-    if (!item.name) {
-      ElMessage.warning(`第${i + 1}行诊断名称不能为空`)
-      return
-    }
-    if (item.diagnosisSystem === '中医' && !item.tcmSyndromeCode) {
-      ElMessage.error('中医诊断不完整，请录入对应的证候！')
-      return
-    }
-  }
-
-  saveLoading.value = true
-  try {
-    const diagnosisList = diagnoseData.value.map((item, index) => ({
-      conditionId: item.conditionId || '',
-      ybNo: item.ybNo || '',
-      name: item.name,
-      definitionId: item.definitionId || '',
-      classification: item.classification || '主诊断',
-      diagnosisSystem: item.diagnosisSystem || '西医',
-      tcmSyndromeCode: item.tcmSyndromeCode || '',
-      tcmSyndromeName: item.tcmSyndromeName || '',
-      admissionCondition: item.admissionCondition || '',
-      outcome: item.outcome || '',
-      outcomeDate: item.outcomeDate || '',
-      diagnosisDoctor: item.diagnosisDoctor || '',
-      diagnosisTime: item.diagnosisTime || getCurrentDate(),
-      diagSrtNo: index + 1,
-    }))
-
-    const saveData = {
-      patientId: props.patientInfo?.patientId || '',
-      encounterId: props.patientInfo?.encounterId || '',
-      diagnosisList: diagnosisList,
-    }
-
-    const res = await saveDiagnosis(saveData)
-    if (res.code === 200) {
-      ElMessage.success('诊断保存成功')
-      loadDiagnosisData()
-    } else {
-      ElMessage.error(res.msg || '保存失败')
-    }
-  } catch (error) {
-    ElMessage.error('保存失败，请重试')
-  } finally {
-    saveLoading.value = false
-  }
-}
-
-function loadDiagnosisData() {
-  if (!props.patientInfo?.encounterId) return
-  getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
-    if (res.data) {
-      const westernDiagnoses = (res.data || []).filter(item => item.typeName !== '中医诊断')
-      diagnoseData.value = westernDiagnoses.map((item, index) => ({
-        ...item,
-        diagnosisSystem: item.diagnosisSystem || '西医',
-        classification: item.classification || '主诊断',
-        tcmSyndromeCode: item.tcmSyndromeCode || '',
-        tcmSyndromeName: item.tcmSyndromeName || '',
-        showPopover: false,
-        showSyndromePopover: false,
-        diagSrtNo: index + 1,
-      }))
-    }
-  })
-}
-
-// 模拟数据（常用/科室/个人/历史诊断树）
 const mockData = ref([
   {
     name: '常用',
@@ -587,18 +207,28 @@ const mockData = ref([
       {
         name: '文件夹 1',
         children: [
-          { name: '霍乱' },
+          {
-          { name: '新型冠状病毒' },
+            name: '霍乱',
+          },
+          {
+            name: '新型冠状病毒新型冠状病毒新型冠状病毒',
+          },
         ],
       },
       {
         name: '文件夹 2',
         children: [
-          { name: '普外科' },
+          {
-          { name: '骨科' },
+            name: '普外科',
+          },
+          {
+            name: '骨科',
+          },
         ],
       },
-      { name: '新型冠状病毒' },
+      {
+        name: '新型冠状病毒',
+      },
     ],
   },
   {
@@ -607,18 +237,28 @@ const mockData = ref([
       {
         name: '内科',
         children: [
-          { name: '呼吸内科' },
+          {
-          { name: '消化内科' },
+            name: '呼吸内科',
+          },
+          {
+            name: '消化内科',
+          },
         ],
       },
       {
         name: '外科',
         children: [
-          { name: '普外科' },
+          {
-          { name: '骨科' },
+            name: '普外科',
+          },
+          {
+            name: '骨科',
+          },
         ],
       },
-      { name: '儿科' },
+      {
+        name: '儿科',
+      },
     ],
   },
   {
@@ -627,27 +267,79 @@ const mockData = ref([
       {
         name: '内科',
         children: [
-          { name: '呼吸内科' },
+          {
-          { name: '消化内科' },
+            name: '呼吸内科',
+          },
+          {
+            name: '消化内科',
+          },
         ],
       },
+      {
+        name: '外科',
+        children: [
+          {
+            name: '普外科',
+          },
+          {
+            name: '骨科',
+          },
+        ],
+      },
+      {
+        name: '儿科',
+      },
     ],
   },
   {
     name: '历史',
     children: [
-      { name: '心率失常' },
+      {
+        name: '心率失常',
+      },
+      {
+        name: '心率失常',
+      },
+      {
+        name: '心率失常',
+      },
     ],
   },
 ])
-
 const state = reactive({})
-onMounted(() => {
+onBeforeMount(() => {})
-  if (props.patientInfo?.encounterId) {
+onMounted(() => {})
-    loadDiagnosisData()
+defineExpose({ state })
-  }
+
-})
+// const deleteDiagnose = (row: any) => {
-defineExpose({ state, loadDiagnosisData })
+//   // TODO 删除
+//   console.log(row)
+// }
+
+// const download = (row: any) => {
+//   // TODO 删除
+// }
+
+// const upload = (row: any) => {
+//   // TODO 删除
+// }
+
+// const top = (row: any) => {
+//   // TODO 删除
+// }
+
+// const bottom = (row: any) => {
+//   // TODO 删除
+// }
+
+const addNewWestern = () => {
+  WesternMedicineDialogVisible.value = true
+}
+const addNewChinese = () => {
+  ChineseMedicineDialogVisible.value = true
+}
+const WesternMedicineDialogVisible = ref(false)
+const ChineseMedicineDialogVisible = ref(false)
 </script>
 <style lang="scss" scoped>
 .diagnose-container {
@@ -673,79 +365,4 @@ defineExpose({ state, loadDiagnosisData })
     }
   }
 }
-
-.diagnosis-text {
-  min-height: 32px;
-  line-height: 1.4;
-  padding: 6px 12px;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  background-color: #fff;
-  cursor: pointer;
-  text-align: left;
-  word-break: break-all;
-  white-space: pre-wrap;
-  max-width: 200px;
-  transition: border-color 0.2s;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-}
-
-.diagnosis-text:hover {
-  border-color: #409eff;
-}
-
-.diagnosis-text-content {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-.diagnosis-text-icon {
-  color: #909399;
-  font-size: 12px;
-}
-
-.diagnosis-text:hover .diagnosis-text-icon {
-  color: #409eff;
-}
-
-.diagnosis-popover-container {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-}
-
-.diagnosis-popover-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 12px 16px;
-  border-bottom: 1px solid #e4e7ed;
-  background-color: #f5f7fa;
-}
-
-.diagnosis-popover-title {
-  font-size: 14px;
-  font-weight: 600;
-  color: #303133;
-}
-
-.diagnosis-popover-close {
-  font-size: 12px;
-}
-
-.diagnosis-popover-body {
-  padding: 0;
-}
-
-.diagnosis-text:empty::before {
-  content: '点击选择诊断';
-  color: #a8abb2;
-}
 </style>

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue

@@ -111,7 +111,6 @@ function handleClick(tabName) {
       break;
     case 'cancel':
       exeStatus.value = 9;
-      requestStatus.value = RequestStatus.CANCELLED;
       break;
   }
 

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 specMatch = spec.match(/(\d+)(\D+)/)
-          const specValue = specMatch ? parseFloat(specMatch[1]) : 1
+          const specValue = specMatch ? parseInt(specMatch[1]) : 1
-          const specUnit = specMatch ? specMatch[2] : ''
+          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: '立即',
+            frequency: '临时',
-            executeTime: '',
+            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: '立即',
+            frequency: '临时',
-            executeTime: '',
+            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: '立即',
+              usage: usageCode, frequency: '临时',
-              executeTime: '',
+              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: '立即',
+                    usage: usageCode, usageLabel, frequency: '临时',
-                    executeTime: '',
+                    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 specMatch = medicine.specification ? medicine.specification.match(/(\d+)(\D+)/) : null
-    const specValue = specMatch ? parseFloat(specMatch[1]) : 1
+    const specValue = specMatch ? parseInt(specMatch[1]) : 1
-    const specUnit = specMatch ? specMatch[2] : ''
+    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: '立即',
+      frequency: '临时',
-      executeTime: '',
+      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 specMatch = originalMedicine.specification.match(/(\d+)(\D+)/)
-        const specValue = specMatch ? parseFloat(specMatch[1]) : 1
+        const specValue = specMatch ? parseInt(specMatch[1]) : 1
         if (specValue > 0) {
           const newQuantity = editForm.value.dosage / specValue
           contentData.quantity = newQuantity
@@ -748,8 +732,11 @@ const handleSaveEdit = async () => {
         }
       }
       
-      // 🔧 修复：原地修改 contentJson，保存使用最新数据
+      // 更新 contentJson
-      originalMedicine.contentJson = JSON.stringify(contentData)
+      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
-
+  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('保存失败，请重试')
-    }
-  }
 }
 
 // 取消编辑
@@ -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 = new Date().toLocaleString('zh-CN')
-      signatureTime.value = parseTime(new Date())
       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
         }
       }