修复了全选框

Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his into develop
修复了全选框
2025-10-31 16:35:47 +08:00 · 2025-10-31 16:32:53 +08:00 · 2025-10-31 16:32:13 +08:00 · 2025-10-31 16:23:12 +08:00 · 2025-10-31 16:13:53 +08:00 · 2025-10-31 16:06:12 +08:00
32 changed files with 1722 additions and 403 deletions
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@

 天天开源的前⾝是新致开源，最早于2022年6⽉发布开源医疗软件平台OpenHIS.org.cn，于2023年6⽉发布开源企业软件平台OpenCOM.com.cn。2025年7⽉，新致开源品牌更新为天天开源，我们始终秉持开源、专业、协作的理念，致⼒于为医疗、教育、中⼩企业等⾏业提供优质的开源解决⽅案。

-了解我们：https://open.tntlinking.com/about?site=gitee
+了解我们a：https://open.tntlinking.com/about?site=gitee

 ## 💾【部署包下载】

--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/appservice/ICommonService.java
@@ -29,7 +29,7 @@ public interface ICommonService {
    /**
     * 药房列表(库房用)
     *
-     * @return 药房列表
+     * @return 药房列表1
     */
    List<LocationDto> getInventoryPharmacyList();

--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/PurchaseInventoryAppServiceImpl.java
@@ -161,6 +161,27 @@ public class PurchaseInventoryAppServiceImpl implements IPurchaseInventoryAppSer
        if (receiptDetailList.isEmpty()) {
            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
        }
+        
+        // 获取所有供应商ID
+        Set<Long> supplierIds = receiptDetailList.stream()
+            .filter(dto -> dto.getSupplierId() != null)
+            .map(ReceiptDetailDto::getSupplierId)
+            .collect(Collectors.toSet());
+        
+        // 查询供应商信息并设置供应商名称
+        if (!supplierIds.isEmpty()) {
+            List<Supplier> suppliers = supplierService.listByIds(supplierIds);
+            Map<Long, String> supplierNameMap = suppliers.stream()
+                .collect(Collectors.toMap(Supplier::getId, Supplier::getName));
+            
+            // 设置供应商名称
+            receiptDetailList.forEach(dto -> {
+                if (dto.getSupplierId() != null) {
+                    dto.setSupplierName(supplierNameMap.getOrDefault(dto.getSupplierId(), ""));
+                }
+            });
+        }
+        
        return R.ok(receiptDetailList);
    }

--- a/openhis-server-new/openhis-application/src/main/resources/application-prod.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-prod.yml
@@ -6,9 +6,9 @@ spring:
    druid:
      # 主库数据源
      master:
-        url: jdbc:postgresql://localhost:5432/openhis?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
-        username: postgres
-        password: root
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgresql
+        password: Jchl1528
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭
@@ -62,13 +62,13 @@ spring:
  # redis 配置
  redis:
    # 地址
-    host: 127.0.0.1
+    host: 192.168.110.252
    # 端口，默认为6379
    port: 6379
    # 数据库索引
    database: 1
    # 密码
-    password: redis
+    password: Jchl1528
    # 连接超时时间
    timeout: 10s
    lettuce:
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
@@ -74,12 +74,14 @@
               T2."name" AS item_name,
               T2.id AS item_id,
               T2.part_percent,
-               T2.manufacturer_text AS supplier_name,
+               T2.manufacturer_text AS manufacturer_text,
               T3.total_volume,
               T5."name" AS practitioner_name,
               T6."name" AS purpose_location_name,
               T6."id" AS purpose_location_id,
               T7."name" AS purpose_location_store_name,
+               T1.supplier_id AS supplierId,
+               T10."name" AS supplier_name,
               T1.occurrence_time,
               (SELECT SUM(T9.quantity)
                   FROM wor_inventory_item T9
@@ -100,6 +102,8 @@
            LEFT JOIN wor_inventory_item T9
                ON T1.item_id = T9.item_id
                    AND T1.purpose_location_id = T9.location_id
+            LEFT JOIN adm_supplier T10
+                ON T1.supplier_id = T10.id
        WHERE T1.bus_no = #{busNo}
            AND T1.delete_flag = '0'
        UNION
@@ -121,12 +125,14 @@
               T8."name" AS item_name,
               T8.id AS item_id,
               T8.part_percent,
-               T8.manufacturer_text AS supplier_name,
+               T8.manufacturer_text AS manufacturer_text,
               T8."size" AS total_volume,
               T5."name" AS practitioner_name,
               T6."name" AS purpose_location_name,
               T6."id" AS purpose_location_id,
               T7."name" AS purpose_location_store_name,
+               T1.supplier_id AS supplierId,
+               T10."name" AS supplier_name,
               T1.occurrence_time,
               (SELECT SUM(T9.quantity)
                FROM wor_inventory_item T9
@@ -145,6 +151,8 @@
            LEFT JOIN wor_inventory_item T9
                ON T1.item_id = T9.item_id
                    AND T1.purpose_location_id = T9.location_id
+            LEFT JOIN adm_supplier T10
+                ON T1.supplier_id = T10.id
        WHERE T1.bus_no = #{busNo}
            AND T1.delete_flag = '0'
    </select>
@@ -167,12 +175,14 @@
               T2."name" AS item_name,
               T2.id AS item_id,
               T2.part_percent,
-               T2.manufacturer_text AS supplier_name,
+               T2.manufacturer_text AS manufacturer_text,
               T3.total_volume,
               T5."name" AS practitioner_name,
               T6."name" AS purpose_location_name,
               T6."id" AS purpose_location_id,
               T7."name" AS purpose_location_store_name,
+               T1.supplier_id AS supplierId,
+               T10."name" AS supplier_name,
               (SELECT SUM(T9.quantity)
                FROM wor_inventory_item T9
                WHERE T9.item_id = T1.item_id
@@ -192,6 +202,8 @@
                 LEFT JOIN wor_inventory_item T9
                           ON T1.item_id = T9.item_id
                               AND T1.purpose_location_id = T9.location_id
+                 LEFT JOIN adm_supplier T10
+                           ON T1.supplier_id = T10.id
        WHERE  T1.purpose_location_id = #{locationId}
           AND T1.status_enum = #{statusEnum}
           AND T1.type_enum IN
@@ -220,12 +232,14 @@
               T8."name" AS item_name,
               T8.id AS item_id,
               T8.part_percent,
-               T8.manufacturer_text AS supplier_name,
+               T8.manufacturer_text AS manufacturer_text,
               T8."size" AS total_volume,
               T5."name" AS practitioner_name,
               T6."name" AS purpose_location_name,
               T6."id" AS purpose_location_id,
               T7."name" AS purpose_location_store_name,
+               T1.supplier_id AS supplierId,
+               T10."name" AS supplier_name,
               (SELECT SUM(T9.quantity)
                FROM wor_inventory_item T9
                WHERE T9.item_id = T1.item_id
@@ -243,6 +257,8 @@
                 LEFT JOIN wor_inventory_item T9
                           ON T1.item_id = T9.item_id
                               AND T1.purpose_location_id = T9.location_id
+                 LEFT JOIN adm_supplier T10
+                           ON T1.supplier_id = T10.id
        WHERE  T1.purpose_location_id = #{locationId}
           AND T1.status_enum = #{statusEnum}
           AND T1.type_enum IN
--- a/openhis-server-new/openhis-einvoiceapp/pom.xml
+++ b/openhis-server-new/openhis-einvoiceapp/pom.xml
@@ -85,33 +85,33 @@

    </dependencies>

-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <fork>true</fork> &lt;!&ndash; 如果没有该配置，devtools不会生效 &ndash;&gt;-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>repackage</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-war-plugin</artifactId>-->
+<!--                <version>${maven-war-plugin.version}</version>-->
+<!--                <configuration>-->
+<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!--                    <warName>${project.artifactId}</warName>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--        <finalName>${project.artifactId}</finalName>-->
+<!--    </build>-->

 </project>
--- a/openhis-ui-vue3/.env.production
+++ b/openhis-ui-vue3/.env.production
@@ -1,11 +1,11 @@
 # 页面标题
-VITE_APP_TITLE = 医院信息管理系统
+VITE_APP_TITLE=医院信息管理系统

 # 生产环境配置
-VITE_APP_ENV = 'production'
+VITE_APP_ENV=production

 # OpenHIS管理系统/生产环境
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API=/prod-api

 # 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
+VITE_BUILD_COMPRESS=gzip
--- a/openhis-ui-vue3/.env.spug
+++ b/openhis-ui-vue3/.env.spug
@@ -0,0 +1,35 @@
+# 开发环境：本地只启动前端项目，依赖开发环境（后端、APP）
+# 生产环境配置
+VITE_APP_ENV = 'spug'
+
+VITE_DEV=true
+
+# 请求路径
+VITE_BASE_URL='http://192.168.110.252'
+
+# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
+VITE_UPLOAD_TYPE=server
+
+# OpenHIS管理系统/SPUG环境
+VITE_APP_BASE_API = '/admin-api'
+
+# 是否删除debugger
+VITE_DROP_DEBUGGER=false
+
+# 是否删除console.log
+VITE_DROP_CONSOLE=false
+
+# 是否sourcemap
+VITE_SOURCEMAP=true
+
+# 打包路径
+VITE_BASE_PATH=/
+
+# 商城H5会员端域名
+VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
+
+# 验证码的开关
+VITE_APP_CAPTCHA_ENABLE=false
+
+# GoView域名
+VITE_GOVIEW_URL='http://127.0.0.1:3000'
--- a/openhis-ui-vue3/package-lock.json
+++ b/openhis-ui-vue3/package-lock.json
@@ -13,9 +13,10 @@
        "@vueup/vue-quill": "1.2.0",
        "@vueuse/core": "10.6.1",
        "axios": "0.27.2",
+        "chart.js": "^4.5.1",
        "d3": "^7.9.0",
        "decimal.js": "^10.5.0",
-        "echarts": "5.4.3",
+        "echarts": "^5.4.3",
        "element-china-area-data": "^6.1.0",
        "element-plus": "2.9.11",
        "file-saver": "2.0.5",
@@ -544,6 +545,11 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
    },
+    "node_modules/@kurkle/color": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmmirror.com/@kurkle/color/-/color-0.3.4.tgz",
+      "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w=="
+    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1686,6 +1692,17 @@
        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
+    "node_modules/chart.js": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
+      "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
+      "dependencies": {
+        "@kurkle/color": "^0.3.0"
+      },
+      "engines": {
+        "pnpm": ">=8"
+      }
+    },
    "node_modules/china-division": {
      "version": "2.7.0",
      "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
@@ -7817,6 +7834,11 @@
      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
    },
+    "@kurkle/color": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmmirror.com/@kurkle/color/-/color-0.3.4.tgz",
+      "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w=="
+    },
    "@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8634,6 +8656,14 @@
        "supports-color": "^7.1.0"
      }
    },
+    "chart.js": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.1.tgz",
+      "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
+      "requires": {
+        "@kurkle/color": "^0.3.0"
+      }
+    },
    "china-division": {
      "version": "2.7.0",
      "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
--- a/openhis-ui-vue3/package.json
+++ b/openhis-ui-vue3/package.json
@@ -7,9 +7,10 @@
  "type": "module",
  "scripts": {
    "dev": "vite",
-    "build:prod": "vite build",
+    "build:prod": "vite build --mode production",
    "build:stage": "vite build --mode staging",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "build:spug": "vite build --mode spug"
  },
  "repository": {
    "type": "git",
@@ -20,9 +21,10 @@
    "@vueup/vue-quill": "1.2.0",
    "@vueuse/core": "10.6.1",
    "axios": "0.27.2",
+    "chart.js": "^4.5.1",
    "d3": "^7.9.0",
    "decimal.js": "^10.5.0",
-    "echarts": "5.4.3",
+    "echarts": "^5.4.3",
    "element-china-area-data": "^6.1.0",
    "element-plus": "2.9.11",
    "file-saver": "2.0.5",
--- a/openhis-ui-vue3/src/assets/logo/LOGO.jpg
+++ b/openhis-ui-vue3/src/assets/logo/LOGO.jpg
--- a/openhis-ui-vue3/src/settings.js
+++ b/openhis-ui-vue3/src/settings.js
@@ -3,6 +3,10 @@ export default {
   * 网页标题
   */
  title: import.meta.env.VITE_APP_TITLE,
+  /**
+   * 系统名称
+   */
+  systemName: import.meta.env.VITE_APP_SYSTEM_NAME || '测试医院',
  /**
   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
   */
--- a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js
+++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js
@@ -36,8 +36,12 @@ export function updateWarehouse(data) {
  // 删除
  export function deleteWarehouse(data) {
    return request({
-      url: '/base-data-manage/location/location?locationId=' + data.locationId,
+      url: '/base-data-manage/location/location',
      method: 'delete',
+      params: {
+        locationId: data.locationId,
+        busNo: data.busNo
+      }
    })
  }

--- a/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/warehouseLocation/index.vue
@@ -173,7 +173,7 @@ const { warehous_type } = proxy.useDict('warehous_type');
 const rules = ref({
  busNo: [{ required: false, message: '请输入科室编号', trigger: 'change' }],
  name: [
-    { required: true, message: '请输入仓库名称', trigger: 'change' },
+    { required: true, message: '请输入', trigger: 'change' },
    { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'change' },
  ],
  formEnum: [{ required: true, message: '请选择仓库类型', trigger: 'change' }],
@@ -211,7 +211,7 @@ function resetQuery() {
 }

 function handleEnable(row) {
-  enableLocation([row.id]).then((res) => {
+  enableLocation({ locationId: row.id, busNo: row.busNo }).then((res) => {
    if (res.code == 200) {
      proxy.$modal.msgSuccess('启用成功');
      handleQuery();
@@ -220,7 +220,7 @@ function handleEnable(row) {
 }

 function handleUnable(row) {
-  unableLocation([row.id]).then((res) => {
+  unableLocation({ locationId: row.id, busNo: row.busNo }).then((res) => {
    if (res.code == 200) {
      proxy.$modal.msgSuccess('停用成功');
      handleQuery();
@@ -250,7 +250,6 @@ function handleAdd() {
 }

 function handelEdit(row) {
-  console.log(warehous_type);
  title.value = '编辑药库药房';
  open.value = true;
  editShow.value = true;
@@ -281,7 +280,6 @@ function submitForm() {
          getPageList();
        });
      } else {
-        alert('456789');
        updateWarehouse(form.value).then((res) => {
          proxy.$modal.msgSuccess('操作成功');
          open.value = false;
@@ -294,11 +292,29 @@ function submitForm() {

 // 删除
 function handelDelete(data) {
+  proxy.$modal.confirm('是否确认删除该仓库位置?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
    loading.value = true;
-  deleteWarehouse({ locationId: data.id }).then((res) => {
-    proxy.$modal.msgSuccess('操作成功');
-    loading.value = false;
+    deleteWarehouse({ locationId: data.id, busNo: data.busNo }).then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('删除成功');
        getPageList();
+      } else {
+        // 检查错误信息是否与药品数据关联有关
+        if (res.msg && res.msg.includes('药品')) {
+          proxy.$modal.msgError('该仓库名称已有药品信息请核对确认');
+        } else {
+          proxy.$modal.msgError('删除失败：' + (res.msg || '未知错误'));
+        }
+      }
+    }).catch(() => {
+      proxy.$modal.msgError('删除失败');
+    }).finally(() => {
+      loading.value = false;
+    });
  });
 }
 // // 停用
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -378,7 +378,7 @@ const data = reactive({
    phone: [{ required: true, message: '联系方式不能为空', trigger: 'change' }],
    identifierNo: [{ required: true, message: '就诊卡号不能为空', trigger: 'change' }],
    idCard: [
-        { required: true, message: '证件号码不能为空', trigger: 'change' },
+        { required: false, message: '证件号码不能为空', trigger: 'change' },
        { validator: validateIdCard, trigger: 'blur' },
        { validator: validateUniquePatient, trigger: 'blur' }
      ],
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -67,7 +67,7 @@ import { throttle } from 'lodash-es';
 const props = defineProps({
  adviceQueryParams: {
    type: Object,
-    default: '',
+    required: true
  },
  patientInfo: {
    type: Object,
@@ -97,39 +97,25 @@ const throttledGetList = throttle(
 watch(
  () => props.adviceQueryParams,
  (newValue) => {
-    queryParams.value.searchKey = newValue.searchKey;
-    // queryParams.value.adviceType = newValue.adviceType;
+    console.log('adviceBaseList 接收到参数变化:', newValue);
+    
+    // 直接更新查询参数
+    queryParams.value.searchKey = newValue.searchKey || '';
+    
+    // 处理类型筛选
    if (newValue.adviceType) {
-      queryParams.value.adviceTypes = [newValue.adviceType].join(',');
+      // 单个类型
+      queryParams.value.adviceTypes = newValue.adviceType.toString();
    } else {
+      // 全部类型
      queryParams.value.adviceTypes = '1,2,3';
    }
-    throttledGetList();
-  },
-  { deep: true }
-);
    
-getList();
-function getList() {
-  queryParams.value.organizationId = props.patientInfo.orgId;
-  getAdviceBaseInfo(queryParams.value).then((res) => {
-    console.log('ssssssssss', res.data.records);
-    if (res.data.records.length > 0) {
-      adviceBaseList.value = res.data.records.filter((item) => {
-        if (item.adviceType == 1 || item.adviceType == 2) {
-          return handleQuantity(item) != 0;
-        } else {
-          return true;
-        }
-      });
-      total.value = res.data.total;
-      nextTick(() => {
-        currentIndex.value = 0;
-        adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
-      });
-    }
-  });
-}
+    console.log('发送请求参数:', queryParams.value);
+    getList();
+  },
+  { deep: true, immediate: true }
+);
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
  if (row.priceList && row.priceList.length > 0) {
@@ -138,6 +124,38 @@ function getPriceFromInventory(row) {
  }
  return '-';
 }
+function getList() {
+  queryParams.value.organizationId = props.patientInfo.orgId;
+  
+  console.log('发送API请求:', queryParams.value);
+  
+  getAdviceBaseInfo(queryParams.value).then((res) => {
+    if (res.data.records && res.data.records.length > 0) {
+      adviceBaseList.value = res.data.records.filter((item) => {
+        if (item.adviceType == 1 || item.adviceType == 2) {
+          return handleQuantity(item) != 0;
+        } else {
+          return true;
+        }
+      });
+      
+      console.log('过滤后数据显示:', adviceBaseList.value.length, '条');
+      
+      total.value = res.data.total;
+      nextTick(() => {
+        currentIndex.value = 0;
+        if (adviceBaseList.value.length > 0) {
+          adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+        }
+      });
+    } else {
+      adviceBaseList.value = [];
+    }
+  }).catch(error => {
+    console.error('获取数据失败:', error);
+    adviceBaseList.value = [];
+  });
+}
 // 处理键盘事件
 const handleKeyDown = (event) => {
  const key = event.key;
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -99,7 +99,7 @@
                >
                  <el-select v-model="scope.row.medTypeCode" placeholder=" " style="width: 150px">
                    <el-option
-                      v-for="item in med_type"
+                      v-for="item in diag_type"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
@@ -235,7 +235,7 @@ 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' }],
@@ -275,6 +275,10 @@ function getList() {
        diagnosisDoctor: item.diagnosisDoctor || props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
        diagnosisTime: item.diagnosisTime || new Date().toLocaleString('zh-CN')
      }));
+      
+      // 获取诊断列表后按排序号排序
+      form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
+      
      emits('diagnosisSave', false);
      console.log(form.value.diagnosisList);
    }
@@ -320,6 +324,11 @@ function handleImport() {
    // 获取患者慢性病信息
    getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
      if (res.data && res.data.length > 0) {
+        // 计算现有最大排序号
+        const maxSortNo = form.value.diagnosisList.length > 0 
+          ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
+          : 0;
+          
        res.data.forEach((item, index) => {
          form.value.diagnosisList.push({
        ...item,
@@ -327,7 +336,7 @@ function handleImport() {
          medTypeCode: '140104',
          verificationStatusEnum: 4,
          definitionId: item.id,
-          diagSrtNo: form.value.diagnosisList.length + 1,
+          diagSrtNo: maxSortNo + index + 1,
          iptDiseTypeCode: 2,
          diagnosisDesc: '',
              diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
@@ -335,6 +344,10 @@ function handleImport() {
        },
          });
        });
+        
+        // 导入完成后按排序号排序
+        form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
+        emits('diagnosisSave', false);
      }
    });
  }
@@ -417,17 +430,26 @@ function handleAddDiagnosis() {
        proxy.$modal.msgWarning('请先填写病历');
        return;
      }
+      // 计算现有最大排序号
+      const maxSortNo = form.value.diagnosisList.length > 0 
+        ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
+        : 0;
+        
      form.value.diagnosisList.push({
        showPopover: false,
        name: undefined,
        verificationStatusEnum: 4,
-        medTypeCode: '11',
-        diagSrtNo: form.value.diagnosisList.length + 1,
+        medTypeCode: '初诊诊断',
+        diagSrtNo: maxSortNo + 1,
        iptDiseTypeCode: 2,
        diagnosisDesc: '',
        diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
        diagnosisTime: new Date().toLocaleString('zh-CN')
      });
+      
+      // 添加后按排序号排序
+      form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
+      
      if (form.value.diagnosisList.length == 1) {
        form.value.diagnosisList[0].maindiseFlag = 1;
      }
@@ -445,12 +467,17 @@ function handleAddTcmDiagonsis() {
 */
 function handleDeleteDiagnosis(row, index) {
  if (row.conditionId) {
-    delEncounterDiagnosis(row.conditionId).then(() => {
+    delEncounterDiagnosis({ conditionId: row.conditionId }).then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('删除成功');
        getList();
        getTree();
+      }
    });
  } else {
    form.value.diagnosisList.splice(index, 1);
+    // 删除后不重新计算排序号，保持用户设置的排序不变
+    emits('diagnosisSave', false);
  }
 }

@@ -458,7 +485,6 @@ function handleMaindise(value, index) {
  if (value == 1) {
    let flag = 0;
    form.value.diagnosisList.forEach((item) => {
-      console.log(item);
      if (item.maindiseFlag == 1) {
        flag++;
      }
@@ -482,6 +508,9 @@ function handleSaveDiagnosis() {
      } else if (!form.value.diagnosisList.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
        proxy.$modal.msgWarning('至少添加一条主诊断');
      } else {
+        // 保存前按排序号排序
+        form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
+        
        saveDiagnosis({
          patientId: props.patientInfo.patientId,
          encounterId: props.patientInfo.encounterId,
@@ -491,7 +520,7 @@ function handleSaveDiagnosis() {
            getTree();
            getList();
            emits('diagnosisSave', false);
-            proxy.$modal.msgSuccess('诊断已保存');
+            proxy.$modal.msgSuccess('诊断已保存并按排序号排序');
            //食源性疾病病例数据智能采集 ---START---
            isFoodDiseasesNew({
              encounterId: props.patientInfo.encounterId,
@@ -566,16 +595,26 @@ function handleNodeClick(data) {
    proxy.$modal.msgWarning('该诊断项已存在');
    return;
  }
+  
+  // 计算现有最大排序号
+  const maxSortNo = form.value.diagnosisList.length > 0 
+    ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
+    : 0;
+    
  form.value.diagnosisList.push({
    ybNo: data.ybNo,
    name: data.name,
    verificationStatusEnum: 4,
    medTypeCode: '11',
-    diagSrtNo: form.value.diagnosisList.length + 1,
+    diagSrtNo: maxSortNo + 1,
    definitionId: data.definitionId,
    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
    diagnosisTime: new Date().toLocaleString('zh-CN')
  });
+  
+  // 添加后按排序号排序
+  form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
+  
  if (form.value.diagnosisList.length == 1) {
    form.value.diagnosisList[0].maindiseFlag = 1;
  }
--- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emr.vue
@@ -203,18 +203,32 @@ import { saveEmr, getEmrDetail, saveEmrTemplate } from '../api';
 import emrTemplate from '../emr/emrtemplate.vue';
 import emrhistory from '../emr/emrhistory.vue';

-import { ref, computed } from 'vue';
+import { ref, computed, watch, getCurrentInstance } from 'vue';
+import { formatDate } from '@/utils/index';
+
+// 2. 当前就诊日期（默认为当前时间；复诊为初诊日期）
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+  visitType: {  // 接收父组件传来的值
+    type: String,
+    default: '',
+  },
+  firstVisitDate: { // 父组件计算的初诊日期（若有历史病历）
+    type: String,
+    default: '',
+  },
+});

-// 2. 当前就诊日期（默认为当前时间）
 const currentVisitDate = computed(() => {
-  return new Date().toLocaleString('zh-CN', {
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-  });
+  // 复诊优先展示初诊日期
+  if (props.visitType === 'FOLLOW_UP' && props.firstVisitDate) {
+    return props.firstVisitDate;
+  }
+  // 初诊或未获取初诊日期时，展示挂号时间或当前时间
+  return formatDate(props.patientInfo?.registerTime || new Date());
 });

 const form = ref({});
@@ -228,16 +242,6 @@ const { proxy } = getCurrentInstance();
 const showDialog = ref('');
 const openEmrTemplate = ref(false);
 const templateName = ref('');
-const props = defineProps({
-  patientInfo: {
-    type: Object,
-    required: true,
-  },
-  visitType: {  // ✅ 接收父组件传来的值
-    type: String,
-    default: '',
-  },
-});

 watch(
  () => form.value,
--- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrhistory.vue
@@ -10,23 +10,15 @@
    <el-table
      ref="emrHistoryRef"
      :data="emrHistory"
-      row-key="patientId"
-      highlight-current-row
+      row-key="id"
      @selection-change="handleSelectionChange"
    >
-      <!-- @cell-click="clickRow" -->
      <el-table-column type="selection" width="55" />
      <el-table-column label="主诉" align="left" prop="name" :show-overflow-tooltip="true"/>
      <el-table-column label="时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true"/>
      <el-table-column label="操作" align="center" width="80">
        <template #default="scope">
-          <!-- <el-button
-            link
-            type="primary"
-            @click.stop="handelDetail(scope.row)"
-            >详情
-          </el-button> -->
-          <el-button link type="primary" @click.stop="clickRow(scope.row)">复用 </el-button>
+          <el-button link type="primary" @click.stop="clickRow(scope.row)">复用</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -43,6 +35,7 @@
 <script setup>
 import { formatDate, formatDateymd } from '@/utils/index';
 import { getEmrHistoryList } from '../api';
+
 const queryParams = ref({
  pageNum: 1,
  pageSize: 10,
@@ -51,13 +44,19 @@ const queryParams = ref({
 const selectRow = ref({});
 const emrHistory = ref([]);
 const emits = defineEmits(['selectRow']);
+const emrHistoryRef = ref(null);
+const selectedRows = ref([]);
+
+const total = ref(0);

 getList();
+
 function getList() {
  if (sessionStorage.getItem('patientId')) {
    queryParams.value.patientId = sessionStorage.getItem('patientId');
    getEmrHistoryList(queryParams.value).then((res) => {
      emrHistory.value = res.data.records;
+      total.value = res.data.total;
      emrHistory.value.map((k) => {
        k.name = JSON.parse(k.contextJson).chiefComplaint;
        k.createTime = formatDate(k.createTime);
@@ -66,6 +65,12 @@ function getList() {
  }
 }

+function handleSelectionChange(selection) {
+  // 直接更新选中行数据，不干涉表格UI状态
+  // 这样可以允许用户使用全选框功能
+  selectedRows.value = selection;
+}
+
 function clickRow(row) {
  selectRow.value = JSON.parse(row.contextJson);
  emits('selectRow', selectRow.value);
--- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
@@ -43,7 +43,7 @@ const props = defineProps({
    required: true,
  },
 });
-// getList();
+getList(); 
 function getList() {
  queryParams.value.useScopeCode = 1;
  getEmrTemplateList(queryParams.value).then((res) => {
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -550,40 +550,36 @@
        </template>
      </el-table-column>
      <!-- <el-table-column label="序号" align="center" width="60" prop="sortNumber"> </el-table-column> -->
-      <el-table-column label="医嘱" align="center" prop="productName" width="400">
+      <!-- 医嘱类型列 -->
+      <el-table-column label="医嘱类型" align="center" width="120">
        <template #default="scope">
          <template v-if="getRowDisabled(scope.row)">
            <el-select
-              style="width: 35%; margin-right: 20px"
              v-model="scope.row.adviceType"
              :ref="'adviceTypeRef' + scope.$index"
-              @change="
-                (value) => {
-                  expandOrder = [];
-                  prescriptionList[scope.$index].adviceName = undefined;
-                  adviceQueryParams.adviceType = value;
-                }
-              "
-            >
+              @change="handleAdviceTypeChange(scope.row, scope.$index)"
+              placeholder="请选择"
+              style="width: 100%">
              <el-option
                v-for="item in adviceTypeList"
                :key="item.value"
                :label="item.label"
                :value="item.value"
-                @click="
-                  () => {
-                    prescriptionList[scope.$index].adviceType = item.value;
-                    prescriptionList[scope.$index].adviceType_dictText = item.label;
-                  }
-                "
              />
            </el-select>
+          </template>
+          <span v-else>{{ getAdviceTypeText(scope.row.adviceType) }}</span>
+        </template>
+      </el-table-column>
+      <!-- 项目列 -->
+      <el-table-column label="项目" align="center" prop="productName" width="280">
+        <template #default="scope">
+          <template v-if="getRowDisabled(scope.row)">
            <el-popover
              :popper-style="{ padding: '0' }"
              placement="bottom-start"
              :visible="scope.row.showPopover"
-              :width="1200"
-            >
+              :width="1200">
              <adviceBaseList
                ref="adviceTableRef"
                :popoverVisible="scope.row.showPopover"
@@ -594,24 +590,14 @@
              <template #reference>
                <el-input
                  :ref="'adviceRef' + scope.$index"
-                  style="width: 50%"
                  v-model="scope.row.adviceName"
                  placeholder="请选择项目"
                  @input="handleChange"
                  @click="handleFocus(scope.row, scope.$index)"
                  @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
-                  @keydown="
-                    (e) => {
-                      if (!scope.row.showPopover) return;
-                      // 拦截上下键和回车事件
-                      if (['ArrowUp', 'ArrowDown', 'Enter'].includes(e.key)) {
-                        e.preventDefault();
-                        // 传递事件到弹窗容器
-                        adviceTableRef.handleKeyDown(e);
-                      }
-                    }
-                  "
+                  @keydown="handleInputKeyDown(scope.row, $event)"
                  @blur="handleBlur(scope.row)"
+                  style="width: 100%"
                />
              </template>
            </el-popover>
@@ -735,7 +721,7 @@ import {
  getAdviceBaseInfo,
  getActivityBindDevice,
 } from '../api';
-import adviceBaseList from '../advicebaselist';
+import adviceBaseList from '../adviceBaseList.vue';
 import { computed, getCurrentInstance, nextTick, watch } from 'vue';
 import { calculateQuantityByDays, formatNumber } from '@/utils/his';
 import OrderGroupDrawer from './orderGroupDrawer';
@@ -751,7 +737,10 @@ const prescriptionList = ref([]);
 const form = ref({
  prescriptionList: prescriptionList.value,
 });
-const adviceQueryParams = ref({});
+const adviceQueryParams = ref({
+  searchKey: '',
+  adviceType: ''
+});
 const rowIndex = ref(-1);
 const groupIndex = ref(1);
 const groupIndexList = ref([]);
@@ -863,6 +852,15 @@ watch(
  },
  { immediate: true }
 );
+// 获取医嘱类别显示文本
+function getAdviceTypeText(adviceType) {
+  const typeMap = {
+    1: '西药中成药',
+    2: '耗材', 
+    3: '诊疗'
+  };
+  return typeMap[adviceType] || '未知';
+}
 function handleTotalAmount() {
  totalAmount.value = prescriptionList.value.reduce((accumulator, currentRow) => {
    if (currentRow.chargeStatus != 8) {
@@ -933,6 +931,9 @@ function handleAddPrescription() {
    return;
  }
  isAdding.value = true;
+  // 重置查询参数
+  adviceQueryParams.value = {};
+
  // 在数组最前方添加一行，让新增行显示在最上边
  prescriptionList.value.unshift({
    uniqueKey: nextId.value++,
@@ -979,10 +980,17 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
  rowIndex.value = index;
  row.showPopover = true;
+  // 确保查询参数与当前行类型一致
+  adviceQueryParams.value = {
+    adviceType: row.adviceType || '',
+    searchKey: adviceQueryParams.value.searchKey || ''
+  };
 }

 function handleBlur(row) {
+   setTimeout(() => {
    row.showPopover = false;
+  }, 200);
 }

 function handleChange(value) {
@@ -993,6 +1001,8 @@ function handleChange(value) {
 * 选择药品回调
 */
 function selectAdviceBase(key, row) {
+  // 立即关闭当前弹窗
+  prescriptionList.value[rowIndex.value].showPopover = false;
  if (row.adviceType == 3) {
    getActivityBindDevice({ activityId: row.adviceDefinitionId }).then((res) => {
      if (res.data.activityBindDeviceInfos?.length > 0) {
@@ -1093,9 +1103,11 @@ function selectAdviceBase(key, row) {
      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
    }
  } else {
-    prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId;
+  // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
+  const defaultOrgId = row.positionId || props.patientInfo.orgId;
+  prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
  prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
-  }
+}
 expandOrder.value = [key];
  nextTick(() => {
    if (row.adviceType == 1) {
@@ -1108,6 +1120,7 @@ function selectAdviceBase(key, row) {
      inputRefs.value['quantity']?.focus();
    }
  });
+ 
 }

 function getOrgList() {
@@ -1488,9 +1501,11 @@ function setValue(row) {
        .toFixed(2);
    }
  } else {
-    prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId;
+  // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
+  const defaultOrgId = row.positionId || props.patientInfo.orgId;
+  prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
  prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
-  }
+}
 }

 // 组套保存
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -100,8 +100,8 @@
          }}</el-descriptions-item>
          <el-descriptions-item label="" width="350">
  <!-- 初诊 / 复诊 按钮 -->
-<el-radio v-model="visitType" label="FIRST">初诊</el-radio>
-<el-radio v-model="visitType" label="FOLLOW_UP">复诊</el-radio>
+<el-radio v-model="visitType" label="FIRST" :disabled="visitTypeDisabled">初诊</el-radio>
+  <el-radio v-model="visitType" label="FOLLOW_UP" :disabled="visitTypeDisabled">复诊</el-radio>

  <!-- 原有按钮 -->
  <el-button type="primary" plain @click.stop="handleFinish(patientInfo.encounterId)">
@@ -148,6 +148,7 @@
                }
              "
              :visitType="visitType" 
+              :firstVisitDate="firstVisitDate"
            />
          </el-tab-pane>
          <el-tab-pane label="诊断" name="diagnosis">
@@ -253,6 +254,8 @@ const emits = defineEmits(['click']);
 const activeTab = ref('emr');
 const patientList = ref([]);
 const patientInfo = ref({});
+const visitTypeDisabled = ref(false);
+
 const prescriptionInfo = ref([]);
 const registerTime = ref([formatDate(new Date()), formatDate(new Date())]);
 const patientDrawerRef = ref();
@@ -264,6 +267,7 @@ const waitCount = ref(0);
 const loading = ref(false);
 const { proxy } = getCurrentInstance();
 const visitType = ref('');
+const firstVisitDate = ref('');
 const disabled = computed(() => {
  return Object.keys(patientInfo.value).length === 0;
 });
@@ -290,6 +294,10 @@ function setVisitType(type) {
  visitType.value = type;
 }
 function checkPatientHistory(patient) {
+// 重置状态
+  visitTypeDisabled.value = false;
+  firstVisitDate.value = '';
+  
  // 如果患者没有身份证号，无法判断是否为初诊
  if (!patient.idCard) {
    // 默认设置为初诊
@@ -297,6 +305,16 @@ function checkPatientHistory(patient) {
    return;
  }
  
+  // 如果当前就诊已经有明确的初复诊标识，则使用该标识
+  if (patient.visitType) {
+    visitType.value = patient.visitType;
+    // 如果是已完诊的记录，禁用修改
+    if (patient.statusEnum && patient.statusEnum !== 2) { // 假设2是就诊中状态
+      visitTypeDisabled.value = true;
+    }
+    return;
+  }
+  
  // 查询患者历史就诊记录
  const params = {
    patientId: patient.patientId,
@@ -305,20 +323,31 @@ function checkPatientHistory(patient) {
  
  getEmrHistoryList(params).then(res => {
    if (res.code === 200) {
+      const records = res.data?.records || [];
      // 如果有历史记录，则为复诊
      if (res.data && res.data.total > 0) {
        visitType.value = 'FOLLOW_UP';
+        // 计算最早一次病历创建时间作为初诊日期
+        const earliest = records.reduce((min, cur) => {
+          const ct = new Date(cur.createTime).getTime();
+          return ct < min ? ct : min;
+        }, new Date(records[0].createTime).getTime());
+        // 使用统一格式化
+        firstVisitDate.value = formatDate(earliest);
      } else {
        // 如果没有历史记录，则为初诊
        visitType.value = 'FIRST';
+        firstVisitDate.value = '';
      }
    } else {
      // 请求失败，默认设置为初诊
      visitType.value = 'FIRST';
+      firstVisitDate.value = '';
    }
  }).catch(() => {
    // 异常情况，默认设置为初诊
    visitType.value = 'FIRST';
+    firstVisitDate.value = '';
  });
 }
 function getWaitPatient() {
@@ -380,10 +409,6 @@ function handleOpen() {

 function handleCardClick(item, index) {
 currentEncounterId.value = '';
-  // if (item.active) {
-  //   patientList.value[index].active = false;
-  //   return;
-  // }
  loading.value = true;
  patientList.value.forEach((patient) => {
    patient.active = patient.encounterId === item.encounterId;
@@ -421,6 +446,8 @@ function handleFinish(encounterId) {
    if (res.code == 200) {
      proxy.$modal.msgSuccess('操作成功');
      patientInfo.value = {};
+      visitType.value = ''; // 重置初复诊标识
+      visitTypeDisabled.value = false; // 重置禁用状态
      getPatientList();
    }
  });
@@ -434,7 +461,6 @@ function handleTimeChange(value) {

 // 接诊回调
 function handleReceive(row) {
-  // patientInfo.value = row;
  handleCardClick(row);
  currentEncounterId.value = row.encounterId;
  drawer.value = false;
--- a/openhis-ui-vue3/src/views/index.vue
+++ b/openhis-ui-vue3/src/views/index.vue
@@ -1,106 +1,457 @@
 <template>
-  <div class="container">
-    <div class="awaitingBtn">
-      <el-button @click="awaitingMedicineBtn">效期预警 <span>{{total}}</span></el-button>
+  <div class="dashboard-container">
+    <!-- 顶部导航栏 -->
+    <header class="header">
+      <div class="logo">
+        <span class="logo-text">医院信息管理系统</span>
+      </div>
+      <div class="header-right">
+        <div class="notification-badge">
+          <i class="header-icon">🔔</i>
+          <span class="badge">2</span>
+        </div>
+        <i class="header-icon">⚙️</i>
+        <div class="user-info">
+          <span class="user-avatar">👤</span>
+          <span>用户</span>
+        </div>
+      </div>
+    </header>
+
+    <!-- 主体内容 -->
+    <div class="main-content">
+      <!-- 左侧导航栏 -->
+      <nav class="sidebar">
+        <div class="menu-item active">
+          <span class="menu-icon">📊</span>
+          <span>仪表盘</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">👥</span>
+          <span>患者管理</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">💉</span>
+          <span>预约管理</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">🏥</span>
+          <span>门诊管理</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">⚕️</span>
+          <span>住院管理</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">💊</span>
+          <span>药房管理</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">📋</span>
+          <span>报表统计</span>
+        </div>
+        <div class="menu-item">
+          <span class="menu-icon">⚙️</span>
+          <span>系统设置</span>
+        </div>
+      </nav>
+
+      <!-- 主内容区 -->
+      <div class="content-wrapper">
+        <div class="awaitingBtn">
+          <el-button @click="awaitingMedicineBtn">效期预警 <span>{{ total }}</span></el-button>
+        </div>
+
+        <h1 class="section-title">仪表盘</h1>
+
+        <!-- 关键指标卡片 -->
+        <div class="dashboard-grid">
+          <div class="card">
+            <div class="card-title">今日预约量</div>
+            <div class="card-value">126</div>
+            <div class="card-stats">
+              <span class="stats-icon">↑</span>
+              <span>12% 较昨日</span>
+            </div>
+          </div>
+          <div class="card">
+            <div class="card-title">门诊量统计</div>
+            <div class="card-value">342</div>
+            <div class="card-stats">
+              <span class="stats-icon">↑</span>
+              <span>8% 较上周</span>
+            </div>
+          </div>
+          <div class="card">
+            <div class="card-title">住院患者数</div>
+            <div class="card-value">78</div>
+            <div class="card-stats down">
+              <span class="stats-icon">↓</span>
+              <span>5% 较上周</span>
+            </div>
+          </div>
+          <div class="card">
+            <div class="card-title">药品库存预警</div>
+            <div class="card-value">8</div>
+            <div class="card-stats">
+              <span class="stats-icon">!</span>
+              <span>需要立即处理</span>
+            </div>
+          </div>
+        </div>
+
+        <!-- 图表展示区 -->
+        <div class="chart-container">
+          <canvas id="statsChart"></canvas>
+        </div>
+
+        <!-- 重要通知和待办事项 -->
+        <div class="bottom-content">
+          <div class="notification-container">
+            <div class="notification-title">重要通知</div>
+            <ul class="notification-list">
+              <li class="notification-item">系统将于周六凌晨2:00进行维护升级</li>
+              <li class="notification-item">新的门诊排班系统已上线，请尽快熟悉</li>
+              <li class="notification-item">三季度医疗质量分析报告已发布</li>
+            </ul>
+          </div>
+          <div class="todo-container">
+            <div class="todo-title">待办事项</div>
+            <ul class="todo-list">
+              <li class="todo-item">
+                <span>未完成预约</span>
+                <span class="todo-count">12个</span>
+              </li>
+              <li class="todo-item">
+                <span>待处理检查结果</span>
+                <span class="todo-count">7份</span>
+              </li>
+              <li class="todo-item">
+                <span>待开处方</span>
+                <span class="todo-count">3张</span>
+              </li>
+            </ul>
+            <button class="btn btn-primary">查看详情</button>
+          </div>
+        </div>
+
+        <!-- 患者列表 -->
+        <h2 class="section-title">最近患者</h2>
+        <div class="table-container">
+          <table>
+            <thead>
+              <tr>
+                <th>患者姓名</th>
+                <th>病历号</th>
+                <th>年龄</th>
+                <th>最后就诊时间</th>
+                <th>状态</th>
+                <th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>张明</td>
+                <td>HN2023001</td>
+                <td>45</td>
+                <td>2023-10-20 09:30</td>
+                <td><span style="color: #67c23a;">已完成</span></td>
+                <td>
+                  <button class="btn btn-outline">详情</button>
+                </td>
+              </tr>
+              <tr>
+                <td>李红</td>
+                <td>HN2023002</td>
+                <td>32</td>
+                <td>2023-10-20 10:15</td>
+                <td><span style="color: #ff9800;">待检查</span></td>
+                <td>
+                  <button class="btn btn-outline">详情</button>
+                </td>
+              </tr>
+              <tr>
+                <td>王建军</td>
+                <td>HN2023003</td>
+                <td>68</td>
+                <td>2023-10-19 14:20</td>
+                <td><span style="color: #d45d79;">住院中</span></td>
+                <td>
+                  <button class="btn btn-outline">详情</button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
    </div>
-    <!-- <div class="logo"> -->
-      <!-- <img src="/src/assets/images/jlau.jpg" /> -->
-    <!-- </div> -->
  </div>
 </template>

 <script setup name="Index">
+import { ref, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import Chart from 'chart.js/auto';
 import {
  getExpirationWarning,
 } from "./medicationmanagement/statisticalManagement/statisticalManagent";

 const router = useRouter();
-const version = ref('3.8.7');
-const total = ref(0)
-function awaitingMedicineBtn(){
-  router.push({ path: '/medicationmanagement/statisticalManagement/earlyWarning' })
+const total = ref(0);
+
+function awaitingMedicineBtn() {
+  router.push({ path: '/medicationmanagement/statisticalManagement/earlyWarning' });
 }
-function goTarget(url) {
-  window.open(url, '__blank');
-}
-function getExpirationWarningCount(){
-  getExpirationWarning({pageNo: 1,pageSize: 10}).then((res) => {
-    total.value = res.data.total||0
+
+function getExpirationWarningCount() {
+  getExpirationWarning({ pageNo: 1, pageSize: 10 }).then((res) => {
+    total.value = res.data.total || 0;
+  }).catch((err) => {
+    console.error('获取效期预警数量失败:', err);
+    total.value = 0;
  });
 }
-getExpirationWarningCount()
+
+let chartInstance = null;
+
+onMounted(() => {
+  getExpirationWarningCount();
+
+  const ctx = document.getElementById('statsChart');
+  if (!ctx) return;
+
+  // 销毁已有实例
+  if (chartInstance) {
+    chartInstance.destroy();
+  }
+
+  // 模拟数据：近7天门诊量与预约量
+  const labels = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+  const outpatientData = [310, 335, 305, 345, 370, 270, 210]; // 门诊量（柱状图）
+  const appointmentData = [100, 120, 110, 130, 140, 90, 70]; // 预约量（折线图）
+
+  chartInstance = new Chart(ctx.getContext('2d'), {
+    type: 'bar',
+    data: {
+      labels: labels,
+      datasets: [
+        {
+          label: '门诊量',
+          data: outpatientData,
+          backgroundColor: '#91c8e5',
+          borderColor: '#66a8cc',
+          borderWidth: 1,
+          borderRadius: 4,
+          borderSkipped: false,
+        },
+        {
+          label: '预约量',
+          data: appointmentData,
+          type: 'line',
+          borderColor: '#f56c6c',
+          backgroundColor: 'rgba(245, 108, 108, 0.1)',
+          borderWidth: 2,
+          pointBackgroundColor: '#f56c6c',
+          pointBorderColor: '#fff',
+          pointBorderWidth: 2,
+          pointRadius: 4,
+          fill: true,
+          tension: 0.3,
+          lineTension: 0.3,
+        }
+      ]
+    },
+    options: {
+      responsive: true,
+      maintainAspectRatio: false,
+      plugins: {
+        legend: {
+          position: 'top',
+          labels: {
+            font: {
+              size: 12,
+              weight: 'bold'
+            }
+          }
+        },
+        tooltip: {
+          mode: 'index',
+          intersect: false,
+          backgroundColor: 'rgba(0, 0, 0, 0.7)',
+          titleFont: {
+            size: 13
+          },
+          bodyFont: {
+            size: 12
+          }
+        }
+      },
+      scales: {
+        x: {
+          grid: {
+            display: false
+          },
+          ticks: {
+            font: {
+              size: 11
+            }
+          }
+        },
+        y: {
+          beginAtZero: true,
+          max: 400,
+          stepSize: 50,
+          grid: {
+            color: 'rgba(0, 0, 0, 0.05)'
+          },
+          ticks: {
+            font: {
+              size: 11
+            }
+          }
+        }
+      }
+    }
+  });
+});
 </script>

 <style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
-    }
-  }
-
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
-  }
-}
-.container {
+.dashboard-container {
  display: flex;
-  justify-content: center; /* 水平居中 */
-  align-items: center; /* 垂直居中 */
-  height: 70vh; /* 确保容器高度至少为视口高度 */
-  width: 100%;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f5f7fa;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  padding: 0;
 }
-.awaitingBtn{
+
+.header {
+  height: 60px;
+  background-color: white;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 24px;
+  position: sticky;
+  top: 0;
+  z-index: 1000;
+}
+
+.logo {
+  display: flex;
+  align-items: center;
+}
+
+.logo-text {
+  font-size: 18px;
+  font-weight: 600;
+  color: #166773;
+}
+
+.header-right {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+}
+
+.notification-badge {
+  position: relative;
+  cursor: pointer;
+}
+
+.header-icon {
+  font-size: 20px;
+  cursor: pointer;
+  padding: 8px;
+  border-radius: 4px;
+  transition: background-color 0.3s;
+}
+
+.header-icon:hover {
+  background-color: #f5f7fa;
+}
+
+.badge {
+  position: absolute;
+  top: 0;
+  right: 0;
+  background-color: #ff4d4f;
+  color: white;
+  font-size: 12px;
+  padding: 2px 6px;
+  border-radius: 10px;
+  min-width: 16px;
+  text-align: center;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 12px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.user-info:hover {
+  background-color: #f5f7fa;
+}
+
+.user-avatar {
+  font-size: 20px;
+}
+
+.main-content {
+  display: flex;
+  flex: 1;
+  overflow: hidden;
+}
+
+.sidebar {
+  width: 200px;
+  background-color: white;
+  box-shadow: 2px 0 4px rgba(0, 0, 0, 0.1);
+  overflow-y: auto;
+}
+
+.menu-item {
+  display: flex;
+  align-items: center;
+  padding: 16px 24px;
+  cursor: pointer;
+  transition: all 0.3s;
+  border-left: 3px solid transparent;
+}
+
+.menu-item:hover {
+  background-color: #f0f9ff;
+}
+
+.menu-item.active {
+  background-color: #e6f7ff;
+  border-left-color: #1890ff;
+  color: #1890ff;
+  font-weight: 500;
+}
+
+.menu-icon {
+  margin-right: 12px;
+  font-size: 18px;
+}
+
+.content-wrapper {
+  flex: 1;
+  padding: 20px;
+  overflow-y: auto;
+  background-color: #f5f7fa;
+}
+
+.awaitingBtn {
+  margin-bottom: 20px;
+  
  .el-button{
    border: 1px #166773 solid;
    span{
@@ -108,6 +459,7 @@ getExpirationWarningCount()
      margin-left: 5px;
    }
  }
+  
  .el-button:hover{
    border: 1px #166773 solid;
    color: #166773;
@@ -116,15 +468,204 @@ getExpirationWarningCount()
      margin-left: 5px;
    }
  }
-  position: absolute;
-  top:20px;
-  left: 20px;
 }
-.logo {
-  width: 1000px;
-  margin: 0 auto;
-  background: url(../assets/images/logo_bg.jpg) no-repeat right bottom;
-  overflow: hidden;
+
+.section-title {
+  font-size: 24px;
+  margin-bottom: 20px;
+  color: #333;
+  font-weight: 600;
+}
+
+.card {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+}
+
+.card:hover {
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
+}
+
+.card-title {
+  font-size: 14px;
+  color: #606266;
+  margin-bottom: 12px;
+}
+
+.card-value {
+  font-size: 32px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 8px;
+}
+
+.card-stats {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  color: #67c23a;
+}
+
+.card-stats.down {
+  color: #f56c6c;
+}
+
+.stats-icon {
+  margin-right: 4px;
+}
+
+.dashboard-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 20px;
+  margin-bottom: 30px;
+}
+
+.chart-container {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  margin-bottom: 30px;
+  height: 300px;
+  
+  canvas {
+    width: 100% !important;
+    height: 100% !important;
+  }
+}
+
+.bottom-content {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 20px;
+  margin-bottom: 30px;
+}
+
+.notification-container,
+.todo-container {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.notification-title,
+.todo-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 16px;
+}
+
+.notification-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.notification-item {
+  padding: 12px 0;
+  border-bottom: 1px solid #ebeef5;
+  
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.todo-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  margin-bottom: 20px;
+}
+
+.todo-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 0;
+  border-bottom: 1px solid #ebeef5;
+  
+  &:last-child {
+    border-bottom: none;
+  }
+}
+
+.todo-count {
+  color: #606266;
+  font-size: 14px;
+}
+
+.table-container {
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 24px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+th, td {
+  padding: 12px;
+  text-align: left;
+  border-bottom: 1px solid #ebeef5;
+}
+
+th {
+  background-color: #f5f7fa;
+  font-weight: 600;
+  color: #303133;
+}
+
+tr:last-child td {
+  border-bottom: none;
+}
+
+.btn {
+  padding: 6px 12px;
+  border-radius: 4px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  border: none;
+  outline: none;
+}
+
+.btn-primary {
+  background-color: #1890ff;
+  color: #fff;
+}
+
+.btn-primary:hover {
+  background-color: #40a9ff;
+}
+
+.btn-outline {
+  background-color: transparent;
+  border: 1px solid #dcdfe6;
+  color: #606266;
+}
+
+.btn-outline:hover {
+  border-color: #c6e2ff;
+  color: #40a9ff;
+  background-color: #ecf5ff;
+}
+
+@media (max-width: 768px) {
+  .bottom-content {
+    grid-template-columns: 1fr;
+  }
+  
+  .dashboard-grid {
+    grid-template-columns: 1fr;
+  }
 }
 </style>
-
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js
@@ -93,6 +93,18 @@ export function delEncounterDiagnosis(conditionId) {
  })
 }

+/**
+ * 是否是食源性诊断
+ */
+export function isFoodDiseasesNew(params) {
+  return request({
+    url: '/external-integration/foodborne-acquisition/is-food-diseases-new',
+    method: 'get',
+    params: params
+  })
+}
+
+
 /**
 * 获取中医诊断
 */
@@ -230,6 +242,15 @@ export function getOrgTree() {
  })
 }

+
+export function getEmrDetail(encounterId) {
+  return request({
+    url: '/doctor-station/emr/emr-detail?encounterId=' + encounterId,
+    method: 'get',
+  })
+}
+
+
 /**
 * 组合/拆组
 */
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -2,19 +2,17 @@
  <div>
    <el-row :gutter="24">
      <el-col :span="4" :xs="24">
-        <div style="height: 44px; display: flex; align-items: center; flex: none">
        <el-input
          v-model="diagnosis"
          placeholder="诊断名称"
          clearable
-            style="width: 100%"
+          style="width: 100%; margin-bottom: 10px"
          @keyup.enter="queryDiagnosisUse"
        >
          <template #append>
            <el-button icon="Search" @click="queryDiagnosisUse" />
          </template>
        </el-input>
-        </div>
        <el-tree
          ref="treeRef"
          :data="tree"
@@ -68,16 +66,21 @@
        </el-tree>
      </el-col>
      <el-col :span="20" :xs="24">
-        <div style="height: 44px; display: flex; align-items: center; flex: none">
+        <div style="margin-bottom: 10px">
          <el-button type="primary" plain @click="handleAddDiagnosis()"> 新增诊断 </el-button>
          <el-button type="primary" plain @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
          <el-button type="primary" plain @click="handleAddTcmDiagonsis()"> 中医诊断 </el-button>
          <el-button type="primary" plain @click="handleImport()"> 导入慢性病诊断 </el-button>
        </div>
+
        <el-form :model="form" :rules="rules" ref="formRef">
          <el-table ref="diagnosisTableRef" :data="form.diagnosisList" height="650">
-            <el-table-column label="序号" type="index" width="50" />
-            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="180">
+            <el-table-column label="序号"  width="50" >
+            <template #default="scope">
+    {{ scope.$index + 1 }}
+  </template>
+</el-table-column>
+            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="120">
              <template #default="scope">
                <el-form-item
                  :prop="`diagnosisList.${scope.$index}.diagSrtNo`"
@@ -136,9 +139,13 @@
                </el-form-item>
              </template>
            </el-table-column>
-            <el-table-column label="医保码" align="center" prop="ybNo" width="180" />
-            <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
+            
+            <el-table-column label="诊断医生" align="center" prop="diagnosisDoctor" width="120" />
+            <el-table-column label="诊断时间" align="center" prop="diagnosisTime" width="150" />
+            <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
+            <el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
              <template #default="scope">
+              <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                <el-checkbox
                  label="主诊断"
                  :trueLabel="1"
@@ -151,7 +158,7 @@
                <el-select
                  v-model="scope.row.verificationStatusEnum"
                  placeholder=" "
-                  style="width: 40%; padding-bottom: 5px; padding-left: 10px"
+                  style="width: 100%; padding-bottom: 5px; padding-left: 10px"
                  size="small"
                >
                  <el-option
@@ -161,6 +168,7 @@
                    :value="item.value"
                  />
                </el-select>
+              </div>
              </template>
            </el-table-column>
            <el-table-column label="操作" align="center" width="130">
@@ -185,28 +193,30 @@
    />
    <AddDiagnosisDialog
      :openAddDiagnosisDialog="openAddDiagnosisDialog"
-      :patientInfo="patientInfo"
+      :patientInfo="props.patientInfo"
      @close="closeDiagnosisDialog"
    />
  </div>
 </template>

 <script setup>
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance, nextTick } from 'vue'; // 添加 nextTick 导入
+import useUserStore from '@/store/modules/user';
 import {
  getConditionDefinitionInfo,
  saveDiagnosis,
  diagnosisInit,
  deleteDiagnosisBind,
  getEncounterDiagnosis,
+  getEmrDetail,
  getChronicDisease,
  getTcmDiagnosis,
  delEncounterDiagnosis,
+  isFoodDiseasesNew,
 } from '../api';
 import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
 import AddDiagnosisDialog from './addDiagnosisDialog.vue';
 import diagnosislist from '../diagnosis/diagnosislist.vue';
-import { patientInfo } from '../../store/patient.js';
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
 const tree = ref([]);
@@ -228,50 +238,93 @@ const props = defineProps({
 });
 const emits = defineEmits(['diagnosisSave']);
 const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
 const { med_type } = proxy.useDict('med_type');
 const rules = ref({
  name: [{ required: true, message: '请选择诊断', trigger: 'change' }],
  medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
  diagSrtNo: [{ required: true, message: '请输入诊断序号', trigger: 'change' }],
 });
-
+const isSaving = ref(false);
 watch(
  () => form.value.diagnosisList,
  () => {
+    // 如果正在保存，则不触发更新事件
+    if (!isSaving.value) {
      emits('diagnosisSave', false);
+    }
  },
  { deep: true }
 );

-// function getDetail(encounterId) {
-//   getEmrDetail(encounterId).then((res) => {
-//     allowAdd.value = res.data ? true : false;
-//   });
-// }
+function getDetail(encounterId) {
+  if (!encounterId) {
+    console.warn('未提供有效的就诊ID，无法获取病历详情');
+    return;
+  }
+  
+  getEmrDetail(encounterId).then((res) => {
+    allowAdd.value = res.data ? true : false;
+  });
+}

 function getList() {
-  getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
+  if (!props.patientInfo || !props.patientInfo.encounterId) {
+    console.warn('患者就诊信息不完整，无法获取诊断数据');
+    return;
+  }
+  
+  getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
    if (res.code == 200) {
-      form.value.diagnosisList = res.data;
+      // 为每个诊断项添加默认的诊断医生和时间（如果不存在）
+      const diagnosisList = res.data.map(item => ({
+        ...item,
+        diagnosisDoctor: item.diagnosisDoctor || props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+        diagnosisTime: item.diagnosisTime || new Date().toLocaleString('zh-CN')
+      }));
+      
+      // 对获取的数据进行排序
+      diagnosisList.sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
+      });
+      
+      form.value.diagnosisList = diagnosisList;
      emits('diagnosisSave', false);
      console.log(form.value.diagnosisList);
    }
  });
-  getTcmDiagnosis({ encounterId: patientInfo.value.encounterId }).then((res) => {
+  
+  getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
    if (res.code == 200) {
-      if (res.data.illness.length > 0) {
+      if (res.data.illness && res.data.illness.length > 0 && res.data.symptom) {
+        const newList = [];
        res.data.illness.forEach((item, index) => {
-          form.value.diagnosisList.push({
-            name: item.name + '-' + res.data.symptom[index].name,
+          newList.push({
+            name: item.name + '-' + (res.data.symptom[index]?.name || ''),
            ybNo: item.ybNo,
            medTypeCode: item.medTypeCode,
+            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+            diagnosisTime: new Date().toLocaleString('zh-CN')
          });
        });
+        
+        // 将新数据添加到现有列表中
+        form.value.diagnosisList.push(...newList);
+        
+        // 重新排序整个列表
+        form.value.diagnosisList.sort((a, b) => {
+          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+          return aNo - bNo;
+        });
      }
      emits('diagnosisSave', false);
      console.log(form.value.diagnosisList);
    }
  });
+  
  getTree();
 }

@@ -285,10 +338,15 @@ function init() {
 }

 function handleImport() {
-  if (patientInfo.value.contractName != '自费') {
+  if (!props.patientInfo || !props.patientInfo.encounterId) {
+    console.warn('患者就诊信息不完整，无法导入慢性病信息');
+    return;
+  }
+  
+  if (props.patientInfo.contractName != '自费') {
    // 获取患者慢性病信息
-    getChronicDisease({ encounterId: patientInfo.value.encounterId }).then((res) => {
-      if (res.data.length > 0) {
+    getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
+      if (res.data && res.data.length > 0) {
        res.data.forEach((item, index) => {
          form.value.diagnosisList.push({
        ...item,
@@ -297,6 +355,10 @@ function handleImport() {
          verificationStatusEnum: 4,
          definitionId: item.id,
          diagSrtNo: form.value.diagnosisList.length + 1,
+          iptDiseTypeCode: 2,
+          diagnosisDesc: '',
+              diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+              diagnosisTime: new Date().toLocaleString('zh-CN')
        },
          });
        });
@@ -340,7 +402,8 @@ const filterNode = (value, data) => {
 * 获取诊断树列表
 */
 function getTree() {
-  getConditionDefinitionInfo(patientInfo.value ? patientInfo.value.patientId : '').then((res) => {
+  const patientId = props.patientInfo?.patientId || '';
+  getConditionDefinitionInfo(patientId).then((res) => {
    if (res.code == 200) {
      let list = [];
      list = res.data.patientHistoryList;
@@ -377,14 +440,20 @@ function getTree() {
 function handleAddDiagnosis() {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
+      if (!allowAdd.value) {
+        proxy.$modal.msgWarning('请先填写病历');
+        return;
+      }
      form.value.diagnosisList.push({
        showPopover: false,
        name: undefined,
        verificationStatusEnum: 4,
-        medTypeCode: '21',
+        medTypeCode: '11',
        diagSrtNo: form.value.diagnosisList.length + 1,
-        iptDiseTypeCode: 31,
+        iptDiseTypeCode: 2,
        diagnosisDesc: '',
+        diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+        diagnosisTime: new Date().toLocaleString('zh-CN')
      });
      if (form.value.diagnosisList.length == 1) {
        form.value.diagnosisList[0].maindiseFlag = 1;
@@ -398,13 +467,31 @@ function handleAddTcmDiagonsis() {
  openAddDiagnosisDialog.value = true;
 }

+/**
+ * 删除诊断
+ */
 /**
 * 删除诊断
 */
 function handleDeleteDiagnosis(row, index) {
  if (row.conditionId) {
    delEncounterDiagnosis(row.conditionId).then(() => {
-      getList();
+      // 不要立即调用getList()，而是从当前列表中移除
+      form.value.diagnosisList.splice(index, 1);
+      // 重新排序剩余的项目
+      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
+      });
+      
+      // 重新分配连续的序号
+      sortedList.forEach((item, idx) => {
+        item.diagSrtNo = idx + 1;
+      });
+      
+      // 更新列表
+      form.value.diagnosisList = sortedList.map(item => ({ ...item }));
      getTree();
    });
  } else {
@@ -428,35 +515,72 @@ function handleMaindise(value, index) {
  }
 }

+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
 /**
 * 保存诊断
 */
 function handleSaveDiagnosis() {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
-      if (form.value.diagnosisList.length == 0) {
+      if (form.value.diagnosisList.length === 0) {
        proxy.$modal.msgWarning('诊断不能为空');
-        return false;
+        return;
      } else if (!form.value.diagnosisList.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
        proxy.$modal.msgWarning('至少添加一条主诊断');
-      } else {
+        return;
+      }
+
+      // 设置保存标志，避免触发watch监听器
+      isSaving.value = true;
+
+      // 步骤1：深拷贝并按 diagSrtNo 排序
+      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
+      });
+
+      // 步骤2：重新分配连续的序号（从1开始）
+      sortedList.forEach((item, index) => {
+        item.diagSrtNo = index + 1; // 这里是关键！把“诊断排序”改成新顺序
+      });
+
+      // 步骤3：提交排序后的数据
      saveDiagnosis({
-          patientId: patientInfo.value.patientId,
-          encounterId: patientInfo.value.encounterId,
-          diagnosisChildList: form.value.diagnosisList,
+        patientId: props.patientInfo.patientId,
+        encounterId: props.patientInfo.encounterId,
+        diagnosisChildList: sortedList,
      }).then((res) => {
-          if (res.code == 200) {
-            getTree();
-            getList();
+        if (res.code === 200) {
+          // 步骤4：更新本地数据，使用全新对象防止响应式问题
+          form.value.diagnosisList = sortedList.map(item => ({ ...item }));
+
          emits('diagnosisSave', false);
          proxy.$modal.msgSuccess('诊断已保存');
+
+          // 食源性疾病逻辑
+          isFoodDiseasesNew({ encounterId: props.patientInfo.encounterId }).then((res2) => {
+            if (res2.code === 20 && res2.data) {
+              window.open(res2.data, '_blank');
            }
          });
        }
+      }).finally(() => {
+        setTimeout(() => {
+          isSaving.value = false;
+        }, 100);
+      });
    }
  });
 }
-
 /**
 * 关闭诊断弹窗
 */
@@ -519,12 +643,15 @@ function handleNodeClick(data) {
    medTypeCode: '11',
    diagSrtNo: form.value.diagnosisList.length + 1,
    definitionId: data.definitionId,
+    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+    diagnosisTime: new Date().toLocaleString('zh-CN')
  });
  if (form.value.diagnosisList.length == 1) {
    form.value.diagnosisList[0].maindiseFlag = 1;
  }
 }
-defineExpose({ getList, handleSaveDiagnosis });
+
+defineExpose({ getList, getDetail, handleSaveDiagnosis });
 </script>

 <style lang="scss" scoped>
@@ -543,3 +670,4 @@ defineExpose({ getList, handleSaveDiagnosis });
  align-items: center;
 }
 </style>
+
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
@@ -55,10 +55,10 @@
 </template>
 <script setup>
 import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref, computed } from 'vue';
-import BloodTransfusion from './bloodTransfusion.vue';
+import BloodTransfusion from './bloodTransfusion';
 import { patientInfo } from '../../../store/patient.js';
 import Surgery from './surgery.vue';
-import LaboratoryTests from './LaboratoryTests.vue';
+import laboratoryTests from './laboratoryTests.vue';
 import MedicalExaminations from './medicalExaminations.vue';
 const { proxy } = getCurrentInstance();
 const emits = defineEmits([]);
--- a/openhis-ui-vue3/src/views/login.vue
+++ b/openhis-ui-vue3/src/views/login.vue
@@ -1,12 +1,14 @@
 <template>
  <div class="login">
    <!--  顶部  -->
-    <!-- <div class="el-login-top">
-      <el-image :src="logoNew"></el-image>
-    </div> -->
    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h1 class="title">医院信息管理系统</h1>
+    <div class="el-login-top">
+      <el-image :src="logoNew"></el-image>
+    </div>
+      <h1 class="title">{{ currentTenantName || settings.systemName }}</h1>
+      <p class="login-subtitle">请使用您的账号密码安全登录系统</p>
      <el-form-item prop="username">
+        <p class="label">用户名</p>
        <el-input
          v-model="loginForm.username"
          type="text"
@@ -21,25 +23,35 @@
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
+        <p class="label">密码</p>
        <el-input
          v-model="loginForm.password"
-          type="password"
+          :type="passwordVisible ? 'text' : 'password'"
          size="large"
          auto-complete="off"
          placeholder="密码"
          @keyup.enter="handleLogin"
-          show-password
        >
          <template #prefix
            ><svg-icon icon-class="password" class="el-input__icon input-icon"
          /></template>
+          <template #suffix>
+            <span 
+              class="password-toggle"
+              @click="togglePasswordVisibility"
+              style="cursor: pointer; color: #606266; font-size: 14px; padding: 0 10px;"
+            >
+              {{ passwordVisible ? '隐藏' : '显示' }}
+            </span>
+          </template>
        </el-input>
      </el-form-item>
      <el-form-item prop="tenantId">
+        <p class="label">医疗机构</p>
        <el-select
          v-model="loginForm.tenantId"
          size="large"
-          placeholder="所属医院"
+          placeholder="请选择医疗机构"
          clearable
          filterable
        >
@@ -51,6 +63,11 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item class="login-options">
+        <el-checkbox v-model="loginForm.rememberMe" class="remember-me">记住我</el-checkbox>
+        <el-link type="primary" class="forgot-password" @click="handleForgotPassword">忘记密码？</el-link>
+      </el-form-item>
+      
      <!-- <el-form-item prop="tenantId"> -->
        <!-- <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span> -->
        <!-- <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large"/> -->
@@ -87,8 +104,17 @@
          <router-link class="link-type" :to="'/register'">立即注册</router-link>
        </div>
      </el-form-item>
+      <div class="footer">
+            © 2025 {{ currentTenantName || settings.systemName }} | 版本 v2.5.1
+            <!-- 公司版权信息（新增） -->
+            <div class="company-copyright">
+                技术支持：上海经创贺联信息技术有限公司
+            </div>
+        </div>
    </el-form>
+    
    <!--  底部  -->
+    
    <div class="el-login-footer">
      <div class="el-login-footer-link">
        <span><el-link :underline="false">his账号用户协议</el-link></span>
@@ -109,12 +135,15 @@
 </template>

 <script setup>
+import { getCurrentInstance, ref, reactive, computed, onMounted, watch } from 'vue';
+import settings from '@/settings';
 import { getCodeImg, sign, getUserBindTenantList } from '@/api/login';
 import { invokeYbPlugin } from '@/api/public';
 import Cookies from 'js-cookie';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
 import useUserStore from '@/store/modules/user';
-import logoNew from '@/assets/logo/logoBlack.png';
+import { ElMessage } from 'element-plus';
+import logoNew from '@/assets/logo/LOGO.jpg';
 const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
@@ -131,6 +160,7 @@ const loginForm = ref({
 });

 const tenantOptions = ref([]);
+const currentTenantName = ref('');

 const loginRules = {
  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
@@ -146,6 +176,21 @@ const captchaEnabled = ref(true);
 // 注册开关
 const register = ref(false);
 const redirect = ref(undefined);
+const passwordVisible = ref(false);
+
+function togglePasswordVisibility() {
+  passwordVisible.value = !passwordVisible.value;
+}
+
+// 处理忘记密码功能
+function handleForgotPassword() {
+  // 这里可以添加忘记密码的逻辑，例如跳转到忘记密码页面或显示忘记密码弹窗
+  // 目前先显示一个提示
+  ElMessage({
+    message: '忘记密码功能正在开发中',
+    type: 'info'
+  });
+}

 watch(
  route,
@@ -155,7 +200,7 @@ watch(
  { immediate: true }
 );

-// 页面加载时从 localStorage 获取 invokeYb 的值
+// 页面加载时从 localStorage 获取 invokeYb 的值和从 Cookies 获取记住的登录信息
 onMounted(() => {
  const storedInvokeYb = localStorage.getItem('invokeYb');
  if (storedInvokeYb !== null) {
@@ -164,6 +209,38 @@ onMounted(() => {
    // 如果 localStorage 中没有值，则设置默认值并保存
    localStorage.setItem('invokeYb', 'true');
  }
+  
+  // 从 Cookies 中恢复记住的登录信息
+  const rememberMe = Cookies.get('rememberMe');
+  if (rememberMe && rememberMe === 'true') {
+    const username = Cookies.get('username');
+    const password = Cookies.get('password');
+    if (username) {
+      loginForm.value.username = username;
+      loginForm.value.rememberMe = true;
+      // 解密密码
+      if (password) {
+        try {
+          loginForm.value.password = decrypt(password);
+        } catch (e) {
+          console.error('密码解密失败:', e);
+        }
+      }
+    }
+  }
+  
+  // 获取医疗机构列表
+  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;
+    }
+  });
 });

 function handleLogin() {
@@ -279,6 +356,14 @@ function getCode() {
  });
 }

+// 监听租户选择变化
+watch(() => loginForm.value.tenantId, (newTenantId) => {
+  const selectedTenant = tenantOptions.value.find(item => item.value === newTenantId);
+  if (selectedTenant) {
+    currentTenantName.value = selectedTenant.label;
+  }
+});
+
 // 切换医保连接开关时更新 localStorage
 function topNavChange(value) {
  localStorage.setItem('invokeYb', value.toString());
@@ -303,6 +388,7 @@ function getTenantList(username) {
          label: item.tenantName,
        }));
        loginForm.value.tenantId = tenantOptions.value[0].value; //默认选中第一个
+        currentTenantName.value = tenantOptions.value[0].label;
      }
    }
  });
@@ -389,27 +475,81 @@ getCookie();
 getTenantList(loginForm.value.username);
 </script>

+<style>
+html, body {
+  height: auto;
+  min-height: 100vh;
+  overflow-y: auto;
+  margin: 0;
+  padding: 0;
+}
+</style>
+
 <style lang="scss" scoped>
 .login {
  display: flex;
  justify-content: center;
-  align-items: center;
-  height: 100%;
+  background: #f8f9fa; 
+  min-height: 100vh;
+  padding-bottom: 100px; /* 为底部固定footer留出空间 */
  //background-image: url("../assets/images/login-background.jpg");
  background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
+  margin: 10px auto 15px auto;
  text-align: center;
  color: #000;
  font-family: 'Microsoft Yahei,STHeiti,Simsun,STSong,Helvetica Neue,Helvetica,Arial,sans-serif';
 }
+.label{
+  display: block;
+  margin-bottom: 6px;
+  font-size: 14px;
+  font-weight: 500;
+  color: var(--text);
+}

+.login-options {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 8px 0 10px 0;
+  width: 100%; /* 确保容器占满宽度 */
+}
+
+.remember-me {
+  margin: 0;
+  color: var(--text);
+}
+
+.forgot-password {
+  font-size: 14px;
+  color: var(--primary);
+  cursor: pointer;
+  text-align: right; /* 确保文本右对齐 */
+  margin-left: auto; /* 确保元素右对齐 */
+}
+ .footer {
+            margin-top: 32px;
+            font-size: 12px;
+            color: var(--text-secondary);
+        }
+
+.login-subtitle {
+  font-size: 14px;
+  color: var(--text-secondary);
+  margin-bottom: 20px;
+}
 .login-form {
-  border-radius: 6px;
+  border-radius: 16px;
+  box-shadow: 0 4px 12px var(--shadow);
+  border: 1px solid var(--border);
  background: #ffffff;
-  width: 400px;
+  width: 100%;
+  max-width: 400px;
+  padding: 40px;
  padding: 25px 25px 5px 25px;
+  text-align: center;
  .el-input {
    height: 50px; // 修改输入框高度
    input {
@@ -438,24 +578,20 @@ getTenantList(loginForm.value.username);
  }
 }
 .el-login-top {
-  height: 80px;
-  line-height: 40px;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  text-align: left;
-  color: #000;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-  background-color: #f1f1f1;
-  padding: 20px;
+  text-align: center;
+  margin: 0 auto 10px;
+  .el-image {
+    max-width: 120px;
+    max-height: 120px;
+  }
 }
 .el-login-footer {
-  height: 100px;
-  line-height: 40px;
+  height: 80px;
+  line-height: 30px;
  position: fixed;
  bottom: 0;
+  left: 0;
+  right: 0;
  width: 100%;
  text-align: center;
  color: #000;
@@ -463,8 +599,7 @@ getTenantList(loginForm.value.username);
  font-size: 12px;
  letter-spacing: 1px;
  background-color: #f1f1f1;
-
-  color: #000;
+  z-index: 100; /* 确保footer在最上层 */
  span {
    margin: 0 10px;
  }
@@ -490,6 +625,13 @@ getTenantList(loginForm.value.username);
  width: 24px !important; // 调整图标的宽度
  height: 24px !important; // 调整图标的高度
  font-size: 24px !important; // 调整图标的字体大小
+  color: #606266 !important; // 确保图标颜色可见
+  cursor: pointer !important; // 确保鼠标悬停时显示指针
+}
+
+:deep(.password-toggle) {
+  line-height: 50px !important; // 确保文字垂直居中
+  user-select: none; // 禁止选中文字
 }
 :deep(.el-select__wrapper) {
  background-color: #f5f7fa !important;
@@ -498,4 +640,8 @@ getTenantList(loginForm.value.username);
  font-size: 18px !important;
  height: 50px !important; // 修改输入框高度
 }
+
+:deep(.el-form-item) {
+  margin-bottom: 15px !important; // 减小输入框之间的距离
+}
 </style>
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
@@ -87,23 +87,38 @@ export function getCount(queryParams) {
  })
 }

-// 获取药房列表
+// 获取药房列表（权限过滤）
 export function getPharmacyList() {
  return request({
    url: '/app-common/inventory-pharmacy-list',
-    // '/app-common/pharmacy-list',
    method: 'get',
  })
 }

-// 获取药库列表
+// 获取药库列表（权限过滤）
 export function getDispensaryList() {
  return request({
    url: '/app-common/inventory-cabinet-list',
-    // '/app-common/cabinet-list',
    method: 'get',
  })
 }
+
+// 获取药房列表（不受权限过滤，作为回退）
+export function getPharmacyListAll() {
+  return request({
+    url: '/app-common/pharmacy-list',
+    method: 'get',
+  })
+}
+
+// 获取药库列表（不受权限过滤，作为回退）
+export function getDispensaryListAll() {
+  return request({
+    url: '/app-common/cabinet-list',
+    method: 'get',
+  })
+}
+
 /**
 * 审批驳回
 */
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
@@ -30,7 +30,8 @@
        <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
      </el-col>
    </el-row>
-    <el-button type="primary" plain icon="Printer" @click="handlePrint"> 打印单据 </el-button>
+    <el-button type="primary" icon="View" @click="handlePrintPreview"> 预览单据 </el-button>
+    <el-button type="success" plain icon="Printer" @click="handlePrint"> 打印单据 </el-button>
    <el-form
      :model="receiptHeaderForm"
      ref="receiptHeaderRef"
@@ -635,6 +636,8 @@ import {
  getInitBusNo,
  purchaseInventoryApproved,
  reject,
+  getPharmacyListAll,
+  getDispensaryListAll,
 } from './components/api';
 const route = useRoute();
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
@@ -643,6 +646,7 @@ import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 import { formatDate, formatDateymd } from '@/utils/index';
 import { useStore } from '@/store/store';
 import useUserStore from '@/store/modules/user';
+import { ElMessage } from 'element-plus';
 import { nextTick, ref, watch } from 'vue';
 import useTagsViewStore from '@/store/modules/tagsView';
 import _, { isEqual } from 'lodash';
@@ -821,7 +825,8 @@ function addNewRow() {
        remake: '',
        supplierId: '',
        purposeTypeEnum: '',
-        purposeLocationId: null,
+        // 使用表头的仓库作为新增行默认值，减少重复选择
+        purposeLocationId: receiptHeaderForm.purposeLocationId || null,
        purposeLocationStoreId: null,
        practitionerId: '',
        traceNo: '',
@@ -1124,11 +1129,25 @@ function changeValEnd(val, index) {
 function handleChangeLocationType(value) {
  if (value == 16) {
    getPharmacyList().then((res) => {
-      locationList.value = res.data;
+      const list = res?.data || [];
+      if (!list.length) {
+        getPharmacyListAll().then((res2) => {
+          locationList.value = res2?.data || [];
+        });
+      } else {
+        locationList.value = list;
+      }
    });
  } else if (value == 11) {
    getDispensaryList().then((res) => {
-      locationList.value = res.data;
+      const list = res?.data || [];
+      if (!list.length) {
+        getDispensaryListAll().then((res2) => {
+          locationList.value = res2?.data || [];
+        });
+      } else {
+        locationList.value = list;
+      }
    });
  }
 }
@@ -1303,27 +1322,193 @@ function handleSelectionChange(selection) {
  multiple.value = !selection.length;
 }

-function handlePrint() {
-  const result = [];
-  let supplierName = supplierListOptions.value.filter((item) => {
+// 预览单据函数 - 简化实现，避免复杂嵌套数据结构
+function handlePrintPreview() {
+  console.log('开始执行预览功能');
+  
+  // 检查是否存在数据
+  if (!form.purchaseinventoryList || form.purchaseinventoryList.length === 0) {
+    ElMessage.warning('没有数据可预览');
+    return;
+  }
+  
+  // 检查是否所有必填字段都已填写
+  const hasEmptyFields = form.purchaseinventoryList.some(row => {
+    return !row.name || !row.itemQuantity || !row.price || !row.totalPrice;
+  });
+  
+  if (hasEmptyFields) {
+    ElMessage.warning('请确保所有药品信息完整后再预览');
+    return;
+  }
+  
+  // 检查templateJson是否已正确导入
+  if (!templateJson) {
+    console.error('错误：templateJson未定义，请检查导入');
+    ElMessage.error('打印模板未加载，请刷新页面重试');
+    return;
+  }
+  
+  // 安全获取供应商名称
+  let supplierName = '';
+  if (supplierListOptions.value && receiptHeaderForm.supplierId) {
+    const filteredSuppliers = supplierListOptions.value.filter((item) => {
      return item.value == receiptHeaderForm.supplierId;
-  })[0].label;
+    });
+    supplierName = filteredSuppliers.length > 0 ? filteredSuppliers[0].label : '';
+  }
+  
+  // 计算总金额
  const totalAmount = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
    return accumulator + (Number(currentRow.totalPrice) || 0);
  }, 0);
-  result.push({
-    supplierName: supplierName,
+  
+  // 重新构建包含药品清单的数据结构
+  const simpleData = {
+    supplierName: supplierName || '',
    totalAmount: totalAmount.toFixed(2),
-    ...receiptHeaderForm,
-    purchaseinventoryList: form.purchaseinventoryList,
+    receiptNumber: receiptHeaderForm.receiptNumber || '',
+    receiptDate: receiptHeaderForm.receiptDate || '',
+    organizationName: receiptHeaderForm.organizationName || '',
+    // 重新添加药品清单数组，但确保格式安全
+    purchaseinventoryList: Array.isArray(form.purchaseinventoryList) ? form.purchaseinventoryList.map(item => ({
+      id: item.id || '',
+      name: item.name || '',
+      itemQuantity: item.itemQuantity || 0,
+      price: item.price || 0,
+      totalPrice: item.totalPrice || 0,
+      // 保留其他可能需要的字段
+      ...item
+    })) : []
+  };
+  
+  console.log('简化后的预览数据:', simpleData);
+  
+  try {
+    // 直接使用templateJson创建打印
+    // 避免复杂的模板创建和数据处理逻辑
+    setTimeout(() => {
+      try {
+        // 最简单的方式使用hiprint - 直接调用print2方法
+        // 只传递必要的数据，不传递复杂嵌套的数组
+        const printOptions = {
+          preview: true,
+          title: '药品采购入库清单',
+          printer: ''
+        };
+        
+        // 方法1: 尝试直接使用templateJson
+        console.log('尝试直接使用templateJson');
+        if (typeof hiprint.template !== 'undefined' && typeof hiprint.template.print === 'function') {
+          hiprint.template.print(templateJson, simpleData, printOptions);
+        }
+        // 方法2: 尝试创建简单模板
+        else if (typeof hiprint.PrintTemplate === 'function') {
+          console.log('尝试使用PrintTemplate');
+          const template = new hiprint.PrintTemplate({template: templateJson});
+          template.print(simpleData, printOptions);
+        }
+        // 方法3: 最直接的方式
+        else {
+          console.log('尝试最直接的打印方式');
+          hiprint.print(templateJson, simpleData, printOptions);
+        }
+        
+        ElMessage.success('正在生成单据预览，请等待...');
+      } catch (e) {
+        console.error('预览执行失败:', e);
+        ElMessage.error('预览功能执行失败，请稍后重试');
+      }
+    }, 50);
+  } catch (error) {
+    console.error('预览准备失败:', error);
+    ElMessage.error('预览失败，请检查配置');
+  }
+}
+
+// 打印单据函数 - 简化实现，与预览函数保持一致
+function handlePrint() {
+  // 检查是否存在数据
+  if (!form.purchaseinventoryList || form.purchaseinventoryList.length === 0) {
+    ElMessage.warning('没有数据可打印');
+    return;
+  }
+  
+  // 检查是否所有必填字段都已填写
+  const hasEmptyFields = form.purchaseinventoryList.some(row => {
+    return !row.name || !row.itemQuantity || !row.price || !row.totalPrice;
  });
-  console.log(result, '345678987654');
-  const printElements = templateJson;
-  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
-  hiprintTemplate.print2(result, {
-    printer: 'EPSON LQ-80KFII',
-    title: '打印标题',
-  }); //开始打印
+  
+  if (hasEmptyFields) {
+    ElMessage.warning('请确保所有药品信息完整后再打印');
+    return;
+  }
+  
+  // 安全获取供应商名称
+  let supplierName = '';
+  if (supplierListOptions.value && receiptHeaderForm.supplierId) {
+    const filteredSuppliers = supplierListOptions.value.filter((item) => {
+      return item.value == receiptHeaderForm.supplierId;
+    });
+    supplierName = filteredSuppliers.length > 0 ? filteredSuppliers[0].label : '';
+  }
+  
+  // 计算总金额
+  const totalAmount = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
+  
+  // 重新构建包含药品清单的数据结构
+  const simpleData = {
+    supplierName: supplierName || '',
+    totalAmount: totalAmount.toFixed(2),
+    receiptNumber: receiptHeaderForm.receiptNumber || '',
+    receiptDate: receiptHeaderForm.receiptDate || '',
+    organizationName: receiptHeaderForm.organizationName || '',
+    // 重新添加药品清单数组，但确保格式安全
+    purchaseinventoryList: Array.isArray(form.purchaseinventoryList) ? form.purchaseinventoryList.map(item => ({
+      id: item.id || '',
+      name: item.name || '',
+      itemQuantity: item.itemQuantity || 0,
+      price: item.price || 0,
+      totalPrice: item.totalPrice || 0,
+      // 保留其他可能需要的字段
+      ...item
+    })) : []
+  };
+  
+  try {
+    // 使用与预览函数相同的简化打印逻辑
+    setTimeout(() => {
+      try {
+        const printOptions = {
+          preview: false, // 直接打印模式
+          title: '药品采购入库清单',
+          printer: ''
+        };
+        
+        // 尝试多种可能的API调用方式
+        if (typeof hiprint.template !== 'undefined' && typeof hiprint.template.print === 'function') {
+          hiprint.template.print(templateJson, simpleData, printOptions);
+        }
+        else if (typeof hiprint.PrintTemplate === 'function') {
+          const template = new hiprint.PrintTemplate({template: templateJson});
+          template.print(simpleData, printOptions);
+        }
+        else {
+          hiprint.print(templateJson, simpleData, printOptions);
+        }
+        
+        ElMessage.success('打印请求已发送');
+      } catch (e) {
+        console.error('打印执行失败:', e);
+        ElMessage.error('打印执行失败，请稍后重试');
+      }
+    }, 50);
+  } catch (error) {
+    console.error('打印失败:', error);
+    ElMessage.error('打印失败，请检查配置');
+  }
 }

 function deleteSelectedRows() {
@@ -1406,7 +1591,9 @@ function show() {
  visible.value = true;
  getPurchaseinventoryTypeList();
  getInitBusNo().then((res) => {
+    if (res.data && res.data.busNo) {
      receiptHeaderForm.busNo = res.data.busNo;
+    }  
  });
  // supplierListOptions.value = props.supplierListOptions;
  // itemTypeOptions.value = props.itemTypeOptions;
@@ -1428,9 +1615,15 @@ function edit() {
  // itemTypeOptions.value = props.itemTypeOptions;
  // practitionerListOptions.value = props.practitionerListOptions;
  // receiptHeaderForm.busNo = props.busNoAdd;
+    // 确保数据存在
+  if (!editData.value.item || editData.value.item.length === 0) {
+    proxy.$message.warning('没有可编辑的数据');
+    return;
+  }
  receiptHeaderForm.value = editData.value.item.length > 0 ? editData.value.item[0] : {};
  receiptHeaderForm.busNo = editData.value.editRow.supplyBusNo;
-  receiptHeaderForm.supplierId = editData.value.editRow.supplierId;
+  // 修改这里：优先从详情数据中获取供应商ID，如果不存在则从列表数据中获取
+  receiptHeaderForm.supplierId = (editData.value.item[0] && editData.value.item[0].supplierId) || editData.value.editRow.supplierId;
  receiptHeaderForm.practitionerId = editData.value.editRow.practitionerId;
  console.log(editData.value.editRow, editData.value, 'editData.value.editRow');
  receiptHeaderForm.occurrenceTime = editData.value.item[0].occurrenceTime
@@ -1463,6 +1656,10 @@ function edit() {
        volume: item.totalVolume,
        manufacturer: item.supplierName,
        quantity: item.totalQuantity,
+        // 确保仓库字段回显
+        purposeLocationId: item.purposeLocationId || editData.value.editRow?.purposeLocationId || null,
+        locationStoreName: item.locationStoreName || '',
+        purposeLocationStoreId: item.purposeLocationStoreId || null,
        // locationInventoryList: locationList.value,
        startTime: formatDateymd(item.startTime),
        endTime: formatDateymd(item.endTime),
@@ -1475,6 +1672,27 @@ function edit() {
  console.log(form.purchaseinventoryList, 'purchaseinventoryList.value');
  console.log(receiptHeaderForm, 'receiptHeaderForm');
  loading.value = false;
+  // 使用 Promise 确保数据加载完成
+  Promise.resolve().then(() => {
+    form.purchaseinventoryList = editData.value.item.map((item) => {
+      return {
+        ...item,
+        name: item.itemName,
+        volume: item.totalVolume,
+        manufacturer: item.supplierName,
+        quantity: item.totalQuantity,
+        // 仓库字段回显（Promise 阶段再保障一次）
+        purposeLocationId: item.purposeLocationId || editData.value.editRow?.purposeLocationId || null,
+        locationStoreName: item.locationStoreName || '',
+        purposeLocationStoreId: item.purposeLocationStoreId || null,
+        startTime: formatDateymd(item.startTime),
+        endTime: formatDateymd(item.endTime),
+        applyTime: formatDate(item.applyTime),
+        isSave: true,
+      };
+    });
+  });
+
 }

 function getPurchaseinventoryTypeList() {
@@ -1485,7 +1703,7 @@ function getPurchaseinventoryTypeList() {
  });
 }

-// 驳回
+// reject
 function handleReject() {
  reject(route.query.supplyBusNo).then((res) => {
    if (res.code == 200) {
--- a/openhis-ui-vue3/src/views/system/tenant/setUser.vue
+++ b/openhis-ui-vue3/src/views/system/tenant/setUser.vue
@@ -69,7 +69,11 @@ import bindUser from "./bindUser";
 import { getTenantUserPage, unbindTenantUser } from "@/api/system/tenant";
 // 在 <script setup> 顶部添加导入
 import { ref, reactive, onMounted } from "vue"; // 补充 onMounted 导入
+import { useRoute, useRouter } from "vue-router"; // 添加 useRouter 导入
+
 const route = useRoute();
+const router = useRouter(); // 创建 router 实例
+
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");

@@ -100,8 +104,14 @@ function getList() {
 }
 // 返回按钮
 function handleClose() {
-   const obj = { path: "/system/basicmanage/tenant" };
-   proxy.$tab.closeOpenPage(obj);
+   /* const obj = { path: "/system/basicmanage/tenant" };
+   proxy.$tab.closeOpenPage(obj); 目前先注释掉改成返回上一级页面*/
+   // 先关闭当前标签页
+   const obj={ path: "/system/basicmanage/tenant" };
+   proxy.$tab.closeOpenPage(route).then(() => {
+      // 然后返回上一个页面 
+      router.go(-1);
+   });
 }
 /** 搜索按钮操作 */
 function handleQuery() {
--- a/openhis-ui-vue3/vite.config.js
+++ b/openhis-ui-vue3/vite.config.js
@@ -52,6 +52,11 @@ export default defineConfig (({mode, command}) => {
          target: 'http://localhost:5000',
          changeOrigin: true,
          rewrite: p => p.replace (/^\/ybplugin/, ''),
+        },
+        '/prod-api': {
+         target: 'http://localhost:18080/openhis',
+          changeOrigin: true,
+          rewrite: p => p.replace (/^\/prod-api/, ''),
        }
      },
    },
Author	SHA1	Message	Date
叶锦涛	85e185bab8	修复了全选框	2025-10-31 16:35:47 +08:00
叶锦涛	88aa1517ef	Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his into develop	2025-10-31 16:32:53 +08:00
叶锦涛	c05118c427	修复了全选框	2025-10-31 16:32:13 +08:00
Auora	2a7f1326b9	[bug]修改就诊时，就诊时间逻辑	2025-10-31 16:23:12 +08:00
叶锦涛	c07255fe5b	修改了登入界面的xxx医院信息管理系统	2025-10-31 16:13:53 +08:00
叶锦涛	749bfc89dd	修复了打印单据没有响应的错误，修复了新增加诊断诊断类别自动获取11的错误	2025-10-31 16:06:12 +08:00
suizihe	52cc5e3aae	实现采购入库的供货商字段数据存放到数据库，并且系统在采购入库界面能读取对应的采购入库单的对应供货商名称显示	2025-10-31 13:52:33 +08:00
wzk	642c4a0941	Merge remote-tracking branch 'origin/develop' into develop	2025-10-31 12:38:34 +08:00
wzk	30953d5771	开立医嘱的执行科室默认获取诊疗项目维护的所属科室	2025-10-31 12:38:22 +08:00
wzk	83e0c663c9	在开立好的医嘱名称前增加医嘱类别的显示	2025-10-31 12:32:41 +08:00
suizihe	b19337e76a	修复初诊和就诊的bug	2025-10-31 12:30:11 +08:00
suizihe	ba607346bd	修复初诊和就诊的bug	2025-10-31 11:05:40 +08:00
Auora	433c452a40	解决库房/药房管理，操作编辑弹窗问题	2025-10-31 10:08:59 +08:00
Auora	a1be7fdbfd	[bug]修改仓库字段下拉别表无内容bug	2025-10-31 09:01:35 +08:00
叶锦涛	87409d0c93	修复了药房/库房的删除的报错	2025-10-30 15:38:51 +08:00
suizihe	d5c8ae8d45	修复初诊和就诊的bug	2025-10-30 15:28:05 +08:00
suizihe	bc45e9c8c6	首页页面优化	2025-10-30 11:14:25 +08:00
Auora	42992382c0	增加isFoodDiseasesNew 函数	2025-10-30 10:43:54 +08:00
Auora	22d7eba510	增加getEmrDetail 函数	2025-10-30 09:56:41 +08:00
suizihe	9728c8a6dd	优化格式问题	2025-10-30 09:45:50 +08:00
suizihe	c951144ac6	首页页面进行了初步优化	2025-10-30 09:15:27 +08:00
叶锦涛	0b179fffd6	诊断排序	2025-10-29 16:50:39 +08:00
Auora	75374ac5d3	更改.env.production	2025-10-29 15:15:26 +08:00
Auora	2a83719b87	更改prod配置	2025-10-29 14:54:55 +08:00
Auora	e58f2d807b	更改prod配置	2025-10-29 14:03:43 +08:00
Auora	b2884def17	Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his into develop # Conflicts: # openhis-ui-vue3/.env.spug	2025-10-29 13:53:14 +08:00
Auora	064840dd42	删除VITE_OUT_DIR=dist-spug	2025-10-29 13:52:22 +08:00
wangjunping	1aa814c766	更新 openhis-ui-vue3/.env.spug 删除VITE_OUT_DIR=dist-spug	2025-10-29 05:49:44 +00:00
Auora	b9719a51d1	增加build:spug	2025-10-29 13:46:48 +08:00
Auora	03b83aaf7c	增加VITE_APP_ENV = 'spug'	2025-10-29 13:30:25 +08:00
Auora	d93976483b	增加VITE_APP_BASE_API = '/admin-api'	2025-10-29 13:28:13 +08:00
suizihe	dd0a3a915c	身份证号改为不是必须项只有输入身份证号的时候才会校验格式问题	2025-10-29 09:47:32 +08:00
suizihe	2f3994c575	身份证号改为不是必须项只有输入身份证号的时候才会校验格式问题	2025-10-29 09:43:54 +08:00
wzk	daa78e128f	修复医嘱请选择项目选完选项框不消失	2025-10-29 09:40:55 +08:00
wzk	2ca594cb39	Merge remote-tracking branch 'origin/develop' into develop	2025-10-29 09:36:01 +08:00
Auora	7805c26f4a	Merge remote-tracking branch 'origin/develop' into develop	2025-10-29 09:33:01 +08:00
Auora	b7d34537c2	修改login	2025-10-29 09:32:29 +08:00
wzk	c1213fcf59	Revert "修复医嘱请选择项目选完选项框不消失" This reverts commit `4afe0d107c`.	2025-10-29 09:21:55 +08:00
wzk	a64edace55	Merge remote-tracking branch 'origin/develop' into develop	2025-10-29 09:04:25 +08:00
wzk	4afe0d107c	修复医嘱请选择项目选完选项框不消失	2025-10-29 09:04:01 +08:00
Auora	d8af11412f	修改格式	2025-10-29 08:55:14 +08:00
Auora	00816c9834	修改位置：applicationFormBottomBtn.vue 中的 import 语句。	2025-10-28 17:28:25 +08:00
Auora	4fb7bea80a	修改位置：prescriptionlist.vue 中的 import 语句	2025-10-28 17:21:20 +08:00
Auora	0fc72cb270	修改位置：prescriptionlist.vue 中的 import 语句	2025-10-28 17:14:23 +08:00
Auora	eadf521903	Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his into develop	2025-10-28 17:04:08 +08:00
wangjunping	f786fdbc3f	更新 openhis-ui-vue3/.env.spug 删除NODE_ENV=spug	2025-10-28 09:03:17 +00:00
wangjunping	92c4c938a3	更新 openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue	2025-10-28 08:57:06 +00:00
Auora	a94a1b7b69	Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his into develop	2025-10-28 16:34:06 +08:00
Auora	48755c2d9e	删掉多余逗号	2025-10-28 16:32:42 +08:00
叶锦涛	f99f8eb560	系统登入界面的设计	2025-10-28 16:27:42 +08:00
Auora	ddc7ce2fe7	spug测试	2025-10-28 15:56:24 +08:00
Auora	c9899c62d2	Merge branch 'develop' of https://gitea.gentronhealth.com/wangjunping/his	2025-10-28 15:55:04 +08:00
wzk	8b9837d7dc	Merge remote-tracking branch 'origin/develop' into develop	2025-10-28 13:35:22 +08:00
wzk	2cba41331a	诊断类别:字典管理中找不到对应的字典数据，字典类别在显示出来的数据和医生开立诊断的数据不一致。	2025-10-28 13:34:56 +08:00
suizihe	4da5ca427b	在租户管理-》所属用户界面的关闭按钮改为关闭当前的界面，并返回上一级界面，	2025-10-28 13:33:50 +08:00
wzk	f4605b1af7	下拉列表的刷选功能失效，按照下拉选中的医嘱类型能过滤出对应收费项目医生进行开单	2025-10-27 15:08:28 +08:00
叶锦涛	d2babdc9ed	修复已保存病例模板无数据的显示的问题	2025-10-27 14:02:01 +08:00
suizihe	4d0599eac1	将历史病例中对病例选择的bug修复，现在是单选选中	2025-10-27 13:22:25 +08:00
Auora	35d99df274	test	2025-10-24 17:17:31 +08:00