fix lab result

merge-requests/705/head
Mohammad Aljammal 3 years ago
parent 3c325ef199
commit e336821f65

@ -932,7 +932,7 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "تقدم بطلب جديد للمختبر الأشعة"
},
"addLabOrder": {"en": "Add Lab Order", "ar": "إضافة طلب معمل"},
"addRadiologyOrder": {"en": "Add Radiology Order", "ar": "إضافة اشغة"},
"addRadiologyOrder": {"en": "Add Radiology Order", "ar": "إضافة اشعة"},
"newRadiologyOrder": {"en": "New Radiology Order", "ar": "طلب الأشعة الجديد"},
"orderDate": {"en": "Order Date", "ar": "تاريخ الطلب"},
"examType": {"en": "Exam Type", "ar": "نوع الفحص"},

@ -14,13 +14,15 @@ class LaboratoryResultPage extends StatefulWidget {
final PatiantInformtion patient;
final String patientType;
final String arrivalType;
final bool isInpatient;
LaboratoryResultPage(
{Key key,
this.patientLabOrders,
this.patient,
this.patientType,
this.arrivalType});
this.arrivalType,
this.isInpatient});
@override
_LaboratoryResultPageState createState() => _LaboratoryResultPageState();
@ -40,7 +42,7 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
onModelReady: (model) => model.getPatientLabResult(
patientLabOrder: widget.patientLabOrders,
patient: widget.patient,
isInpatient: widget.patientType =="1"),
isInpatient: true),
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
appBar: PatientProfileHeaderWhitAppointmentAppBar(
@ -64,9 +66,9 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
LaboratoryResultWidget(
onTap: () async {},
billNo: widget.patientLabOrders.invoiceNo,
details: model
.patientLabSpecialResult.length > 0 ? model
.patientLabSpecialResult[0].resultDataHTML : null,
details: model.patientLabSpecialResult.length > 0
? model.patientLabSpecialResult[0].resultDataHTML
: null,
orderNo: widget.patientLabOrders.orderNo,
patientLabOrder: widget.patientLabOrders,
patient: widget.patient,

@ -181,9 +181,9 @@ class _LabsHomePageState extends State<LabsHomePage> {
context,
FadePage(
page: LaboratoryResultPage(
patientLabOrders:
model.patientLabOrdersList[index],
patientLabOrders: model.patientLabOrdersList[index],
patient: patient,
isInpatient:isInpatient,
arrivalType: arrivalType,
patientType: patientType,
),

@ -77,7 +77,7 @@ class _AddRadiologyScreenState extends State<AddRadiologyScreen>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
AppText(
TranslationBase.of(context).addLabOrder,
TranslationBase.of(context).addRadiologyOrder,
fontWeight: FontWeight.w700,
fontSize: 20,
),
@ -147,8 +147,8 @@ class _AddRadiologyScreenState extends State<AddRadiologyScreen>
AddFavouriteProcedure(
patient: patient,
model: model,
addButtonTitle: TranslationBase.of(context).addLabOrder,
toolbarTitle: TranslationBase.of(context).applyForNewLabOrder,
addButtonTitle: TranslationBase.of(context).addRadiologyOrder,
toolbarTitle: TranslationBase.of(context).addRadiologyOrder,
categoryID: "03",
),
AddSelectedRadiologyOrder(

Loading…
Cancel
Save