InPatient Services issues fixed

merge-update-with-lab-changes
haroon amjad 1 year ago
parent d9b4b1575d
commit 82de56266e

@ -149,8 +149,8 @@ class _AdmissionNoticeState extends State<AdmissionNotice> {
padding: const EdgeInsets.only(left: 20, right: 20),
child: Text(
projectViewModel.isPatientAdmitted
? projectViewModel.getAdmissionInfoResponseModel.doctorName!.toString()
: projectViewModel.getAdmissionRequestInfoResponseModel.doctorName!,
? projectViewModel.getAdmissionInfoResponseModel.doctorName ?? ""
: projectViewModel.getAdmissionRequestInfoResponseModel.doctorName ?? "",
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,

@ -308,7 +308,7 @@ class _InPatientServicesHomeState extends State<InPatientServicesHome> {
void openBirthNotificationsPage(BuildContext context) {
ClinicListService service = new ClinicListService();
GifLoaderDialogUtils.showMyDialog(context);
service.getBirthNotification(projectViewModel.user.patientID!, context).then((res) {
service.getBirthNotification(projectViewModel.user.patientID!, projectViewModel.isArabic ? 1 : 2, context).then((res) {
GifLoaderDialogUtils.hideDialog(context);
if (res["MessageStatus"] == 1) {
print(res['birthNotification']);
@ -328,7 +328,7 @@ class _InPatientServicesHomeState extends State<InPatientServicesHome> {
void openGeneralInstructions(BuildContext context) {
ClinicListService service = new ClinicListService();
GifLoaderDialogUtils.showMyDialog(context);
service.getGeneralInstructions(projectViewModel.inPatientProjectID, context).then((res) {
service.getGeneralInstructions(projectViewModel.inPatientProjectID, projectViewModel.isArabic ? 1 : 2, context).then((res) {
if (res['generalInstructions'].length != 0) {
List<GetGeneralInstructions> getGeneralInstructionsList = [];
res['generalInstructions'].forEach((v) {
@ -349,7 +349,7 @@ class _InPatientServicesHomeState extends State<InPatientServicesHome> {
void openMedicalInstructions(BuildContext context) {
ClinicListService service = new ClinicListService();
GifLoaderDialogUtils.showMyDialog(context);
service.getMedicalInstructions(projectViewModel.inPatientProjectID, context).then((res) {
service.getMedicalInstructions(projectViewModel.inPatientProjectID, projectViewModel.isArabic ? 1 : 2, context).then((res) {
if (res['MedicalInstruction'] != null && res['MedicalInstruction'].length != 0) {
List<GetMedicalInstructions> getMedicalInstructionsList = [];
res['MedicalInstruction'].forEach((v) {

@ -74,12 +74,12 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
// hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
// hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/CoronaIcon.svg", isLogin));
// hmgServices.add(new HmgServices(2, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/paymentMethods.png", isLogin));
hmgServices.add(new HmgServices(9, TranslationBase.of(context).emergency, TranslationBase.of(context).checkinOptions, "assets/images/new/emergency.svg", isLogin));
projectViewModel.isIndoorNavigationEnabled
? hmgServices.add(HmgServices(2, TranslationBase.of(context).hospitalNavigationTitle, TranslationBase.of(context).hospitalNavigationSubtitle, "assets/images/new/indoor_nav_home.svg", isLogin))
: hmgServices.add(HmgServices(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.svg", isLogin));
hmgServices.add(new HmgServices(9, TranslationBase.of(context).emergency, TranslationBase.of(context).checkinOptions, "assets/images/new/emergency.svg", isLogin));
hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
hmgServices.add(new HmgServices(4, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));

@ -463,7 +463,7 @@ class _Login extends State<Login> {
GetAdmissionRequestInfoResponseModel.fromJson(
res['MedicalInstruction'][0]);
projectViewModel.setInPatientProjectID(
res['MedicalInstruction'][0]['ProjectID']);
res['MedicalInstruction'][0]['projectId']);
projectViewModel.setInPatientAdmissionRequest(
getAdmissionRequestInfoResponseModel);
projectViewModel.setPatientHasAdmissionRequest(true);

@ -169,6 +169,7 @@ class ClinicListService extends BaseService {
}, body: request);
return Future.value(localRes);
}
Future<Map> getInPatientAdvancePaymentHistory(int projectID, int admissionNo, int admissionReqNo, context) async {
Map<String, dynamic> request;
request = {"ProjectID": projectID, "AdmissionNo": admissionNo, "AdmissionReqNo": admissionReqNo};
@ -213,6 +214,7 @@ class ClinicListService extends BaseService {
}, body: request, isAllowAny: true);
return Future.value(localRes);
}
Future<Map> submitBirthNotification(num motherMRN, int projectID, String fatherNameAR, String fatherNameEN, String babyNameAR, String babyNameEN, String contactNum, String idImage, context) async {
Map<String, dynamic> request;
request = {
@ -236,8 +238,8 @@ class ClinicListService extends BaseService {
return Future.value(localRes);
}
Future<Map> insertInPatientOrder(GetAdmissionInfoResponseModel getAdmissionInfoResponseModel, int typeID, String patientName, String patientNameAR, String patientMobileNo, String comments,
context) async {
Future<Map> insertInPatientOrder(
GetAdmissionInfoResponseModel getAdmissionInfoResponseModel, int typeID, String patientName, String patientNameAR, String patientMobileNo, String comments, context) async {
Map<String, dynamic> request;
request = {
"ProjectID": getAdmissionInfoResponseModel.projectID,
@ -262,9 +264,9 @@ class ClinicListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getGeneralInstructions(int projectID, context) async {
Future<Map> getGeneralInstructions(int projectID, int languageID, context) async {
Map<String, dynamic> request;
request = {"ProjectID": projectID};
request = {"ProjectID": projectID, "LanguageID": languageID};
dynamic localRes;
@ -275,9 +277,10 @@ class ClinicListService extends BaseService {
}, body: request, isAllowAny: true);
return Future.value(localRes);
}
Future<Map> getMedicalInstructions(int projectID, context) async {
Future<Map> getMedicalInstructions(int projectID, int languageID, context) async {
Map<String, dynamic> request;
request = {"ProjectID": projectID};
request = {"ProjectID": projectID, "LanguageID": languageID};
dynamic localRes;
@ -303,11 +306,9 @@ class ClinicListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getBirthNotification(num motherMRN, context) async {
Future<Map> getBirthNotification(num motherMRN, int languageID, context) async {
Map<String, dynamic> request;
request = {
"mothermrn": motherMRN,
};
request = {"mothermrn": motherMRN, "LanguageID": languageID};
dynamic localRes;
@ -332,6 +333,7 @@ class ClinicListService extends BaseService {
}, body: request, isAllowAny: true);
return Future.value(localRes);
}
Future<Map> getCurrentWeekIDAndDay(BuildContext context) async {
dynamic localRes;
await baseAppClient.get(GET_CURRENT_WEEKID_WEEKDAY, isExternal: false, isRCService: false, onSuccess: (response, statusCode) async {
@ -413,6 +415,7 @@ class ClinicListService extends BaseService {
}, body: request, isAllowAny: true);
return Future.value(localRes);
}
Future<Map> checkIfInPatientAPI(context) async {
Map<String, dynamic> request;
request = {
@ -429,7 +432,6 @@ class ClinicListService extends BaseService {
return Future.value(localRes);
}
Future<Map> getWeCareURL(int projectID) async {
Map<String, dynamic> request = {"ProjectID": projectID};
dynamic localRes;
@ -557,5 +559,4 @@ class ClinicListService extends BaseService {
}, body: request, isAllowAny: true);
return Future.value(localRes);
}
}

Loading…
Cancel
Save