From 2b13d437575128317b9a378be5b93e89936d1fd9 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 17 Aug 2023 16:36:39 +0300 Subject: [PATCH] bug fixes --- lib/config/config.dart | 2 +- .../discharge_summary/GetDischargeSummaryReqModel.dart | 2 +- .../model/vte_assessment/vte_assessment_req_model.dart | 2 +- lib/core/service/VideoCallService.dart | 10 +++++----- lib/core/service/pending_order_service.dart | 4 ++-- .../viewModel/ER_sign_in/ER_sign_in_view_model.dart | 2 +- lib/core/viewModel/doctor_replay_view_model.dart | 2 +- lib/core/viewModel/patient_view_model.dart | 2 +- .../viewModel/profile/operation_report_view_model.dart | 2 +- .../patients/profile/diagnosis/diagnosis_screen.dart | 2 +- .../notes/nursing_note/nursing_note_screen.dart | 2 +- .../operation_report/update_operation_report.dart | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index bb448ee7..3bc3dda8 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,7 +5,7 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; - +// const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; // const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/'; diff --git a/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart b/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart index 3bc5f931..ccc686aa 100644 --- a/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart +++ b/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart @@ -23,7 +23,7 @@ class GetDischargeSummaryReqModel { data['AdmissionNo'] = this.admissionNo; data['PatientType'] = this.patientType; data['PatientTypeID'] = this.patientTypeID; - data['SetupID'] = "010266"; + data['isDentalAllowedBackend'] = false; return data; } diff --git a/lib/core/model/vte_assessment/vte_assessment_req_model.dart b/lib/core/model/vte_assessment/vte_assessment_req_model.dart index 1f0bd1fa..e17ae4ba 100644 --- a/lib/core/model/vte_assessment/vte_assessment_req_model.dart +++ b/lib/core/model/vte_assessment/vte_assessment_req_model.dart @@ -4,7 +4,7 @@ class VteAssessmentRequestModel { int transactionNo; VteAssessmentRequestModel( - {this.setupID = "010266", this.parameterGroup = 7, this.transactionNo}); + {this.setupID, this.parameterGroup = 7, this.transactionNo}); VteAssessmentRequestModel.fromJson(Map json) { setupID = json['SetupID']; diff --git a/lib/core/service/VideoCallService.dart b/lib/core/service/VideoCallService.dart index 94307ce6..0aa770ca 100644 --- a/lib/core/service/VideoCallService.dart +++ b/lib/core/service/VideoCallService.dart @@ -36,11 +36,11 @@ class VideoCallService extends BaseService { // TODO MOSA TEST kApiKey: '46209962', - // kToken: startCallRes.openTokenID, - // kSessionId: startCallRes.openSessionID, - - kToken: "T1==cGFydG5lcl9pZD00NjIwOTk2MiZzaWc9NjM4ZjgxNmFjZjI0ODU2YTk0YTMwMGIxMjFkNmZlY2E5OGJlYWNlZDpzZXNzaW9uX2lkPTJfTVg0ME5qSXdPVGsyTW41LU1UWTNNek0xTURFMk1qSTNPWDVZT0RGMWFVdElaRWRWVldGTlVGYzNObFYxVERWNFRFbC1mbjQmY3JlYXRlX3RpbWU9MTY3MzM1MDE2MiZub25jZT0wLjE5OTUyMjMwNzIyMDAyODczJnJvbGU9bW9kZXJhdG9yJmV4cGlyZV90aW1lPTE2NzM0MzY1NjImaW5pdGlhbF9sYXlvdXRfY2xhc3NfbGlzdD0=", - kSessionId: "2_MX40NjIwOTk2Mn5-MTY3MzM1MDE2MjI3OX5YODF1aUtIZEdVVWFNUFc3NlV1TDV4TEl-fn4", + kToken: startCallRes.openTokenID, + kSessionId: startCallRes.openSessionID, + // + // kToken: "T1==cGFydG5lcl9pZD00NjIwOTk2MiZzaWc9NzE0MGE4YzM0ZTU2YjQ5NmQzOTgwOTNkYmU1NzEzMmQxYTdkMDliZTpzZXNzaW9uX2lkPTFfTVg0ME5qSXdPVGsyTW41LU1UWTVNakkxTkRjMU1EUTRObjVCVFZsM2MwODFNV1ZhTjFsUlEyZGxiRFZxZVZjNWNHMS1mbjQmY3JlYXRlX3RpbWU9MTY5MjI1NDc1MCZub25jZT0wLjY5OTQyNzkzMTg1NDg4NSZyb2xlPW1vZGVyYXRvciZleHBpcmVfdGltZT0xNjkyMjU2NTUwJmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9", + // kSessionId: "1_MX40NjIwOTk2Mn5-MTY5MjI1NDc1MDQ4Nn5BTVl3c081MWVaN1lRQ2dlbDVqeVc5cG1-fn4", vcId: patient.vcId, isRecording: isRecording, diff --git a/lib/core/service/pending_order_service.dart b/lib/core/service/pending_order_service.dart index 17f6ea12..8f148f21 100644 --- a/lib/core/service/pending_order_service.dart +++ b/lib/core/service/pending_order_service.dart @@ -23,7 +23,7 @@ class PendingOrderService extends BaseService { admissionNo: admissionNo, patientTypeID: 1, patientType: 1, - setupID: "010266"); + ); hasError = false; await baseAppClient.post(GET_PENDING_ORDERS, @@ -50,7 +50,7 @@ class PendingOrderService extends BaseService { admissionNo: admissionNo, patientTypeID: 1, patientType: 1, - setupID: "010266"); + ); hasError = false; await baseAppClient.post(GET_ADMISSION_ORDERS, diff --git a/lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart b/lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart index 0bf10e76..02ddd1e8 100644 --- a/lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart +++ b/lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart @@ -27,7 +27,7 @@ class ERSignInViewModel extends BaseViewModel { Future signInERPatient({int patientId, int signInType}) async { hasError = false; await getDoctorProfile(); - DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel = new DoctorErSignAssessmentReqModel(setupID:"010266", signInType:signInType, loginDoctorID:doctorProfile.doctorID, patientID: patientId ); + DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel = new DoctorErSignAssessmentReqModel(signInType:signInType, loginDoctorID:doctorProfile.doctorID, patientID: patientId ); setState(ViewState.BusyLocal); await _ERSignInService.signInERPatient(doctorErSignAssessmentReqModel: doctorErSignAssessmentReqModel); if (_ERSignInService.hasError) { diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index 4cc51635..86c04528 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -55,7 +55,7 @@ class DoctorReplayViewModel extends BaseViewModel { infoStatus: 6, createdBy: this.doctorProfile.doctorID, infoEnteredBy: this.doctorProfile.doctorID, - setupID: "010266"); + ); setState(ViewState.BusyLocal); await _doctorReplyService.createDoctorResponse(createDoctorResponseModel); if (_doctorReplyService.hasError) { diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index daf25bac..e21be54a 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -354,7 +354,7 @@ class PatientViewModel extends BaseViewModel { patientTypeID: 1, patientType: 1, resultType: resultType, - setupID: "010266"); + ); await _patientService.getDiabeticChartValues(requestModel); if (_patientService.hasError) { error = _patientService.error; diff --git a/lib/core/viewModel/profile/operation_report_view_model.dart b/lib/core/viewModel/profile/operation_report_view_model.dart index 944995b2..dab6b5fd 100644 --- a/lib/core/viewModel/profile/operation_report_view_model.dart +++ b/lib/core/viewModel/profile/operation_report_view_model.dart @@ -38,7 +38,7 @@ class OperationReportViewModel extends BaseViewModel { GetOperationDetailsRequestModel( reservationNo: reservation.oTReservationID, patientID: reservation.patientID, - setupID: "010266"); + ); await _operationReportService.getOperationReportDetails( getOperationReportRequestModel: getOperationReportRequestModel); if (_operationReportService.hasError) { diff --git a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart index d7fbc46f..07fe70d1 100644 --- a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart +++ b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart @@ -42,7 +42,7 @@ class _ProgressNoteState extends State { admissionNo: int.parse(patient.admissionNo), patientTypeID: patient.patientType, patientID: patient.patientId, - setupID: "010266"); + ); model.getDiagnosisForInPatient(getDiagnosisForInPatientRequestModel); } diff --git a/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart b/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart index 37cdd870..df5b5b47 100644 --- a/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart +++ b/lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart @@ -45,7 +45,7 @@ class _ProgressNoteState extends State { admissionNo: int.parse(patient.admissionNo), patientTypeID: patient.patientType, patientID: patient.patientId, - setupID: "010266"); + ); model.getNursingProgressNote(getNursingProgressNoteRequestModel); } diff --git a/lib/screens/patients/profile/operation_report/update_operation_report.dart b/lib/screens/patients/profile/operation_report/update_operation_report.dart index 62536bb3..c15a3f88 100644 --- a/lib/screens/patients/profile/operation_report/update_operation_report.dart +++ b/lib/screens/patients/profile/operation_report/update_operation_report.dart @@ -591,7 +591,7 @@ class _UpdateOperationReportState extends State { widget.patient.admissionNo), createdBy: model.doctorProfile.doctorID, - setupID: "010266"); + ); await model.updateOperationReport( createUpdateOperationReportRequestModel);