diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
index ec37db26..3e9d2aa5 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
@@ -39,9 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.*;
 
-import static com.openhis.common.constant.CommonConstants.FieldName.DeleteFlag;
 import static com.openhis.common.enums.ReportCardStatus.SUBMITTED;
-import static java.time.LocalDateTime.now;
 
 /**
  * 医生站-诊断 应用实现类
@@ -253,6 +251,9 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
             encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
             encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
             encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
+            encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
+            encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime());
+            encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate());
             // 设置租户ID，避免数据库约束错误
             encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId());
             // 设置创建人，避免数据库约束错误
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
index 083b2dba..9d0c9459 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
@@ -91,4 +91,9 @@ public class DiagnosisQueryDto {
      */
     private Date diagnosisTime;
 
+    /**
+     * 诊断医生
+     */
+    private String diagnosisDoctor;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
index 2c721b0f..bad78f21 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
@@ -133,7 +133,8 @@
                T2.verification_status_enum,
                T2.yb_no,
                T1.onset_date AS onsetDate,
-               T1.diagnosis_time AS diagnosisTime
+               T1.diagnosis_time AS diagnosisTime,
+               T1.doctor AS diagnosisDoctor
         FROM adm_encounter_diagnosis AS T1
                  LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
             AND T2.delete_flag = '0' AND T2.tcm_flag = 0
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
index b78302f2..35336e07 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -610,6 +610,8 @@ function getListInfo(addNewRow) {
           return {
             ...parsedContent,
             ...item,
+            isEdit: false,
+            showPopover: false,
             doseQuantity: parsedContent?.doseQuantity,
             doseUnitCode_dictText: parsedContent?.doseUnitCode_dictText,
             // 确保 therapyEnum 被正确设置，优先使用 contentJson 中的值
@@ -802,7 +804,8 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  if (row.statusEnum == 1) {
+  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  if (row.statusEnum == 1 && !row.requestId) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;