Merge remote-tracking branch 'origin/develop' into develop

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue

@@ -430,11 +430,52 @@ const loadEditData = () => {
 const projectWithDepartment = (selectProjectIds) => {
   if (!selectProjectIds || selectProjectIds.length === 0) {
     form.targetDepartment = '';
+    return;
   }
+
+  // 获取第一个选中项目的发往科室（orgId）
+  // 优先使用配置的发往科室，如果没有则保留手动选择
+  const selectedProject = applicationListAll.value?.find(
+    item => selectProjectIds.includes(item.adviceDefinitionId)
+  );
+
+  if (selectedProject && selectedProject.orgId) {
+    // 项目配置了发往科室，自动填充
+    const orgId = selectedProject.orgId;
+    const orgName = selectedProject.orgName;
+
+    // 查找树中对应的节点，获取正确的 id 类型
+    const findNode = (nodes, targetId) => {
+      if (!nodes) return null;
+      for (const node of nodes) {
+        if (String(node.id) === String(targetId)) {
+          return node;
+        }
+        if (node.children && node.children.length > 0) {
+          const found = findNode(node.children, targetId);
+          if (found) return found;
+        }
+      }
+      return null;
+    };
+
+    const treeNode = findNode(orgOptions.value, orgId);
+    if (treeNode) {
+      // 使用树节点的原始 id 值（确保类型匹配）
+      form.targetDepartment = treeNode.id;
+    } else {
+      // 科室不在列表中（可能已删除），留空让用户手动选择
+      form.targetDepartment = '';
+    }
+  }
+  // 如果没有配置发往科室，保留手动选择（不修改 form.targetDepartment）
 };
 
 watch(() => transferValue.value, (newValue) => {
-  projectWithDepartment(newValue);
+  // 使用 nextTick 确保 DOM 更新完成后再设置值
+  nextTick(() => {
+    projectWithDepartment(newValue);
+  });
 });
 
 const getPriorityCode = () => {

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

@@ -429,6 +429,8 @@ const props = defineProps({
 });
 const isAdding = ref(false);
 const isSaving = ref(false);
+// 标记双击编辑的是否为已有数据的行（用于保存后是否自动添加下一行）
+const wasDoubleClickEdit = ref(false);
 const prescriptionRef = ref();
 const expandOrder = ref([]); //目前的展开行
 const stockList = ref([]);
@@ -1397,7 +1399,9 @@ function handleSaveSign(row, index) {
       }
     });
   } else {
-    if (prescriptionList.value[0].adviceName) {
+    // 仅通过【新增】按钮创建的医嘱保存后才自动添加下一行空医嘱
+    // 双击编辑已有"待保存"医嘱保存时，不应自动添加空行
+    if (isAdding.value && prescriptionList.value[0].adviceName) {
       handleAddPrescription();
     }
   }