diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 864826f..efafafe 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -681,6 +681,7 @@ export default { //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName") // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo if (e.patientNo) e.patientNo = "'" + e.patientNo + if (e.idNo) e.idNo = "'" + e.idNo if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) { e.groupPack = e.medicalPackageName // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName") } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) { diff --git a/src/views/customerReport/positiveResultsList.vue b/src/views/customerReport/positiveResultsList.vue index bf34d30..72e792a 100644 --- a/src/views/customerReport/positiveResultsList.vue +++ b/src/views/customerReport/positiveResultsList.vue @@ -179,20 +179,31 @@ :summary-method="getSummaris" > - + + > + + - + + diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index b7502e6..75072c3 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -432,25 +432,32 @@ - + + - + + + - + + + - + + +
@@ -471,6 +478,7 @@ +