From ed7b9d609fb1e540d170d34a2eb90fcf1cb934d3 Mon Sep 17 00:00:00 2001 From: Mohammad Aljmma Date: Tue, 17 Nov 2020 10:05:25 +0200 Subject: [PATCH] fix lab result --- lib/config/config.dart | 4 ++-- lib/core/service/medical/labs_service.dart | 8 +++++--- .../data_display/medical/laboratory_result_widget.dart | 7 ++++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index f37bbaea..3f68aa34 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -6,8 +6,8 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://uat.hmgwebservices.com/'; -//const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; ///Doctor diff --git a/lib/core/service/medical/labs_service.dart b/lib/core/service/medical/labs_service.dart index 36503ac1..367ca4b9 100644 --- a/lib/core/service/medical/labs_service.dart +++ b/lib/core/service/medical/labs_service.dart @@ -9,11 +9,12 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; class LabsService extends BaseService { - RequestPatientLabOrders _requestPatientLabOrders = RequestPatientLabOrders(); List patientLabOrdersList = List(); Future getPatientLabOrdersList() async { hasError = false; + Map body = Map(); + body['isDentalAllowedBackend'] = false; await baseAppClient.post(GET_Patient_LAB_ORDERS, onSuccess: (dynamic response, int statusCode) { patientLabOrdersList.clear(); @@ -23,7 +24,7 @@ class LabsService extends BaseService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: _requestPatientLabOrders.toJson()); + }, body: body); } RequestPatientLabSpecialResult _requestPatientLabSpecialResult = @@ -60,7 +61,8 @@ class LabsService extends BaseService { Map body = Map(); body['InvoiceNo'] = patientLabOrder.invoiceNo; body['OrderNo'] = patientLabOrder.orderNo; - body['Procedure'] = "U/A"; + body['isDentalAllowedBackend'] = false; + body['SetupID'] = patientLabOrder.setupID; body['ProjectID'] = patientLabOrder.projectID; body['ClinicID'] = patientLabOrder.clinicID; //TODO Check the res diff --git a/lib/widgets/data_display/medical/laboratory_result_widget.dart b/lib/widgets/data_display/medical/laboratory_result_widget.dart index ecb32c6c..8662b9b0 100644 --- a/lib/widgets/data_display/medical/laboratory_result_widget.dart +++ b/lib/widgets/data_display/medical/laboratory_result_widget.dart @@ -6,6 +6,7 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_html/flutter_html.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; @@ -153,7 +154,11 @@ class _LaboratoryResultWidgetState extends State { duration: Duration(milliseconds: 7000), child: Container( width: double.infinity, - child: Text(widget.details ?? 'No Data')), + child: Html( + // data:"
BCG
HEPATITIS B
"//model.creteVaccinationTableModelList[index].vaccinesDescription + data:widget.details ?? 'No Data', + + )), ), SizedBox( height: 12,