Merge branch 'operation_details' into 'development'

fix merge conflict

See merge request Cloud_Solution/doctor_app_flutter!871
merge-requests/872/merge
Mohammad Aljammal 4 years ago
commit 45822d16d1

@ -12,7 +12,6 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/operation_report/create_update_operation_report_request_model.dart';
import 'package:doctor_app_flutter/models/operation_report/get_operation_report_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/progress_note_request.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
@ -35,7 +34,6 @@ import 'package:speech_to_text/speech_to_text.dart' as stt;
import 'CustomEditableText.dart';
class RegisterConfirmationPatientPage extends StatefulWidget {
final GetOperationReportModel operationReport;
final OperationReportViewModel operationReportViewModel;
final PatiantInformtion patient;
final int visitType;
@ -46,8 +44,7 @@ class RegisterConfirmationPatientPage extends StatefulWidget {
this.operationReportViewModel,
this.patient,
this.visitType,
this.isUpdate,
this.operationReport})
this.isUpdate})
: super(key: key);
@override

Loading…
Cancel
Save