From 04583d8c42b6b9b1dd5fc50933df7f53e4b59be7 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 27 Oct 2021 16:26:59 +0300 Subject: [PATCH] finish operation details report --- .../get_operation_details_response_modle.dart | 20 +++++++++---------- .../update_operation_report.dart | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/models/operation_report/get_operation_details_response_modle.dart b/lib/models/operation_report/get_operation_details_response_modle.dart index 689f0ec1..04540ea6 100644 --- a/lib/models/operation_report/get_operation_details_response_modle.dart +++ b/lib/models/operation_report/get_operation_details_response_modle.dart @@ -4,7 +4,7 @@ class GetOperationDetailsResponseModel { int reservationNo; int patientID; int admissionID; - Null surgeryDate; + dynamic surgeryDate; String preOpDiagnosis; String postOpDiagnosis; String surgeon; @@ -18,21 +18,21 @@ class GetOperationDetailsResponseModel { bool isActive; int createdBy; String createdName; - Null createdNameN; + dynamic createdNameN; String createdOn; - Null editedBy; - Null editedByName; - Null editedByNameN; - Null editedOn; - Null oRBookStatus; + dynamic editedBy; + dynamic editedByName; + dynamic editedByNameN; + dynamic editedOn; + dynamic oRBookStatus; String complicationDetail; String bloodLossDetail; String histopathSpecimen; String microbiologySpecimen; String otherSpecimen; - Null scrubNurse; - Null circulatingNurse; - Null bloodTransfusedDetail; + dynamic scrubNurse; + dynamic circulatingNurse; + dynamic bloodTransfusedDetail; GetOperationDetailsResponseModel( {this.setupID, diff --git a/lib/screens/patients/profile/operation_report/update_operation_report.dart b/lib/screens/patients/profile/operation_report/update_operation_report.dart index ff924dd2..0800bc16 100644 --- a/lib/screens/patients/profile/operation_report/update_operation_report.dart +++ b/lib/screens/patients/profile/operation_report/update_operation_report.dart @@ -530,7 +530,7 @@ class _UpdateOperationReportState extends State { ), ), ), - bottomSheet: model.state == ViewState.Idle?Container(height: 0,): Container( + bottomSheet: model.state != ViewState.Idle?Container(height: 0,): Container( height: 70, margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), child: Column( @@ -593,7 +593,7 @@ class _UpdateOperationReportState extends State { int.parse(widget.patient.admissionNo), createdBy: model .doctorProfile.doctorID, - setupID: SETUP_ID); + setupID: "010266"); await model .updateOperationReport( createUpdateOperationReportRequestModel);