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 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;