diff --git a/lib/config/config.dart b/lib/config/config.dart index 16628fda..12ec7ca7 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -434,7 +434,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 6.5; +const VERSION_ID = 6.7; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/service/home/scan_qr_service.dart b/lib/core/service/home/scan_qr_service.dart index dac56e17..64c02869 100644 --- a/lib/core/service/home/scan_qr_service.dart +++ b/lib/core/service/home/scan_qr_service.dart @@ -11,12 +11,7 @@ class ScanQrService extends BaseService { PatientSearchRequestModel requestModel, bool isMyInpatient) async { hasError = false; await getDoctorProfile(); - - // if (isMyInpatient) { - // requestModel.doctorID = doctorProfile.doctorID; - // } else { requestModel.doctorID = 0; - //} await baseAppClient.post( GET_PATIENT_IN_PATIENT_LIST, diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index b8c187a3..68d7ce83 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -36,23 +36,6 @@ class SOAPService extends LookupService { int episodeID; - Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { - await baseAppClient.post( - GET_ALLERGIES, - onSuccess: (dynamic response, int statusCode) { - allergiesList.clear(); - response['List_Allergies']['entityList'].forEach((v) { - allergiesList.add(MasterKeyModel.fromJson(v)); - }); - }, - onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, - body: getAllergiesRequestModel.toJson(), - ); - } - Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { hasError = false; @@ -229,6 +212,7 @@ class SOAPService extends LookupService { Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async { hasError = false; + ///TODO Elham* change the url constant to get getPatientAllergy await baseAppClient.post(GET_ALLERGIES, onSuccess: (dynamic response, int statusCode) { print("Success"); diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 654906a2..23a49296 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -152,17 +152,6 @@ class SOAPViewModel extends BaseViewModel { nextOnPlanPage(model) { planCallBack.nextFunction(model); } - - Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { - setState(ViewState.Busy); - await _SOAPService.getAllergies(getAllergiesRequestModel); - if (_SOAPService.hasError) { - error = _SOAPService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } - Future getMasterLookup(MasterKeysService masterKeys, {bool isBusyLocal = false}) async { if (isBusyLocal) { @@ -336,16 +325,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientAssessment( - GetAssessmentReqModel getAssessmentReqModel) async { - setState(ViewState.Busy); - await _SOAPService.getPatientAssessment(getAssessmentReqModel); - if (_SOAPService.hasError) { - error = _SOAPService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } Future getMedicationList() async { setState(ViewState.Busy); diff --git a/lib/core/viewModel/scan_qr_view_model.dart b/lib/core/viewModel/scan_qr_view_model.dart index 680d871e..3daf7212 100644 --- a/lib/core/viewModel/scan_qr_view_model.dart +++ b/lib/core/viewModel/scan_qr_view_model.dart @@ -21,7 +21,6 @@ class ScanQrViewModel extends BaseViewModel { setState(ViewState.ErrorLocal); } else { - // setDefaultInPatientList(); setState(ViewState.Idle); } }