diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index 108c14986..333244653 100755 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -112,7 +112,7 @@ public class MedicationRequest extends HisBaseEntity { private String supportInfo; /** 退回原因 */ - private String backReason; + private String backReason = ""; /** 请求开始时间 */ private Date reqAuthoredTime; diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue index 433274ec8..d6bcd4e3a 100755 --- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue @@ -115,7 +115,6 @@ v-model="form.categoryCode" clearable filterable - :disabled="form.isEditInfoDisable === 1" no-data-text="" > @@ -404,7 +400,6 @@ controls-position="right" :min="1" :max="999" - :disabled="form.isEditInfoDisable === 1" @change="calculateTotalPrice" /> @@ -605,8 +600,6 @@ function calculateTotalPrice() { ); if (hasValidItem) { form.value.retailPrice = parseFloat(totalPrice.value) || 0; - } else { - form.value.retailPrice = undefined; } } catch (error) { totalPrice.value = '0.00';