From 5bf7ab481fb5d89d1d20fbe85bf2a1af5d4c8939 Mon Sep 17 00:00:00 2001
From: suizihe <2958847195@qq.com>
Date: Tue, 18 Nov 2025 10:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=8D=AF=E5=93=81tab?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AF=E4=BB=A5=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=86=20=20=E6=96=B0=E5=A2=9E=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E5=8B=BE=E9=80=89=E6=A1=86=E8=BF=98=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/core/generator/controller/GenController.java  |  1 +
 .../catalog/medicine/components/medicineDialog.vue    | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java b/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
index f6901406..ec82bf3a 100644
--- a/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
+++ b/openhis-server-new/core-generator/src/main/java/com/core/generator/controller/GenController.java
@@ -58,6 +58,7 @@ public class GenController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo genList(GenTable genTable) {
         startPage();
+
         List<GenTable> list = genTableService.selectGenTableList(genTable);
         return getDataTable(list);
     }
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
index ecc9f97c..e99fb660 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -854,8 +854,10 @@ function edit() {
   statusRestrictedOptions.value = props.statusRestrictedOptions;
   partAttributeEnumOptions.value = props.partAttributeEnumOptions;
   tempOrderSplitPropertyOptions.value = props.tempOrderSplitPropertyOptions;
-  antibioticForm.value.antibioticCode = form.value.antibioticCode;
-  antibioticForm.value.restrictedEnum = form.value.restrictedEnum;
+  // 当后端返回null或'3'时，设置为undefined使select显示为空
+  antibioticForm.value.antibioticCode = form.value.antibioticCode === null || form.value.antibioticCode === '3' ? undefined : form.value.antibioticCode;
+  // 当后端返回null、'4'或4时，设置为undefined使select显示为空
+  antibioticForm.value.restrictedEnum = form.value.restrictedEnum === null || form.value.restrictedEnum === '4' || form.value.restrictedEnum === 4 ? undefined : form.value.restrictedEnum;
   antibioticForm.value.dose = form.value.dose;
   antibioticForm.value.maxUnit = form.value.maxUnit;
   antibioticForm.value.minRateCode = form.value.maxRateCode;
@@ -970,8 +972,9 @@ function submitForm() {
   proxy.$refs['medicationRef'].validate((valid) => {
     if (valid) {
       if (form.value.activeFlag == true) {
-        form.value.antibioticCode = antibioticForm.value.antibioticCode;
-        form.value.restrictedEnum = antibioticForm.value.restrictedEnum;
+        // 当用户清空选择时，抗生素分类设置为'3'，权限级别设置为'4'
+        form.value.antibioticCode = antibioticForm.value.antibioticCode === undefined ? '3' : antibioticForm.value.antibioticCode;
+        form.value.restrictedEnum = antibioticForm.value.restrictedEnum === undefined ? '4' : antibioticForm.value.restrictedEnum;
         // form.value.dose = antibioticForm.value.dose;
         // form.value.maxUnit = antibioticForm.value.maxUnit;
         form.value.minRateCode = antibioticForm.value.minRateCode;