From 5bfadb9174615e9900f1bf30dc676fb1546da883 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Sun, 14 Dec 2025 14:22:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(login):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E7=9A=84URL=E9=94=99=E8=AF=AF=20?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9Dusername=E5=8F=82=E6=95=B0=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9B=A0=E4=B8=BA=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(editor): 重构富文本编辑器组件并优化图片上传逻辑
- 使用 Composition API 重构代码结构，提升可维护性
- 改进图片上传功能，增强对 quill 实例的安全访问
- 更新样式排版，提高组件可读性和一致性

refactor(file-upload): 移除旧代理引用，使用 modern Vue API
替换 `proxy` 调用为 `modal` 插件直接调用，提升代码清晰度与健壮性

refactor(image-upload): 替换旧实例调用方式，强化错误提示机制
统一使用 `modal` 进行消息提示和加载状态控制，改善用户体验

refactor(tree-select): 引入 Composition API 优化节点操作逻辑
移除 `getCurrentInstance` 的不必要使用，改为明确的模板引用管理

chore(main): 添加 util._extend 补丁以消除 Node.js 环境警告
解决开发环境下由于 Node.js 内建模块缺失造成的运行时警告问题

feat(template): 完善跌倒/坠床评估护理记录单模板
- 增加详细注释说明各部分作用，便于后续维护
- 明确组件名称为中文，利于业务识别
- 丰富表单交互细节及数据处理逻辑，支持动态打分、措施选择等功能

refactor(template-index): 加强模板组件自动注册逻辑
增加组件 name 属性校验，防止无效或匿名组件被注册到全局
---
 openhis-ui-vue3/src/api/login.js              |   4 +-
 .../src/components/Editor/index.vue           | 112 ++++++++------
 .../src/components/FileUpload/index.vue       |  24 +--
 .../src/components/ImageUpload/index.vue      |  24 +--
 .../src/components/TreeSelect/index.vue       |  13 +-
 openhis-ui-vue3/src/main.js                   |  22 ++-
 .../src/template/FallBedFallAssessment.vue    |  83 +++++++---
 openhis-ui-vue3/src/template/index.js         |  37 ++++-
 .../src/template/nursingRecordSheet.vue       | 146 ++++++------------
 .../src/template/outpatientMedicalRecord.vue  |  39 +++--
 .../src/template/useOptionsList.js            |  37 ++++-
 .../src/template/股骨头坏死(模板1).vue        |   4 +-
 .../views/drug/inHospitalDispensing/index.vue |   1 -
 openhis-ui-vue3/src/views/login.vue           |  31 ++--
 openhis-ui-vue3/test-util-extend.js           |  25 +++
 openhis-ui-vue3/vite.config.js                |   2 +-
 16 files changed, 367 insertions(+), 237 deletions(-)
 create mode 100644 openhis-ui-vue3/test-util-extend.js

diff --git a/openhis-ui-vue3/src/api/login.js b/openhis-ui-vue3/src/api/login.js
index dc96c258..9d793df9 100644
--- a/openhis-ui-vue3/src/api/login.js
+++ b/openhis-ui-vue3/src/api/login.js
@@ -50,8 +50,10 @@ export function logout() {
 
 // 获取验证码
 export function getUserBindTenantList(username) {
+  // 确保username存在，避免构建出错误的URL
+  const safeUsername = username || '';
   return request({
-    url: '/system/tenant/user-bind/'+username,
+    url: '/system/tenant/user-bind/' + safeUsername,
     headers: {
       isToken: false
     },
diff --git a/openhis-ui-vue3/src/components/Editor/index.vue b/openhis-ui-vue3/src/components/Editor/index.vue
index 0a696f22..c919df0f 100644
--- a/openhis-ui-vue3/src/components/Editor/index.vue
+++ b/openhis-ui-vue3/src/components/Editor/index.vue
@@ -1,28 +1,16 @@
 <template>
-  <div>
-    <el-upload
-      :action="uploadUrl"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      name="file"
-      :show-file-list="false"
-      :headers="headers"
-      class="editor-img-uploader"
-      v-if="type == 'url'"
-    >
-      <i ref="uploadRef" class="editor-img-uploader"></i>
-    </el-upload>
-  </div>
-  <div class="editor">
-    <quill-editor
-      ref="quillEditorRef"
-      v-model:content="content"
-      contentType="html"
-      @textChange="(e) => $emit('update:modelValue', content)"
-      :options="options"
-      :style="styles"
-    />
+  <div class="editor-container">
+    <div>
+      <el-upload :action="uploadUrl" :before-upload="handleBeforeUpload" :on-success="handleUploadSuccess"
+        :on-error="handleUploadError" name="file" :show-file-list="false" :headers="headers" class="editor-img-uploader"
+        v-if="type == 'url'">
+        <i ref="uploadRef" class="editor-img-uploader"></i>
+      </el-upload>
+    </div>
+    <div class="editor">
+      <quill-editor ref="quillEditorRef" :content="content" @update:content="content = $event" contentType="html"
+        @textChange="(e) => $emit('update:modelValue', content)" :options="options" :style="styles" />
+    </div>
   </div>
 </template>
 
@@ -30,10 +18,11 @@
 import { QuillEditor } from "@vueup/vue-quill";
 import "@vueup/vue-quill/dist/vue-quill.snow.css";
 import { getToken } from "@/utils/auth";
-
-const { proxy } = getCurrentInstance();
+import { ref, computed, watch, onMounted } from 'vue';
+import modal from '@/plugins/modal';
 
 const quillEditorRef = ref();
+const uploadRef = ref();
 const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
 const headers = ref({
   Authorization: "Bearer " + getToken()
@@ -115,32 +104,34 @@ watch(() => props.modelValue, (v) => {
 // 如果设置了上传地址则自定义图片上传事件
 onMounted(() => {
   if (props.type == 'url') {
-    let quill = quillEditorRef.value.getQuill();
-    let toolbar = quill.getModule("toolbar");
-    toolbar.addHandler("image", (value) => {
-      if (value) {
-        proxy.$refs.uploadRef.click();
-      } else {
-        quill.format("image", false);
-      }
-    });
+    let quill = quillEditorRef.value?.getQuill();
+    if (quill) {
+      let toolbar = quill.getModule("toolbar");
+      toolbar.addHandler("image", (value) => {
+        if (value && uploadRef.value) {
+          uploadRef.value.click();
+        } else {
+          quill.format("image", false);
+        }
+      });
+    }
   }
 });
 
 // 上传前校检格式和大小
 function handleBeforeUpload(file) {
-  const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+  const type = ["image/jpeg", "image/jpg", "image/png", "image/svg+xml"];
   const isJPG = type.includes(file.type);
   //检验文件格式
   if (!isJPG) {
-    proxy.$modal.msgError(`图片格式错误!`);
+    modal.msgError(`图片格式错误!`);
     return false;
   }
   // 校检文件大小
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
@@ -152,21 +143,24 @@ function handleUploadSuccess(res, file) {
   // 如果上传成功
   if (res.code == 200) {
     // 获取富文本实例
-    let quill = toRaw(quillEditorRef.value).getQuill();
-    // 获取光标位置
-    let length = quill.selection.savedRange.index;
-    // 插入图片，res.url为服务器返回的图片链接地址
-    quill.insertEmbed(length, "image", import.meta.env.VITE_APP_BASE_API + res.fileName);
-    // 调整光标到最后
-    quill.setSelection(length + 1);
+    let quill = quillEditorRef.value?.getQuill();
+    if (quill) {
+      // 获取光标位置
+      let range = quill.selection?.savedRange || quill.getSelection();
+      let length = range?.index || 0;
+      // 插入图片，res.url为服务器返回的图片链接地址
+      quill.insertEmbed(length, "image", import.meta.env.VITE_APP_BASE_API + res.fileName);
+      // 调整光标到最后
+      quill.setSelection(length + 1);
+    }
   } else {
-    proxy.$modal.msgError("图片插入失败");
+    modal.msgError("图片插入失败");
   }
 }
 
 // 上传失败处理
 function handleUploadError() {
-  proxy.$modal.msgError("图片插入失败");
+  modal.msgError("图片插入失败");
 }
 </script>
 
@@ -174,78 +168,98 @@ function handleUploadError() {
 .editor-img-uploader {
   display: none;
 }
-.editor, .ql-toolbar {
+
+.editor,
+.ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
 }
+
 .quill-img {
   display: none;
 }
+
 .ql-snow .ql-tooltip[data-mode="link"]::before {
   content: "请输入链接地址:";
 }
+
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
   border-right: 0px;
   content: "保存";
   padding-right: 0px;
 }
+
 .ql-snow .ql-tooltip[data-mode="video"]::before {
   content: "请输入视频地址:";
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
   content: "14px";
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
   content: "10px";
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
   content: "18px";
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
   content: "32px";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
   content: "文本";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
   content: "标题1";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
   content: "标题2";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
   content: "标题3";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
   content: "标题4";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
   content: "标题5";
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
   content: "标题6";
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
   content: "标准字体";
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
   content: "衬线字体";
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
   content: "等宽字体";
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/components/FileUpload/index.vue b/openhis-ui-vue3/src/components/FileUpload/index.vue
index 2af9672e..38911eab 100644
--- a/openhis-ui-vue3/src/components/FileUpload/index.vue
+++ b/openhis-ui-vue3/src/components/FileUpload/index.vue
@@ -39,7 +39,9 @@
 </template>
 
 <script setup>
+import { ref, computed, watch } from 'vue';
 import { getToken } from "@/utils/auth";
+import modal from '@/plugins/modal';
 
 const props = defineProps({
   modelValue: [String, Object, Array],
@@ -65,7 +67,7 @@ const props = defineProps({
   }
 });
 
-const { proxy } = getCurrentInstance();
+const fileUpload = ref(null);
 const emit = defineEmits();
 const number = ref(0);
 const uploadList = ref([]);
@@ -104,7 +106,7 @@ function handleBeforeUpload(file) {
     const fileExt = fileName[fileName.length - 1];
     const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
     if (!isTypeOk) {
-      proxy.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join("/")}格式文件!`);
+      modal.msgError(`文件格式不正确, 请上传${props.fileType.join("/")}格式文件!`);
       return false;
     }
   }
@@ -112,23 +114,23 @@ function handleBeforeUpload(file) {
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
-  proxy.$modal.loading("正在上传文件，请稍候...");
+  modal.loading("正在上传文件，请稍候...");
   number.value++;
   return true;
 }
 
 // 文件个数超出
 function handleExceed() {
-  proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+  modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
 }
 
 // 上传失败
 function handleUploadError(err) {
-  proxy.$modal.msgError("上传文件失败");
+  modal.msgError("上传文件失败");
 }
 
 // 上传成功回调
@@ -138,9 +140,9 @@ function handleUploadSuccess(res, file) {
     uploadedSuccessfully();
   } else {
     number.value--;
-    proxy.$modal.closeLoading();
-    proxy.$modal.msgError(res.msg);
-    proxy.$refs.fileUpload.handleRemove(file);
+    modal.closeLoading();
+    modal.msgError(res.msg);
+    fileUpload.value.handleRemove(file);
     uploadedSuccessfully();
   }
 }
@@ -158,7 +160,7 @@ function uploadedSuccessfully() {
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
-    proxy.$modal.closeLoading();
+    modal.closeLoading();
   }
 }
 
@@ -204,4 +206,4 @@ function listToString(list, separator) {
 .ele-upload-list__item-content-action .el-link {
   margin-right: 10px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/components/ImageUpload/index.vue b/openhis-ui-vue3/src/components/ImageUpload/index.vue
index 55dafb84..c2420abd 100644
--- a/openhis-ui-vue3/src/components/ImageUpload/index.vue
+++ b/openhis-ui-vue3/src/components/ImageUpload/index.vue
@@ -47,6 +47,8 @@
 
 <script setup>
 import { getToken } from "@/utils/auth";
+import { ref, computed, watch, getCurrentInstance } from 'vue';
+import modal from '@/plugins/modal';
 
 const props = defineProps({
   modelValue: [String, Object, Array],
@@ -72,7 +74,6 @@ const props = defineProps({
   },
 });
 
-const { proxy } = getCurrentInstance();
 const emit = defineEmits();
 const number = ref(0);
 const uploadList = ref([]);
@@ -82,6 +83,7 @@ const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
 const headers = ref({ Authorization: "Bearer " + getToken() });
 const fileList = ref([]);
+const imageUpload = ref(null);
 const showTip = computed(
   () => props.isShowTip && (props.fileType || props.fileSize)
 );
@@ -124,7 +126,7 @@ function handleBeforeUpload(file) {
     isImg = file.type.indexOf("image") > -1;
   }
   if (!isImg) {
-    proxy.$modal.msgError(
+    modal.msgError(
       `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
     );
     return false;
@@ -132,17 +134,17 @@ function handleBeforeUpload(file) {
   if (props.fileSize) {
     const isLt = file.size / 1024 / 1024 < props.fileSize;
     if (!isLt) {
-      proxy.$modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`);
+      modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`);
       return false;
     }
   }
-  proxy.$modal.loading("正在上传图片，请稍候...");
+  modal.loading("正在上传图片，请稍候...");
   number.value++;
 }
 
 // 文件个数超出
 function handleExceed() {
-  proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+  modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
 }
 
 // 上传成功回调
@@ -152,9 +154,9 @@ function handleUploadSuccess(res, file) {
     uploadedSuccessfully();
   } else {
     number.value--;
-    proxy.$modal.closeLoading();
-    proxy.$modal.msgError(res.msg);
-    proxy.$refs.imageUpload.handleRemove(file);
+    modal.closeLoading();
+    modal.msgError(res.msg);
+    imageUpload.value.handleRemove(file);
     uploadedSuccessfully();
   }
 }
@@ -176,14 +178,14 @@ function uploadedSuccessfully() {
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
-    proxy.$modal.closeLoading();
+    modal.closeLoading();
   }
 }
 
 // 上传失败
 function handleUploadError() {
-  proxy.$modal.msgError("上传图片失败");
-  proxy.$modal.closeLoading();
+  modal.msgError("上传图片失败");
+  modal.closeLoading();
 }
 
 // 预览
diff --git a/openhis-ui-vue3/src/components/TreeSelect/index.vue b/openhis-ui-vue3/src/components/TreeSelect/index.vue
index 4ff0e76d..60d80370 100644
--- a/openhis-ui-vue3/src/components/TreeSelect/index.vue
+++ b/openhis-ui-vue3/src/components/TreeSelect/index.vue
@@ -29,8 +29,11 @@
 </template>
 
 <script setup>
+import { ref, computed, watch, onMounted, nextTick } from 'vue';
+import { getCurrentInstance } from 'vue';
 
-const { proxy } = getCurrentInstance();
+const selectTree = ref(null);
+const treeSelect = ref(null);
 
 const props = defineProps({
   /* 配置项 */
@@ -83,10 +86,10 @@ function initHandle() {
   nextTick(() => {
     const selectedValue = valueId.value;
     if(selectedValue !== null && typeof (selectedValue) !== 'undefined') {
-      const node = proxy.$refs.selectTree.getNode(selectedValue)
+      const node = selectTree.value.getNode(selectedValue)
       if (node) {
         valueTitle.value = node.data[props.objMap.label]
-        proxy.$refs.selectTree.setCurrentKey(selectedValue) // 设置默认选中
+        selectTree.value.setCurrentKey(selectedValue) // 设置默认选中
         defaultExpandedKey.value = [selectedValue] // 设置默认展开
       }
     } else {
@@ -98,11 +101,11 @@ function handleNodeClick(node) {
   valueTitle.value = node[props.objMap.label]
   valueId.value = node[props.objMap.value];
   defaultExpandedKey.value = [];
-  proxy.$refs.treeSelect.blur()
+  treeSelect.value.blur()
   selectFilterData('')
 }
 function selectFilterData(val) {
-  proxy.$refs.selectTree.filter(val)
+  selectTree.value.filter(val)
 }
 function filterNode(value, data) {
   if (!value) return true
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index 741ff703..2a6702b4 100644
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -1,5 +1,25 @@
 import { createApp } from 'vue'
 
+// 修复 util._extend 已弃用警告（仅在 Node.js 环境中需要）
+if (typeof process !== 'undefined' && process.versions && process.versions.node) {
+  try {
+    import('util').then(util => {
+      if (!util._extend) {
+        util._extend = function(destination, source) {
+          for (var key in source) {
+            if (source.hasOwnProperty(key)) {
+              destination[key] = source[key];
+            }
+          }
+          return destination;
+        };
+      }
+    });
+  } catch (e) {
+    console.error('util._extend 补丁加载失败:', e);
+  }
+}
+
 import Cookies from 'js-cookie'
 
 import ElementPlus from 'element-plus'
@@ -100,4 +120,4 @@ directive(app)
 // 全局禁止点击遮罩层关闭弹窗
 ElDialog.props.closeOnClickModal.default = false;
 
-app.mount('#app')
+app.mount('#app')
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/FallBedFallAssessment.vue b/openhis-ui-vue3/src/template/FallBedFallAssessment.vue
index 0d680f04..5d5645b9 100644
--- a/openhis-ui-vue3/src/template/FallBedFallAssessment.vue
+++ b/openhis-ui-vue3/src/template/FallBedFallAssessment.vue
@@ -1,6 +1,8 @@
 <template>
+  <!-- 跌倒/坠床评估护理记录单主容器 -->
   <div>
     <div class="business">
+      <!-- 已有记录展示表格 -->
       <el-table
         :data="tableDataSource"
         border
@@ -8,10 +10,15 @@
         fit
         :header-cell-style="{ background: '#f2f2f2', color: 'black' }"
       >
+        <!-- 记录时间列 -->
         <el-table-column prop="content.recordTime" label="记录时间" />
+        <!-- 评估分数列 -->
         <el-table-column prop="content.totalScore" label="评估分数" />
+        <!-- 护理措施列 -->
         <el-table-column prop="content.patientCareSessionsTableList" label="护理措施" />
+        <!-- 责任护士列 -->
         <el-table-column prop="content.nurseSignature" label="责任护士" />
+        <!-- 操作列：编辑和删除按钮 -->
         <el-table-column label="操作" align="center">
           <template #default="scope">
             <el-button
@@ -36,9 +43,12 @@
         </el-table-column>
       </el-table>
 
+      <!-- 跌倒/坠床评估护理记录单表单区域 -->
       <div name="跌倒/坠床评估护理记录单" class="changeMajor" style="width: 99.9%">
         <div>
+          <!-- 表单主体 -->
           <el-form ref="formRef" :model="form" style="width: 99.9%">
+            <!-- 标题行 -->
             <el-form-item style="text-align: center">
               <div
                 style="
@@ -54,10 +64,12 @@
               </div>
             </el-form-item>
 
+            <!-- 日期时间选择器 -->
             <el-form-item label="日期：" class="changeMajorFromItem" style="width: 100%">
               <el-row :span="20">
                 <el-col :span="8" style="padding-left: 0px !important">
                   <el-form-item>
+                    <!-- 日期时间选择器 -->
                     <el-date-picker
                       v-model="form.ZKDATE"
                       type="datetime"
@@ -67,6 +79,7 @@
                       style="width: 800px"
                       :disabled="admissionDataForm !== undefined"
                     />
+                    <!-- 时间选择器被注释掉 -->
                     <!-- <span style="margin-left: 5px">时间：</span>
                     <el-time-picker
                       v-model="form.ZKTIME"
@@ -77,6 +90,7 @@
                     /> -->
                   </el-form-item>
                 </el-col>
+                <!-- 新增/保存按钮 -->
                 <el-col :span="5">
                   <el-button
                     v-if="!updateFlag"
@@ -100,6 +114,7 @@
               </el-row>
             </el-form-item>
 
+            <!-- 危险因素评估表格 -->
             <el-form-item style="padding-top: 10px; margin: 0px !important">
               <el-table
                 :data="dangerData"
@@ -107,6 +122,7 @@
                 :span-method="handleSpan"
                 style="text-align: center"
               >
+                <!-- 动态生成表格列 -->
                 <el-table-column
                   v-for="column in dangerColumns"
                   :key="column.key"
@@ -115,6 +131,7 @@
                   :label="column.title"
                   align="center"
                 />
+                <!-- 选择列（复选框） -->
                 <el-table-column prop="id" label="选择" width="80" align="center">
                   <template #default="{ row }">
                     <el-checkbox v-model="row.checked" @change="handleDangerChange(row)" />
@@ -123,6 +140,7 @@
               </el-table>
             </el-form-item>
 
+            <!-- 总分显示 -->
             <el-form-item
               style="text-align: center; margin-bottom: 0px; padding: 0px"
               class="changeMajorFromItem"
@@ -135,6 +153,7 @@
               </el-row>
             </el-form-item>
 
+            <!-- 护理措施表格 -->
             <el-form-item style="padding-top: 10px">
               <el-table
                 :data="nursingData"
@@ -142,6 +161,7 @@
                 :span-method="arraySpanMethod"
                 style="width: 100%"
               >
+                <!-- 动态生成表格列 -->
                 <el-table-column
                   v-for="column in nursingColumns"
                   :key="column.key"
@@ -150,6 +170,7 @@
                   :label="column.title"
                   align="center"
                 />
+                <!-- 选择列（复选框） -->
                 <el-table-column prop="id" label="选择" width="80" align="center">
                   <template #default="{ row }">
                     <el-checkbox v-model="row.checked" @change="handleNursingChange(row)" />
@@ -158,6 +179,7 @@
               </el-table>
             </el-form-item>
 
+            <!-- 护士签字输入框 -->
             <el-form-item
               style="text-align: center; margin-bottom: 0px; padding: 0px"
               class="changeMajorFromItem"
@@ -177,6 +199,7 @@
               </el-row>
             </el-form-item>
 
+            <!-- 备注信息 -->
             <el-form-item>
               <el-row :span="20">
                 <el-col :span="5">
@@ -197,22 +220,24 @@
 </template>
 
 <script setup>
+// 组件选项定义
 defineOptions({
-  name: 'FallBedFallAssessment',
+  name: '跌倒/坠床评估护理记录单',
 });
+
+// 导入所需模块
 import { ref, reactive, computed, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 
-// import { webapp_ws_ajax_run, urlAddRandomNo } from '@/utils/grwebapp';
-// import { useRoute, useRouter } from 'vue-router';
-
-// 响应式数据
+// 使用路由相关功能
 const route = useRoute();
 const router = useRouter();
 
+// 定义引用变量
 const queryRef = ref();
 const formRef = ref();
 
+// 基本数据变量
 const wardCode = ref('');
 const patientId = ref('');
 const visitId = ref('');
@@ -226,17 +251,18 @@ const totalScore = ref(0);
 const lastSubmit = ref('');
 const admissionDataForm = ref(route.params.admissionData);
 
+// 表单数据模型
 const form = reactive({
-  ZKDATE: '',
-  ZKTIME: '',
-  recordTime: '',
-  totalScore: 0,
-  bedFallRiskAssessmentList: [],
-  nurseSignature: '',
-  patientCareSessionsCheckedList: [],
+  ZKDATE: '',           // 日期
+  ZKTIME: '',           // 时间
+  recordTime: '',       // 记录时间
+  totalScore: 0,        // 总分
+  bedFallRiskAssessmentList: [],     // 跌倒风险评估列表
+  nurseSignature: '',   // 护士签名
+  patientCareSessionsCheckedList: [], // 护理措施选中列表
 });
 
-// 危险因素表格列
+// 危险因素表格列配置
 const dangerColumns = [
   {
     key: 'content',
@@ -301,7 +327,7 @@ const dangerData = ref([
   { id: '27', evalContent: '麻醉止痛剂', score: 2, checked: false },
 ]);
 
-// 护理措施表格列
+// 护理措施表格列配置
 const nursingColumns = [
   {
     key: 'content',
@@ -338,21 +364,21 @@ const instructions = [
   '3.评分≥5，高度风险，每周至少评估一次，需采取适宜的预防措施，同时填写《预防患者跌倒/坠床知情告知书》',
 ];
 
-// 计算属性
+// 计算属性：计算选中的危险因素总分
 const calculate = computed(() => {
   return dangerData.value
     .filter((option) => option.checked)
     .reduce((total, option) => total + option.score, 0);
 });
 
+// 计算属性：判断表单是否为空
 const isFormEmpty = computed(() => {
   return (
     form.ZKDATE === '' && form.ZKTIME === '' && form.recordTime === '' && form.nurseSignature === ''
   );
 });
 
-// 方法 - 不再需要handleData方法，通过表单输入和按钮加载数据
-
+// 危险因素选择变化处理函数
 const handleDangerChange = (row) => {
   totalScore.value = calculate.value;
   form.bedFallRiskAssessmentList = dangerData.value
@@ -360,12 +386,14 @@ const handleDangerChange = (row) => {
     .map((item) => item.id);
 };
 
+// 护理措施选择变化处理函数
 const handleNursingChange = (row) => {
   form.patientCareSessionsCheckedList = nursingData.value
     .filter((item) => item.checked)
     .map((item) => item.id);
 };
 
+// 初始化函数：加载模拟数据
 const init = async () => {
   // 使用模拟数据，不再调用后端API
   try {
@@ -427,6 +455,7 @@ const init = async () => {
   }
 };
 
+// 危险因素表格合并单元格处理函数
 const handleSpan = ({ row, column, rowIndex, columnIndex }) => {
   if (columnIndex === 0) {
     if (rowIndex === 0) {
@@ -473,6 +502,7 @@ const handleSpan = ({ row, column, rowIndex, columnIndex }) => {
   return [1, 1];
 };
 
+// 护理措施表格合并单元格处理函数
 const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
   // 护理措施
   if (columnIndex === 0) {
@@ -489,8 +519,9 @@ const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
   return [1, 1];
 };
 
+// 提交表单处理函数
 const onSubmit = async () => {
-  // 检查上次提交时间
+  // 检查上次提交时间，防止重复提交
   if (lastSubmit.value && new Date() - lastSubmit.value < 2000) {
     ElMessage.error('禁止重复提交！');
     return;
@@ -562,6 +593,7 @@ const onSubmit = async () => {
   }
 };
 
+// 编辑记录处理函数
 const handleUpdate = (row) => {
   const loginUser = JSON.parse(window.localStorage.getItem('loginUser'));
 
@@ -591,6 +623,7 @@ const handleUpdate = (row) => {
   }
 };
 
+// 重置表单函数
 const reset = () => {
   Object.assign(form, {
     ZKDATE: '',
@@ -623,6 +656,7 @@ const reset = () => {
   }
 };
 
+// 删除记录处理函数
 const handleDelete = (row) => {
   const loginUser = JSON.parse(window.localStorage.getItem('loginUser'));
 
@@ -646,6 +680,7 @@ const handleDelete = (row) => {
   }
 };
 
+// 打印预览函数（暂未实现）
 const dc_ajax_preview = () => {
   var args = {
     report: urlAddRandomNo('./grf/NurseRecord_Pressure_208.grf'),
@@ -656,6 +691,7 @@ const dc_ajax_preview = () => {
   webapp_ws_ajax_run(args);
 };
 
+// 数据转换函数，用于报表打印
 const transformData = () => {
   const jsonDate = [...tableDataSource.value];
 
@@ -802,7 +838,7 @@ const transformData = () => {
   return transformedData;
 };
 
-// 生命周期钩子
+// 组件挂载后执行的生命周期函数
 onMounted(() => {
   try {
     // 安全获取用户信息
@@ -831,6 +867,7 @@ onMounted(() => {
 </script>
 
 <style scoped>
+/* 页面样式定义 */
 .business {
   background: white;
   border-radius: 5px;
@@ -894,4 +931,10 @@ onMounted(() => {
     margin-bottom: 0px !important;
   }
 }
-</style>
+
+/* 备注信息列表样式 */
+.instructions-list {
+  list-style-type: none;
+  padding-left: 0;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/index.js b/openhis-ui-vue3/src/template/index.js
index 65055b2e..523c687f 100644
--- a/openhis-ui-vue3/src/template/index.js
+++ b/openhis-ui-vue3/src/template/index.js
@@ -1,17 +1,42 @@
-// 动态引入 template 目录下的所有 .vue 文件
+/**
+ * 模板组件注册模块
+ * 动态引入 template 目录下的所有 .vue 文件，并将它们注册为全局组件
+ */
+
+// 动态引入 template 目录下的所有 .vue 文件（包括中文命名的文件）
+// 使用 { eager: true } 表示立即加载所有匹配的文件
 const templates = import.meta.glob('./*.vue', { eager: true });
 
+// 存储所有加载的组件
 const components = [];
 
 // 遍历所有引入的文件
 for (const path in templates) {
-  const component = templates[path].default;
-  components.push(component);
+  try {
+    // 获取组件的默认导出
+    const component = templates[path].default;
+    
+    // 检查组件是否有 name 属性，如果没有则跳过
+    if (component && component.name) {
+      components.push(component);
+    } else {
+      console.warn(`组件 ${path} 缺少 name 属性，将不会被注册`);
+    }
+  } catch (error) {
+    console.error(`加载组件 ${path} 时出错：`, error);
+  }
 }
+
+/**
+ * 注册所有组件到 Vue 应用实例
+ * @param {Object} app - Vue 应用实例
+ */
 const registerComponents = (app) => {
   components.forEach((component) => {
+    // 使用组件的 name 属性作为组件名称进行注册
     app.component(component.name, component);
-  })
-} 
-export { components, registerComponents };
+  });
+};
 
+// 导出组件数组和注册函数
+export { components, registerComponents };
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/nursingRecordSheet.vue b/openhis-ui-vue3/src/template/nursingRecordSheet.vue
index dcfb1ba0..f3d354f3 100644
--- a/openhis-ui-vue3/src/template/nursingRecordSheet.vue
+++ b/openhis-ui-vue3/src/template/nursingRecordSheet.vue
@@ -5,13 +5,11 @@
 -->
 <template>
   <div class="container">
-    <!-- 页面头部标题 -->
     <div class="header">
       <h2 class="title">乾安县人民医院</h2>
       <h3 class="subtitle">患者护理记录单</h3>
     </div>
 
-    <!-- 护理记录表单 -->
     <el-form :model="state.formData" label-position="top" class="nursing-form">
       <!-- 患者基本信息 -->
       <div class="patient-info">
@@ -60,11 +58,9 @@
         </el-row>
       </div>
 
-      <!-- 生命体征记录表格 -->
+      <!-- 基本信息记录表格 -->
       <div class="vital-signs-table">
-        <!-- 护理记录详细信息表格 -->
         <el-table :data="state.formData.vitalSigns" border style="width: 100%">
-          <!-- 记录日期列 -->
           <el-table-column label="日期" width="100">
             <template #default="scope">
               <el-date-picker
@@ -77,7 +73,6 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          <!-- 记录时间列 -->
           <el-table-column label="时间" width="100">
             <template #default="scope">
               <el-time-picker
@@ -89,9 +84,7 @@
               ></el-time-picker>
             </template>
           </el-table-column>
-          <!-- 基本信息列组 -->
           <el-table-column label="基本信息">
-            <!-- 意识状态 -->
             <el-table-column label="意识" width="80">
               <template #default="scope">
                 <el-select v-model="scope.row.consciousness" placeholder="选择">
@@ -101,46 +94,38 @@
                 </el-select>
               </template>
             </el-table-column>
-            <!-- 体温测量值 -->
             <el-table-column label="体温℃" width="80">
               <template #default="scope">
                 <el-input v-model="scope.row.temperature" placeholder="体温"></el-input>
               </template>
             </el-table-column>
-            <!-- 心率测量值 -->
             <el-table-column label="心率次/分" width="100">
               <template #default="scope">
                 <el-input v-model="scope.row.heartRate" placeholder="心率"></el-input>
               </template>
             </el-table-column>
-            <!-- 脉搏测量值 -->
-            <el-table-column label="脉搏次/分" width="100">
+              <el-table-column label="脉搏次/分" width="100">
               <template #default="scope">
                 <el-input v-model="scope.row.heartRate" placeholder="心率"></el-input>
               </template>
             </el-table-column>
-            <!-- 呼吸频率 -->
             <el-table-column label="呼吸次/分" width="100">
               <template #default="scope">
                 <el-input v-model="scope.row.respiratoryRate" placeholder="呼吸"></el-input>
               </template>
             </el-table-column>
-            <!-- 血压测量值 -->
             <el-table-column label="血压mmHg" width="120">
               <template #default="scope">
                 <el-input v-model="scope.row.bloodPressure" placeholder="血压"></el-input>
               </template>
             </el-table-column>
-            <!-- 血氧饱和度 -->
-            <el-table-column label="血氧饱和度" width="120">
+             <el-table-column label="血氧饱和度" width="120">
               <template #default="scope">
                 <el-input v-model="scope.row.bloodPressure" placeholder="血压"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
-          <!-- 氧疗相关信息 -->
           <el-table-column label="氧疗L/min" width="200">
-            <!-- 氧疗方式 -->
             <el-table-column label="方式" >
               <template #default="scope">
                 <el-select v-model="scope.row.intake" placeholder="选择">
@@ -150,16 +135,13 @@
                 </el-select>
               </template>
             </el-table-column>
-            <!-- 氧流量 -->
             <el-table-column label="流量" width="80">
               <template #default="scope">
                 <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
-          <!-- 入量记录 -->
-          <el-table-column label="入量" width="200">
-            <!-- 入量名称 -->
+           <el-table-column label="入量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
                 <el-select v-model="scope.row.intake" placeholder="选择">
@@ -169,22 +151,18 @@
                 </el-select>
               </template>
             </el-table-column>
-            <!-- 入量毫升数 -->
             <el-table-column label="ml" width="80">
               <template #default="scope">
                 <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
               </template>
             </el-table-column>
-            <!-- 入量途径 -->
-            <el-table-column label="途径" width="80">
+                <el-table-column label="途径" width="80">
               <template #default="scope">
                 <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
-          <!-- 出量记录 -->
-          <el-table-column label="出量" width="200">
-            <!-- 出量名称 -->
+             <el-table-column label="出量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
                 <el-select v-model="scope.row.intake" placeholder="选择">
@@ -194,38 +172,32 @@
                 </el-select>
               </template>
             </el-table-column>
-            <!-- 出量毫升数 -->
             <el-table-column label="ml" width="80">
               <template #default="scope">
                 <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
-          <!-- 皮肤情况记录 -->
-          <el-table-column label="皮肤情况" width="80">
-            <template #default="scope">
-              <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
+            <el-table-column label="皮肤情况" width="80">
+              <template #default="scope">
+                <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
               </template>
-          </el-table-column>
-          <!-- 管路护理记录 -->
-          <el-table-column label="管路护理" width="80">
-            <template #default="scope">
-              <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
-            </template>
-          </el-table-column>
-          <!-- 病情与措施记录 -->
-          <el-table-column label="病情与措施" width="80">
-            <template #default="scope">
-              <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
-            </template>
-          </el-table-column>
-          <!-- 护士签名 -->
+            </el-table-column>
+                 <el-table-column label="管路护理" width="80">
+              <template #default="scope">
+                <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
+              </template>
+            </el-table-column>
+                 <el-table-column label="病情与措施" width="80">
+              <template #default="scope">
+                <el-input v-model="scope.row.flowRate" placeholder="流量"></el-input>
+              </template>
+            </el-table-column>
           <el-table-column label="护士签名" width="100">
             <template #default="scope">
               <el-input v-model="scope.row.nurseSignature" placeholder="签名"></el-input>
             </template>
           </el-table-column>
-          <!-- 操作列：提供删除功能 -->
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
               <el-button type="danger" size="small" @click="removeVitalSign(scope.$index)"
@@ -234,13 +206,12 @@
             </template>
           </el-table-column>
         </el-table>
-        <!-- 添加新记录按钮 -->
         <div class="add-row">
           <el-button type="primary" @click="addVitalSign">添加记录</el-button>
         </div>
       </div>
 
-      <!-- 表单底部说明信息 -->
+      <!-- 表单底部按钮 -->
       <div class="form-actions">
         <div>
           一、意识:①清醒；②嗜睡；③意识模糊；④昏睡；⑤谗妄；⑥浅昏迷；⑦中度昏迷；⑧深昏迷；⑨全麻未醒；⑩镇静。
@@ -260,21 +231,12 @@
 </template>
 
 <script setup>
-// 定义组件选项
 defineOptions({
   name: 'NursingRecordSheet',
 });
-
-// 导入所需Vue功能
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
-
-// 获取组件实例代理
+import { getCurrentInstance, onBeforeMount, onMounted, reactive } from 'vue';
 const { proxy } = getCurrentInstance();
-
-// 定义组件发射事件
 const emits = defineEmits([]);
-
-// 定义组件接收的属性
 const props = defineProps({
   patientId: {
     type: String,
@@ -282,28 +244,28 @@ const props = defineProps({
   },
 });
 
-// 表单数据状态管理
+// 表单数据
 const state = ref({
   formData: {
-    name: '',               // 患者姓名
-    age: '',                // 年龄
-    gender: '',             // 性别
-    ward: '',               // 病区
-    bedNumber: '',          // 床号
-    hospitalNumber: '',     // 住院号
-    diagnosis: '',          // 入院诊断
-    vitalSigns: [           // 生命体征记录数组
+    name: '',
+    age: '',
+    gender: '',
+    ward: '',
+    bedNumber: '',
+    hospitalNumber: '',
+    diagnosis: '',
+    vitalSigns: [
     {
-      date: new Date().toISOString().split('T')[0],       // 默认当天日期
-      time: new Date().toTimeString().slice(0, 5),        // 默认当前时间
-      consciousness: '清醒',                               // 意识状态默认值
-      temperature: '',                                    // 体温
-      heartRate: '',                                      // 心率
-      respiratoryRate: '',                                // 呼吸频率
-      bloodPressure: '',                                  // 血压
-      intake: '',                                         // 入量
-      flowRate: '',                                       // 流量
-      nurseSignature: '',                                 // 护士签名
+      date: new Date().toISOString().split('T')[0],
+      time: new Date().toTimeString().slice(0, 5),
+      consciousness: '清醒',
+      temperature: '',
+      heartRate: '',
+      respiratoryRate: '',
+      bloodPressure: '',
+      intake: '',
+      flowRate: '',
+      nurseSignature: '',
     },
   ],
   },
@@ -311,7 +273,7 @@ const state = ref({
   
 });
 
-// 添加生命体征记录方法
+// 添加生命体征记录
 const addVitalSign = () => {
   state.value.formData.vitalSigns.push({
     date: new Date().toISOString().split('T')[0],
@@ -328,16 +290,17 @@ const addVitalSign = () => {
   });
 };
 
-// 删除指定索引的生命体征记录
+// 删除生命体征记录
 const removeVitalSign = (index) => {
   state.value.formData.vitalSigns.splice(index, 1);
-  // 如果删除后没有记录，则自动添加一条空记录
   if (state.value.formData.vitalSigns.length === 0) {
     addVitalSign();
   }
 };
 
-// 重置整个表单数据
+
+
+// 重置表单
 const resetForm = () => {
   state.value.formData = {
     name: '',
@@ -352,44 +315,34 @@ const resetForm = () => {
  
 };
 
-// 组件挂载前执行的逻辑
 onBeforeMount(() => {
-  // 如果有传入患者ID，则可以在此处加载患者数据
+  // 如果有patientId，可以在这里加载患者数据
   if (props.patientId) {
     // 加载患者数据的逻辑
   }
 });
 
-// 组件挂载完成后执行的逻辑
 onMounted(() => {
   // 组件挂载后的逻辑
 });
-
-// 表单提交方法
 const submit = () => {
-  // 触发submitOk事件，传递表单数据给父组件
+  // ElMessage.success('提交成功');
   emits('submitOk', state.formData);
 };
-
-// 设置表单数据方法（供父组件调用）
 const setFormData = (data) => {
   if (data) {
     state.value.formData = data;
   }
 };
-
-// 暴露组件内部属性和方法给父组件使用
 defineExpose({ state, submit, setFormData });
 </script>
 
 <style lang="scss" scoped>
-// 容器样式
 .container {
   padding: 20px;
   background-color: #fff;
 }
 
-// 头部标题样式
 .header {
   text-align: center;
   margin-bottom: 20px;
@@ -406,7 +359,6 @@ defineExpose({ state, submit, setFormData });
   }
 }
 
-// 护理表单样式
 .nursing-form {
   .patient-info {
     padding: 15px; 
@@ -435,4 +387,4 @@ defineExpose({ state, submit, setFormData });
     text-align: left;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue
index 06568ecc..5e43e96d 100644
--- a/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue
+++ b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue
@@ -64,13 +64,14 @@
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
               />
+              <!-- <el-input v-model="formData.onsetDate" type="date" /> -->
             </el-form-item>
           </div>
         </el-form-item>
         
         <!-- 病史信息区域标题 -->
         <h4 class="section-title">病史信息</h4>
-        <!-- 2. 病史信息：单行自适应排列 -->
+        <!-- 2. 病史信息：单行自适应排列（新增调整） -->
         <el-form-item class="form-section">
           <div class="single-row-layout">
             <!-- 现病史输入项 -->
@@ -180,6 +181,14 @@ defineOptions({
   components: { ElInput, ElMessage, ElForm, ElFormItem },
 });
 
+// // Props与事件,去掉props.patientInfo改为直接从store获取
+// const props = defineProps({
+//   patientInfo: {
+//     type: Object,
+//     required: true,
+//   },
+// });
+
 // 定义组件接收的属性（目前为空）
 const props = defineProps({});
 
@@ -197,20 +206,20 @@ const formRef = ref(null);
 // 表单数据（全部字符类型）
 // 存储门诊病历表单的所有字段数据
 const formData = reactive({
-  height: '',              // 身高(cm)
-  weight: '',              // 体重(kg)
-  temperature: '',         // 体温(℃)
-  pulse: '',               // 脉搏(次/分)
-  onsetDate: '',           // 发病日期
-  complaint: '',           // 主诉（必填项）
-  presentIllness: '',      // 现病史
-  pastIllness: '',         // 既往史
-  personalHistory: '',     // 个人史
-  allergyHistory: '',      // 过敏史
-  physicalExam: '',        // 查体结果
-  treatment: '',           // 处理方案
-  auxiliaryExam: '',       // 辅助检查结果
-  familyHistory: '',       // 家族史
+  height: '', // 身高(cm)
+  weight: '', // 体重(kg)
+  temperature: '', // 体温(℃)
+  pulse: '', // 脉搏(次/分)
+  onsetDate: '', // 发病日期
+  complaint: '', // 主诉（必填项）
+  presentIllness: '', // 现病史
+  pastIllness: '', // 既往史
+  personalHistory: '', // 个人史
+  allergyHistory: '', // 过敏史
+  physicalExam: '', // 查体结果
+  treatment: '', // 处理方案
+  auxiliaryExam: '', // 辅助检查结果
+  familyHistory: '', // 家族史
 });
 
 // 表单校验规则
diff --git a/openhis-ui-vue3/src/template/useOptionsList.js b/openhis-ui-vue3/src/template/useOptionsList.js
index caf7c9e5..25c275a9 100644
--- a/openhis-ui-vue3/src/template/useOptionsList.js
+++ b/openhis-ui-vue3/src/template/useOptionsList.js
@@ -1,21 +1,50 @@
+// 导入 API 函数，用于从服务器获取带有选项列表的数据
 import { getListWithOptionList } from '@/views/basicmanage/caseTemplatesStatistics/api';
+// 导入 Vue 3 的组合式 API：onMounted（组件挂载后执行）和 ref（响应式数据）
 import { onMounted, ref } from 'vue';
+
+// 创建响应式数据：统计选项列表，初始为空数组
 const statisticsOptionList = ref([]);
+
+/**
+ * 初始化统计选项列表数据
+ * 异步函数，通过 API 获取数据并更新到响应式变量中
+ */
 const initStatic = async () => {
   try {
+    // 调用 API 获取数据
     const res = await getListWithOptionList();
+    // 将获取到的数据赋值给响应式变量
     statisticsOptionList.value = res.data;
   } catch (error) {
+    // 错误处理：打印错误信息到控制台
     console.log(error);
   }
 };
+
+/**
+ * Vue 3 组合式函数：用于获取和管理统计选项列表
+ * @returns {Object} 返回包含响应式数据和方法的对象
+ */
 export default function useOptionsList() {
-  initStatic();
+  // 组件挂载后自动初始化数据
+  onMounted(() => {
+    initStatic();
+  });
+
+  /**
+   * 根据代码获取对应的选项列表
+   * @param {string} code - 统计类型代码
+   * @returns {Array} 返回匹配的选项列表，如果没有匹配则返回空数组
+   */
   const getStatisticsOptionList = (code) => {
+    // 在统计选项列表中查找匹配代码的项，然后返回其 optionList 属性，如果没有找到则返回空数组
     return statisticsOptionList.value.find((item) => item.code === code)?.optionList || [];
   };
+
+  // 返回响应式数据和方法供组件使用
   return {
-    statisticsOptionList,
-    getStatisticsOptionList,
+    statisticsOptionList, // 完整的统计选项列表
+    getStatisticsOptionList, // 根据代码获取选项列表的方法
   };
-}
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/股骨头坏死(模板1).vue b/openhis-ui-vue3/src/template/股骨头坏死(模板1).vue
index e1720ffe..75ac2cfc 100644
--- a/openhis-ui-vue3/src/template/股骨头坏死(模板1).vue
+++ b/openhis-ui-vue3/src/template/股骨头坏死(模板1).vue
@@ -1,7 +1,7 @@
 <template>
   <div class="template-content">
     <div class="template-header">
-      <h3>股骨头坏死(模板1)</h3>
+      <h3>股骨头坏死(模板11111111)</h3>
     </div>
     <div class="template-body">
       <p>主诉：左侧髋部疼痛X个月，加重1周。</p>
@@ -17,7 +17,7 @@
 
 <script setup>
 defineOptions({
-  name: 'Template1'
+  name: '股骨头坏死(模板11111111)'
 })
 // 可以在这里添加组件逻辑
 </script>
diff --git a/openhis-ui-vue3/src/views/drug/inHospitalDispensing/index.vue b/openhis-ui-vue3/src/views/drug/inHospitalDispensing/index.vue
index ec23e821..f7a9ab72 100644
--- a/openhis-ui-vue3/src/views/drug/inHospitalDispensing/index.vue
+++ b/openhis-ui-vue3/src/views/drug/inHospitalDispensing/index.vue
@@ -85,7 +85,6 @@
 </div>
 </template>
 <script setup lang='ts'>
-import { is } from 'core-js/core/object'
 import { getCurrentInstance, onBeforeMount, onMounted, reactive,ref } from 'vue'
 // const { proxy } = getCurrentInstance();
 const emits = defineEmits([])
diff --git a/openhis-ui-vue3/src/views/login.vue b/openhis-ui-vue3/src/views/login.vue
index b3ea19d5..d7d4b04f 100644
--- a/openhis-ui-vue3/src/views/login.vue
+++ b/openhis-ui-vue3/src/views/login.vue
@@ -234,17 +234,19 @@ onMounted(() => {
   }
   
   // 获取医疗机构列表
-  getUserBindTenantList().then((res) => {
-    tenantOptions.value = res.data.map(item => ({
-      label: item.tenantName,
-      value: item.id
-    }));
-    // 如果只有一个医疗机构，自动选中
-    if (tenantOptions.value.length === 1) {
-      loginForm.value.tenantId = tenantOptions.value[0].value;
-      currentTenantName.value = tenantOptions.value[0].label;
-    }
-  });
+  if (loginForm.value.username) {
+    getUserBindTenantList(loginForm.value.username).then((res) => {
+      tenantOptions.value = res.data.map(item => ({
+        label: item.tenantName,
+        value: item.id
+      }));
+      // 如果只有一个医疗机构，自动选中
+      if (tenantOptions.value.length === 1) {
+        loginForm.value.tenantId = tenantOptions.value[0].value;
+        currentTenantName.value = tenantOptions.value[0].label;
+      }
+    });
+  }
 });
 
 function handleLogin() {
@@ -476,7 +478,10 @@ function handleUserName(value) {
 //getCode();
 getCookie();
 
-getTenantList(loginForm.value.username);
+// 只有当 username 存在时才获取租户列表
+if (loginForm.value.username) {
+  getTenantList(loginForm.value.username);
+}
 </script>
 
 <style>
@@ -648,4 +653,4 @@ html, body {
 :deep(.el-form-item) {
   margin-bottom: 15px !important; // 减小输入框之间的距离
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/test-util-extend.js b/openhis-ui-vue3/test-util-extend.js
new file mode 100644
index 00000000..559d5521
--- /dev/null
+++ b/openhis-ui-vue3/test-util-extend.js
@@ -0,0 +1,25 @@
+// 测试util._extend是否存在
+if (typeof process !== 'undefined' && process.versions && process.versions.node) {
+  try {
+    const util = require('util');
+    console.log('util._extend存在吗？', typeof util._extend);
+    if (typeof util._extend === 'function') {
+      console.log('util._extend是一个函数');
+    } else {
+      console.log('util._extend不是一个函数，添加兼容实现');
+      util._extend = function(destination, source) {
+        for (var key in source) {
+          if (source.hasOwnProperty(key)) {
+            destination[key] = source[key];
+          }
+        }
+        return destination;
+      };
+      console.log('兼容实现添加成功');
+    }
+  } catch (e) {
+    console.error('util模块加载失败:', e);
+  }
+} else {
+  console.log('不在Node.js环境中');
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js
index 6ad38961..6f5209ea 100644
--- a/openhis-ui-vue3/vite.config.js
+++ b/openhis-ui-vue3/vite.config.js
@@ -79,4 +79,4 @@ export default defineConfig(({ mode, command }) => {
       },
     },
   };
-});
+});
\ No newline at end of file