Merge branch 'favorite_procedure_templates' into 'development'

fix lab result

See merge request Cloud_Solution/doctor_app_flutter!705
merge-requests/706/merge
Mohammad Aljammal 5 years ago
commit d2dac36bd2

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

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

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

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

Loading…
Cancel
Save