diff --git a/lib/core/model/labs/request_send_lab_report_email.dart b/lib/core/model/labs/request_send_lab_report_email.dart index a849da73..2fae6e0c 100644 --- a/lib/core/model/labs/request_send_lab_report_email.dart +++ b/lib/core/model/labs/request_send_lab_report_email.dart @@ -26,6 +26,7 @@ class RequestSendLabReportEmail { String orderDate; String orderNo; bool isDownload; + int doctorID; RequestSendLabReportEmail( {this.versionID, @@ -54,7 +55,8 @@ class RequestSendLabReportEmail { this.invoiceNo, this.orderDate, this.orderNo, - this.isDownload}); + this.isDownload, + this.doctorID}); RequestSendLabReportEmail.fromJson(Map json) { versionID = json['VersionID']; @@ -84,6 +86,7 @@ class RequestSendLabReportEmail { orderDate = json['OrderDate']; orderNo = json['OrderNo']; isDownload = json['IsDownload']; + doctorID = json['DoctorID']; } Map toJson() { @@ -115,6 +118,7 @@ class RequestSendLabReportEmail { data['OrderDate'] = this.orderDate; data['OrderNo'] = this.orderNo; data['IsDownload'] = this.isDownload; + data['DoctorID'] = this.doctorID; return data; } } diff --git a/lib/core/service/medical/labs_service.dart b/lib/core/service/medical/labs_service.dart index 06115173..1bc12af3 100644 --- a/lib/core/service/medical/labs_service.dart +++ b/lib/core/service/medical/labs_service.dart @@ -209,6 +209,7 @@ class LabsService extends BaseService { _requestSendLabReportEmail.setupID = patientLabOrder.setupID; _requestSendLabReportEmail.orderNo = patientLabOrder.orderNo; _requestSendLabReportEmail.isDownload = isDownload; + _requestSendLabReportEmail.doctorID = patientLabOrder.doctorID; await baseAppClient.post(SEND_LAB_RESULT_EMAIL, onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart index 263d7d32..e250a85c 100644 --- a/lib/core/viewModels/medical/labs_view_model.dart +++ b/lib/core/viewModels/medical/labs_view_model.dart @@ -136,7 +136,7 @@ class LabsViewModel extends BaseViewModel { } sendLabReportEmail({PatientLabOrders patientLabOrder, String mes, AuthenticatedUser userObj, bool isDownload = false}) async { - await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder, userObj: userObj); + await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder, userObj: userObj, isDownload: true); if (_labsService.hasError) { error = _labsService.error; } else diff --git a/lib/pages/medical/labs/laboratory_result_page.dart b/lib/pages/medical/labs/laboratory_result_page.dart index 574c407f..9ef18fb3 100644 --- a/lib/pages/medical/labs/laboratory_result_page.dart +++ b/lib/pages/medical/labs/laboratory_result_page.dart @@ -59,12 +59,15 @@ class _LaboratoryResultPageState extends State { ), itemCount: 1, ), + SizedBox( + height: 120.0, + ) ], ), ), bottomSheet: Container( color: Colors.white, - height: MediaQuery.of(context).size.height * 0.08, + height: MediaQuery.of(context).size.height * 0.081, width: double.infinity, padding: EdgeInsets.all(12.0), child: Column(