fix merge issue

lib/core/service/patient/PatientRegisterService.dart

@@ -1,5 +0,0 @@
-import 'package:doctor_app_flutter/core/service/base/base_service.dart';
-
-class PatientRegisterService extends BaseService{
-
-}

lib/core/viewModel/PatientRegisterViewModel.dart

@@ -1,8 +0,0 @@
-import 'package:doctor_app_flutter/core/service/patient/PatientRegisterService.dart';
-import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
-
-import '../../locator.dart';
-
-class PatientRegisterViewModel extends BaseViewModel {
-  PatientRegisterService _service = locator<PatientRegisterService>();
-}

lib/locator.dart

@@ -26,7 +26,6 @@ import 'core/service/patient/DischargedPatientService.dart';
 import 'core/service/patient/LiveCarePatientServices.dart';
 import 'core/service/patient/MyReferralPatientService.dart';
 import 'core/service/patient/PatientMuseService.dart';
-import 'core/service/patient/PatientRegisterService.dart';
 import 'core/service/patient/ReferralService.dart';
 import 'core/service/patient/out_patient_service.dart';
 import 'core/service/patient/patient-doctor-referral-service.dart';
@@ -54,7 +53,6 @@ import 'core/viewModel/LiveCarePatientViewModel.dart';
 import 'core/viewModel/PatientMedicalReportViewModel.dart';
 import 'core/viewModel/PatientMuseViewModel.dart';
 import 'core/viewModel/PatientRegistrationViewModel.dart';
-import 'core/viewModel/PatientRegisterViewModel.dart';
 import 'core/viewModel/PatientSearchViewModel.dart';
 import 'core/viewModel/SOAP_view_model.dart';
 import 'core/viewModel/doctor_replay_view_model.dart';
@@ -110,7 +108,6 @@ void setupLocator() {
   locator.registerLazySingleton(() => AnalyticsService());
   locator.registerLazySingleton(() => OperationReportService());
   locator.registerLazySingleton(() => PendingOrderService());
-  locator.registerLazySingleton(() => PatientRegisterService());
   locator.registerLazySingleton(() => PatientRegistrationService());
 
   /// View Model
@@ -143,5 +140,5 @@ void setupLocator() {
   locator.registerFactory(() => OperationReportViewModel());
   locator.registerFactory(() => PatientRegistrationViewModel());
   locator.registerFactory(() => PendingOrdersViewModel());
-  locator.registerFactory(() => PatientRegisterViewModel());
+
 }

lib/screens/patients/register_patient/RegisterPatientPage.dart

@@ -1,6 +1,5 @@
-import 'package:doctor_app_flutter/core/viewModel/PatientRegisterViewModel.dart';
+import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/screens/patients/In_patient/InPatientHeader.dart';
 import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/UCAF/page-stepper-widget.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@@ -53,7 +52,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
   Widget build(BuildContext context) {
     final screenSize = MediaQuery.of(context).size;
 
-    return BaseView<PatientRegisterViewModel>(
+    return BaseView<PatientRegistrationViewModel>(
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
         isShowAppBar: true,
@@ -116,7 +115,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
     );
   }
 
-  Widget pagerButtons(PatientRegisterViewModel model) {
+  Widget pagerButtons(PatientRegistrationViewModel model) {
     switch (_currentIndex) {
       case 2:
         return Container(

lib/screens/patients/register_patient/RegisterSearchPatientPage.dart

@@ -1,14 +1,15 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
-import 'package:doctor_app_flutter/core/viewModel/PatientRegisterViewModel.dart';
+import 'package:doctor_app_flutter/core/model/PatientRegistration/PatientRegistrationModel.dart';
+import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
+
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
-import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
+
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
-import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
+
 import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
 import 'package:flutter/material.dart';
 
@@ -37,7 +38,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
   Widget build(BuildContext context) {
     final screenSize = MediaQuery.of(context).size;
 
-    return BaseView<PatientRegisterViewModel>(
+    return BaseView<PatientRegistrationViewModel>(
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
         isShowAppBar: false,