first step from fix service

merge-requests/889/head
Elham Rababh 5 years ago
parent 7f9969b6cf
commit ced1c9b392

@ -17,10 +17,10 @@ class NavigationService {
} }
Future<dynamic> pushAndRemoveUntil(Route newRoute) { Future<dynamic> pushAndRemoveUntil(Route newRoute) {
return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false); return navigatorKey.currentState!.pushAndRemoveUntil(newRoute,(asd)=>false);
} }
pop() { pop() {
return navigatorKey.currentState.pop(); return navigatorKey.currentState!.pop();
} }
} }

@ -9,8 +9,8 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
class PatientRegistrationService extends BaseService { class PatientRegistrationService extends BaseService {
GetPatientInfoResponseModel getPatientInfoResponseModel; late GetPatientInfoResponseModel getPatientInfoResponseModel;
String logInTokenID; late String logInTokenID;
checkPatientForRegistration( checkPatientForRegistration(
CheckPatientForRegistrationModel registrationModel) async { CheckPatientForRegistrationModel registrationModel) async {
@ -39,11 +39,11 @@ class PatientRegistrationService extends BaseService {
} }
sendActivationCodeByOTPNotificationType( sendActivationCodeByOTPNotificationType(
{SendActivationCodeByOTPNotificationTypeForRegistrationModel {required SendActivationCodeByOTPNotificationTypeForRegistrationModel
registrationModel, registrationModel,
int otpType, required int otpType,
PatientRegistrationViewModel model, required PatientRegistrationViewModel model,
CheckPatientForRegistrationModel required CheckPatientForRegistrationModel
checkPatientForRegistrationModel}) async { checkPatientForRegistrationModel}) async {
registrationModel = registrationModel =
SendActivationCodeByOTPNotificationTypeForRegistrationModel( SendActivationCodeByOTPNotificationTypeForRegistrationModel(

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/client/base_app_client.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';

@ -47,7 +47,7 @@ class LiveCarePatientServices extends BaseService {
/// add new items. /// add new items.
localPatientList.forEach((element) { localPatientList.forEach((element) {
if ((_patientList.singleWhere((it) => it.patientId == element.patientId, orElse: () => null)) == null) { if ((_patientList.singleWhere((it) => it.patientId == element.patientId)) == null) {
_patientList.add(element); _patientList.add(element);
} }
}); });
@ -55,7 +55,7 @@ class LiveCarePatientServices extends BaseService {
/// remove items. /// remove items.
List<PatiantInformtion> removedPatientList = []; List<PatiantInformtion> removedPatientList = [];
_patientList.forEach((element) { _patientList.forEach((element) {
if ((localPatientList.singleWhere((it) => it.patientId == element.patientId, orElse: () => null)) == null) { if ((localPatientList.singleWhere((it) => it.patientId == element.patientId)) == null) {
removedPatientList.add(element); removedPatientList.add(element);
} }
}); });
@ -155,12 +155,12 @@ class LiveCarePatientServices extends BaseService {
}, body: {"VC_ID": vcID, "generalid": GENERAL_ID}, isLiveCare: _isLive); }, body: {"VC_ID": vcID, "generalid": GENERAL_ID}, isLiveCare: _isLive);
} }
Future addPatientToDoctorList({int vcID}) async { Future addPatientToDoctorList({required int vcID}) async {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile();
AddPatientToDoctorListRequestModel addPatientToDoctorListRequestModel = AddPatientToDoctorListRequestModel(); AddPatientToDoctorListRequestModel addPatientToDoctorListRequestModel = AddPatientToDoctorListRequestModel();
addPatientToDoctorListRequestModel.doctorId = super.doctorProfile.doctorID; addPatientToDoctorListRequestModel.doctorId = super.doctorProfile!.doctorID!;
addPatientToDoctorListRequestModel.vCID = vcID; addPatientToDoctorListRequestModel.vCID = vcID;
addPatientToDoctorListRequestModel.isOutKsa = false; addPatientToDoctorListRequestModel.isOutKsa = false;
addPatientToDoctorListRequestModel.generalid = GENERAL_ID; addPatientToDoctorListRequestModel.generalid = GENERAL_ID;
@ -173,11 +173,11 @@ class LiveCarePatientServices extends BaseService {
}, body: addPatientToDoctorListRequestModel.toJson(), isLiveCare: _isLive); }, body: addPatientToDoctorListRequestModel.toJson(), isLiveCare: _isLive);
} }
Future removePatientFromDoctorList({int vcID}) async { Future removePatientFromDoctorList({required int vcID}) async {
hasError = false; hasError = false;
AddPatientToDoctorListRequestModel addPatientToDoctorListRequestModel = AddPatientToDoctorListRequestModel(); AddPatientToDoctorListRequestModel addPatientToDoctorListRequestModel = AddPatientToDoctorListRequestModel();
await getDoctorProfile(); await getDoctorProfile();
addPatientToDoctorListRequestModel.doctorId = super.doctorProfile.doctorID; addPatientToDoctorListRequestModel.doctorId = super.doctorProfile!.doctorID!;
addPatientToDoctorListRequestModel.vCID = vcID; addPatientToDoctorListRequestModel.vCID = vcID;
addPatientToDoctorListRequestModel.isOutKsa = false; addPatientToDoctorListRequestModel.isOutKsa = false;
addPatientToDoctorListRequestModel.generalid = GENERAL_ID; addPatientToDoctorListRequestModel.generalid = GENERAL_ID;

@ -13,7 +13,7 @@ class DischargeSummaryService extends BaseService {
List<GetDischargeSummaryResModel> get pendingDischargeSummaryList => _pendingDischargeSummaryList; List<GetDischargeSummaryResModel> get pendingDischargeSummaryList => _pendingDischargeSummaryList;
Future getPendingDischargeSummary( Future getPendingDischargeSummary(
{GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async { {required GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async {
hasError = false; hasError = false;
await baseAppClient.post(GET_PENDING_DISCHARGE_SUMMARY, await baseAppClient.post(GET_PENDING_DISCHARGE_SUMMARY,

@ -14,8 +14,8 @@ class OperationReportService extends BaseService {
List<GetOperationDetailsResponseModel> get operationDetailsList => _operationDetailsList; List<GetOperationDetailsResponseModel> get operationDetailsList => _operationDetailsList;
Future getReservations( Future getReservations(
{GetReservationsRequestModel getReservationsRequestModel, {required GetReservationsRequestModel getReservationsRequestModel,
int patientId}) async { required int patientId}) async {
getReservationsRequestModel = getReservationsRequestModel =
GetReservationsRequestModel(patientID: patientId, doctorID: ""); GetReservationsRequestModel(patientID: patientId, doctorID: "");
@ -36,7 +36,7 @@ class OperationReportService extends BaseService {
} }
Future getOperationReportDetails( Future getOperationReportDetails(
{GetOperationDetailsRequestModel getOperationReportRequestModel, {required GetOperationDetailsRequestModel getOperationReportRequestModel,
}) async { }) async {
hasError = false; hasError = false;

@ -179,7 +179,7 @@ class LabsService extends BaseService {
} }
Future getPatientLabOrdersResultHistoryByDescription( Future getPatientLabOrdersResultHistoryByDescription(
{PatientLabOrders patientLabOrder, String procedureDescription, PatiantInformtion patient}) async { {required PatientLabOrders patientLabOrder, required String procedureDescription, required PatiantInformtion patient}) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
if (patientLabOrder != null) { if (patientLabOrder != null) {
@ -201,7 +201,7 @@ class LabsService extends BaseService {
}, body: body); }, body: body);
} }
Future getAllSpecialLabResult({int mrn}) async { Future getAllSpecialLabResult({required int mrn}) async {
_allSpecialLabResultRequestModel = AllSpecialLabResultRequestModel( _allSpecialLabResultRequestModel = AllSpecialLabResultRequestModel(
patientID: mrn, patientID: mrn,
patientType: 1, patientType: 1,

@ -94,7 +94,7 @@ class PatientMedicalReportService extends BaseService {
? body['SetupID'] ? body['SetupID']
: SETUP_ID : SETUP_ID
: SETUP_ID; : SETUP_ID;
body['AdmissionNo'] = int.parse(patient.admissionNo); body['AdmissionNo'] = int.parse(patient!.admissionNo!);
body['MedicalReportHTML'] = htmlText; body['MedicalReportHTML'] = htmlText;
if (body['ProjectID'] == null) { if (body['ProjectID'] == null) {
body['ProjectID'] = doctorProfile?.projectID; body['ProjectID'] = doctorProfile?.projectID;

@ -192,9 +192,9 @@ class PrescriptionsService extends BaseService {
hasError = false; hasError = false;
_getMedicationForInPatientRequestModel = GetMedicationForInPatientRequestModel( _getMedicationForInPatientRequestModel = GetMedicationForInPatientRequestModel(
isDentalAllowedBackend: false, isDentalAllowedBackend: false,
admissionNo: int.parse(patient.admissionNo), admissionNo: int.parse(patient!.admissionNo!),
tokenID: "@dm!n", tokenID: "@dm!n",
projectID: patient.projectId, projectID: patient!.projectId!,
); );
await baseAppClient.postPatient(GET_MEDICATION_FOR_IN_PATIENT, patient: patient, await baseAppClient.postPatient(GET_MEDICATION_FOR_IN_PATIENT, patient: patient,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -104,7 +104,7 @@ class ProcedureService extends BaseService {
}, body: _procedureTempleteDetailsRequestModel.toJson()); }, body: _procedureTempleteDetailsRequestModel.toJson());
} }
Future getProcedure({int? mrn, int appointmentNo}) async { Future getProcedure({int? mrn, required int appointmentNo}) async {
_getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel( _getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel(
patientMRN: mrn, patientMRN: mrn,
); );

@ -83,7 +83,7 @@ class SOAPService extends LookupService {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = super.error+ "\n"+error; super.error = super.error!+ "\n"+error;
}, body: postAllergyRequestModel.toJson()); }, body: postAllergyRequestModel.toJson());
} }
@ -93,7 +93,7 @@ class SOAPService extends LookupService {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error =super.error + "\n"+error; super.error =super.error! + "\n"+error;
}, body: postHistoriesRequestModel.toJson()); }, body: postHistoriesRequestModel.toJson());
} }
@ -155,7 +155,7 @@ class SOAPService extends LookupService {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = super.error +"\n"+error; super.error = super.error! +"\n"+error;
}, body: patchHistoriesRequestModel.toJson()); }, body: patchHistoriesRequestModel.toJson());
} }

@ -8,8 +8,8 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
class UcafService extends LookupService { class UcafService extends LookupService {
List<GetChiefComplaintResModel> patientChiefComplaintList; late List<GetChiefComplaintResModel> patientChiefComplaintList;
List<VitalSignHistory> patientVitalSignsHistory; late List<VitalSignHistory> patientVitalSignsHistory;
List<GetAssessmentResModel> patientAssessmentList = []; List<GetAssessmentResModel> patientAssessmentList = [];
List<OrderProcedure> orderProcedureList = []; List<OrderProcedure> orderProcedureList = [];
PrescriptionModel? prescriptionList; PrescriptionModel? prescriptionList;
@ -22,13 +22,13 @@ class UcafService extends LookupService {
body['EpisodeID'] = patient.episodeNo; body['EpisodeID'] = patient.episodeNo;
body['DoctorID'] = ""; body['DoctorID'] = "";
patientChiefComplaintList = null; patientChiefComplaintList = [];
await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) {
print("Success"); print("Success");
if (patientChiefComplaintList != null) { if (patientChiefComplaintList != null) {
patientChiefComplaintList.clear(); patientChiefComplaintList.clear();
} else { } else {
patientChiefComplaintList = new List(); patientChiefComplaintList = [];
} }
response['List_ChiefComplaint']['entityList'].forEach((v) { response['List_ChiefComplaint']['entityList'].forEach((v) {
patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v));
@ -50,14 +50,14 @@ class UcafService extends LookupService {
body['InOutPatientType'] = 2; body['InOutPatientType'] = 2;
} }
patientVitalSignsHistory = null; patientVitalSignsHistory = [];
await baseAppClient.post( await baseAppClient.post(
GET_PATIENT_VITAL_SIGN, GET_PATIENT_VITAL_SIGN,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) { if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear(); patientVitalSignsHistory.clear();
} else { } else {
patientVitalSignsHistory = new List(); patientVitalSignsHistory = [];
} }
if (response['List_DoctorPatientVitalSign'] != null) { if (response['List_DoctorPatientVitalSign'] != null) {
response['List_DoctorPatientVitalSign'].forEach((v) { response['List_DoctorPatientVitalSign'].forEach((v) {
@ -86,14 +86,14 @@ class UcafService extends LookupService {
body['From'] = fromDate; body['From'] = fromDate;
body['To'] = toDate; body['To'] = toDate;
patientVitalSignsHistory = null; patientVitalSignsHistory = [];
await baseAppClient.post( await baseAppClient.post(
GET_PATIENT_VITAL_SIGN_DATA, GET_PATIENT_VITAL_SIGN_DATA,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) { if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear(); patientVitalSignsHistory.clear();
} else { } else {
patientVitalSignsHistory = new List(); patientVitalSignsHistory = [];
} }
if (response['VitalSignsHistory'] != null) { if (response['VitalSignsHistory'] != null) {
response['VitalSignsHistory'].forEach((v) { response['VitalSignsHistory'].forEach((v) {

@ -13,9 +13,9 @@ class PendingOrderService extends BaseService {
List<AdmissionOrdersModel> get admissionOrderList => _admissionOrderList; List<AdmissionOrdersModel> get admissionOrderList => _admissionOrderList;
Future getPendingOrders( Future getPendingOrders(
{PendingOrderRequestModel pendingOrderRequestModel, {required PendingOrderRequestModel pendingOrderRequestModel,
int patientId, required int patientId,
int admissionNo}) async { required int admissionNo}) async {
pendingOrderRequestModel = PendingOrderRequestModel( pendingOrderRequestModel = PendingOrderRequestModel(
patientID: patientId, patientID: patientId,
admissionNo: admissionNo, admissionNo: admissionNo,
@ -40,9 +40,9 @@ class PendingOrderService extends BaseService {
} }
Future getAdmissionOrders( Future getAdmissionOrders(
{AdmissionOrdersRequestModel admissionOrdersRequestModel, {required AdmissionOrdersRequestModel admissionOrdersRequestModel,
int patientId, required int patientId,
int admissionNo}) async { required int admissionNo}) async {
admissionOrdersRequestModel = AdmissionOrdersRequestModel( admissionOrdersRequestModel = AdmissionOrdersRequestModel(
patientID: patientId, patientID: patientId,
admissionNo: admissionNo, admissionNo: admissionNo,

Loading…
Cancel
Save