marge with master

lib/providers/patients_provider.dart

@@ -39,7 +39,7 @@ class PatientsProvider with ChangeNotifier {
   var insuranceApporvalsList = [];
 
   Client client =
-      HttpClientWithInterceptor.build(interceptors: [HttpInterceptor()]);
+  HttpClientWithInterceptor.build(interceptors: [HttpInterceptor()]);
 
   PatiantInformtion _selectedPatient;
 
@@ -214,7 +214,7 @@ class PatientsProvider with ChangeNotifier {
     try {
       if (await Helpers.checkConnection()) {
         final response =
-            await AppClient.post(GET_PRESCRIPTION, body: json.encode(patient));
+        await AppClient.post(GET_PRESCRIPTION, body: json.encode(patient));
         final int statusCode = response.statusCode;
         isLoading = false;
 
@@ -273,7 +273,7 @@ class PatientsProvider with ChangeNotifier {
     try {
       if (await Helpers.checkConnection()) {
         final response =
-            await AppClient.post(GET_RADIOLOGY, body: json.encode(patient));
+        await AppClient.post(GET_RADIOLOGY, body: json.encode(patient));
         final int statusCode = response.statusCode;
         isLoading = false;
 
@@ -337,15 +337,37 @@ class PatientsProvider with ChangeNotifier {
     }
   }
 
-  getPatientInsuranceApprovals(patient) async {
-    //setBasicData();
-  getPatientInsuranceApprovals(patient) async{
+  getLabResult(LabOrdersResModel labOrdersResModel) async {
+    labResultList.clear();
+    isLoading = true;
+    notifyListeners();
+    RequestLabResult requestLabResult = RequestLabResult();
+    requestLabResult.sessionID = labOrdersResModel.setupID;
+    requestLabResult.orderNo = labOrdersResModel.orderNo;
+    requestLabResult.invoiceNo = labOrdersResModel.invoiceNo;
+    requestLabResult.patientTypeID = labOrdersResModel.patientType;
+    await BaseAppClient.post('DoctorApplication.svc/REST/GetPatientLabResults',
+        onSuccess: (dynamic response, int statusCode) {
+          isError = false;
+          isLoading = false;
+          response['List_GetLabNormal'].forEach((v) {
+            labResultList.add(new LabResult.fromJson(v));
+          });
+        }, onFailure: (String error, int statusCode) {
+          isError = true;
+          isLoading = false;
+          this.error = error;
+        }, body: requestLabResult.toJson());
+    notifyListeners();
+  }
+
 
+  getPatientInsuranceApprovals(patient) async {
     setBasicData();
     try {
       if (await Helpers.checkConnection()) {
-        final response = await AppClient.post(PATIENT_INSURANCE_APPROVALS_URL,
-            body: json.encode(patient));
+        final response = await AppClient.post(
+            PATIENT_INSURANCE_APPROVALS_URL, body: json.encode(patient));
         final int statusCode = response.statusCode;
         isLoading = false;
 
@@ -374,27 +396,5 @@ class PatientsProvider with ChangeNotifier {
     }
   }
 
-  getLabResult(LabOrdersResModel labOrdersResModel) async {
-    labResultList.clear();
-    isLoading = true;
-    notifyListeners();
-    RequestLabResult requestLabResult = RequestLabResult();
-    requestLabResult.sessionID = labOrdersResModel.setupID;
-    requestLabResult.orderNo = labOrdersResModel.orderNo;
-    requestLabResult.invoiceNo = labOrdersResModel.invoiceNo;
-    requestLabResult.patientTypeID = labOrdersResModel.patientType;
-    await BaseAppClient.post('DoctorApplication.svc/REST/GetPatientLabResults',
-        onSuccess: (dynamic response, int statusCode) {
-      isError = false;
-      isLoading = false;
-      response['List_GetLabNormal'].forEach((v) {
-        labResultList.add(new LabResult.fromJson(v));
-      });
-    }, onFailure: (String error, int statusCode) {
-      isError = true;
-      isLoading = false;
-      this.error = error;
-    }, body: requestLabResult.toJson());
-    notifyListeners();
-  }
+
 }

lib/providers/referred_patient_provider.dart

@@ -16,7 +16,7 @@ class MyReferredPatientProvider with ChangeNotifier {
   String error = '';
 
   RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel();
- // RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks();
+  // RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks();
   VerifyReferralDoctorRemarks _verifyreferraldoctorremarks = VerifyReferralDoctorRemarks();
   MyReferredPatientProvider() {
     getMyReferralPatient();
@@ -51,38 +51,38 @@ class MyReferredPatientProvider with ChangeNotifier {
 
   // Future replay(
   //     String referredDoctorRemarks, MyReferredPatientModel model) async {
-     Future replay(
-       MyReferredPatientModel model) async {
+  Future replay(
+      MyReferredPatientModel model) async {
     try {
-      
-    _verifyreferraldoctorremarks.patientID=model.projectId;
-     _verifyreferraldoctorremarks.admissionNo =model.admissionNo;
-     _verifyreferraldoctorremarks.lineItemNo = model.lineItemNo;
-     
+
+      _verifyreferraldoctorremarks.patientID=model.projectId;
+      _verifyreferraldoctorremarks.admissionNo =model.admissionNo;
+      _verifyreferraldoctorremarks.lineItemNo = model.lineItemNo;
+
       _verifyreferraldoctorremarks.referredDoctorRemarks=model.referredDoctorRemarks;
       _verifyreferraldoctorremarks.referringDoctor=model.referringDoctor;
-       _verifyreferraldoctorremarks.firstName=model.firstName;
-       _verifyreferraldoctorremarks.middleName=model.middleName;
-       _verifyreferraldoctorremarks.lastName=model.lastName;
-       _verifyreferraldoctorremarks.patientMobileNumber=model.mobileNumber;
-       _verifyreferraldoctorremarks.patientIdentificationID=model.patientIdentificationNo;
+      _verifyreferraldoctorremarks.firstName=model.firstName;
+      _verifyreferraldoctorremarks.middleName=model.middleName;
+      _verifyreferraldoctorremarks.lastName=model.lastName;
+      _verifyreferraldoctorremarks.patientMobileNumber=model.mobileNumber;
+      _verifyreferraldoctorremarks.patientIdentificationID=model.patientIdentificationNo;
+
+
+
+
 
 
-      
 
-     
 
 
 
-    
-     
       await BaseAppClient.post(
         'DoctorApplication.svc/REST/GtMyReferredPatient',
         body: _verifyreferraldoctorremarks.toJson(),//_requestAddReferredDoctorRemarks.toJson(),
         onSuccess: (dynamic body, int statusCode) {
-        
+
           listMyReferredPatientModel[
-              listMyReferredPatientModel.indexOf(model)] = model;
+          listMyReferredPatientModel.indexOf(model)] = model;
           notifyListeners();
         },
         onFailure: (String error, int statusCode) {

lib/screens/doctor/my_referred_patient_screen.dart

@@ -11,7 +11,7 @@ import 'package:provider/provider.dart';
 import '../../widgets/shared/app_scaffold_widget.dart';
 
 class MyReferredPatient extends StatelessWidget {
-  
+
   MyReferredPatientProvider referredPatientProvider;
 
   @override
@@ -24,44 +24,45 @@ class MyReferredPatient extends StatelessWidget {
       body: referredPatientProvider.isLoading
           ? DrAppCircularProgressIndeicator()
           : referredPatientProvider.isError
-              ? Center(
-                  child: AppText(
-                    referredPatientProvider.error,
-                    color: Theme.of(context).errorColor,
+          ? Center(
+        child: AppText(
+          referredPatientProvider.error,
+          color: Theme.of(context).errorColor,
+        ),
+      )
+
+          : referredPatientProvider.listMyReferredPatientModel.length == 0
+          ? Center(
+        child: AppText(
+          TranslationBase.of(context).errorNoSchedule,
+          color: Theme.of(context).errorColor,
+        ),
+      )
+          : Container(
+        padding: EdgeInsetsDirectional.fromSTEB(20, 0, 20, 0),
+        child: ListView(
+          children: <Widget>[
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                SizedBox(
+                  height: 10,
+                ),
+                Container(
+                  child: Column(
+                    //children: referredPatientProvider.listMyReferralPatientModel.map((item) {
+                    children: referredPatientProvider.listMyReferredPatientModel.map((item) {
+                      return MyReferredPatientWidget(
+                        myReferredPatientModel: item,
+                      );
+                    }).toList(),
                   ),
-                )
-              : referredPatientProvider.listMyReferralPatientModel.length == 0
-                  ? Center(
-                      child: AppText(
-                        TranslationBase.of(context).errorNoSchedule,
-                        color: Theme.of(context).errorColor,
-                      ),
-                    )
-                  : Container(
-                      padding: EdgeInsetsDirectional.fromSTEB(20, 0, 20, 0),
-                      child: ListView(
-                        children: <Widget>[
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: <Widget>[
-                              SizedBox(
-                                height: 10,
-                              ),
-                              Container(
-                                child: Column(
-                                 
-                                  children: referredPatientProvider.listMyReferralPatientModel.map((item) {
-                                    return MyReferredPatientWidget(
-                                      myReferredPatientModel: item,
-                                    );
-                                  }).toList(),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
     );
   }
-}
+}