|
|
|
|
@ -58,7 +58,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
|
height: 10,
|
|
|
|
|
),
|
|
|
|
|
SERVICES_PATIANT2[int.parse(patientType)] ==
|
|
|
|
|
"patientArrivalList"
|
|
|
|
|
"List_MyOutPatient"
|
|
|
|
|
? Padding(
|
|
|
|
|
padding: EdgeInsets.only(left: 12.0),
|
|
|
|
|
child: Row(
|
|
|
|
|
@ -83,7 +83,7 @@ class PatientCard extends StatelessWidget {
|
|
|
|
|
? AppText(
|
|
|
|
|
patientInfo.startTime != null
|
|
|
|
|
? patientInfo.startTime
|
|
|
|
|
: '',
|
|
|
|
|
: patientInfo.startTimes,
|
|
|
|
|
fontFamily: 'Poppins',
|
|
|
|
|
fontWeight: FontWeight.w600,
|
|
|
|
|
)
|
|
|
|
|
@ -253,13 +253,16 @@ class PatientCard extends StatelessWidget {
|
|
|
|
|
),
|
|
|
|
|
children: <TextSpan>[
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text: patientInfo.admissionDate ==null?"":TranslationBase.of(context)
|
|
|
|
|
.admissionDate +
|
|
|
|
|
" : ",
|
|
|
|
|
text: patientInfo.admissionDate == null
|
|
|
|
|
? ""
|
|
|
|
|
: TranslationBase.of(context)
|
|
|
|
|
.admissionDate +
|
|
|
|
|
" : ",
|
|
|
|
|
style: TextStyle(fontSize: 14)),
|
|
|
|
|
new TextSpan(
|
|
|
|
|
text:patientInfo.admissionDate ==null?"":
|
|
|
|
|
"${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
|
|
|
|
|
text: patientInfo.admissionDate == null
|
|
|
|
|
? ""
|
|
|
|
|
: "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
fontWeight: FontWeight.w700,
|
|
|
|
|
fontSize: 15)),
|
|
|
|
|
@ -292,72 +295,72 @@ class PatientCard extends StatelessWidget {
|
|
|
|
|
// top: 8,
|
|
|
|
|
// ),
|
|
|
|
|
// ),
|
|
|
|
|
if (SERVICES_PATIANT2[int.parse(patientType)] ==
|
|
|
|
|
"List_MyOutPatient")
|
|
|
|
|
Container(
|
|
|
|
|
child: Row(
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
AppText(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.appointmentDate +
|
|
|
|
|
" : ",
|
|
|
|
|
fontSize: 14,
|
|
|
|
|
),
|
|
|
|
|
//if (SERVICES_PATIANT2[int.parse(patientType)] ==
|
|
|
|
|
// "List_MyOutPatient")
|
|
|
|
|
// Container(
|
|
|
|
|
// child: Row(
|
|
|
|
|
// crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
// mainAxisAlignment: MainAxisAlignment.start,
|
|
|
|
|
// children: <Widget>[
|
|
|
|
|
// AppText(
|
|
|
|
|
// TranslationBase.of(context)
|
|
|
|
|
// .appointmentDate +
|
|
|
|
|
// " : ",
|
|
|
|
|
// fontSize: 14,
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
|
|
// Container(
|
|
|
|
|
// child:
|
|
|
|
|
patientInfo.appointmentDate != null
|
|
|
|
|
? AppText(
|
|
|
|
|
DateUtils
|
|
|
|
|
.convertDateFromServerFormat(
|
|
|
|
|
patientInfo.appointmentDate
|
|
|
|
|
.toString(),
|
|
|
|
|
'yyyy-MM-dd'),
|
|
|
|
|
fontSize: 12,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
)
|
|
|
|
|
: SizedBox(),
|
|
|
|
|
//),
|
|
|
|
|
patientInfo.startTimes != null
|
|
|
|
|
?
|
|
|
|
|
//
|
|
|
|
|
// Container(
|
|
|
|
|
// // height: 15,
|
|
|
|
|
// // width: 60,
|
|
|
|
|
// padding: EdgeInsets.all(5),
|
|
|
|
|
// decoration: BoxDecoration(
|
|
|
|
|
// borderRadius:
|
|
|
|
|
// BorderRadius.circular(25),
|
|
|
|
|
// color: HexColor("#20A169"),
|
|
|
|
|
// ),
|
|
|
|
|
// child:
|
|
|
|
|
// // Container(
|
|
|
|
|
// // child:
|
|
|
|
|
// patientInfo.appointmentDate != null
|
|
|
|
|
// ? AppText(
|
|
|
|
|
// DateUtils
|
|
|
|
|
// .convertDateFromServerFormat(
|
|
|
|
|
// patientInfo.appointmentDate
|
|
|
|
|
// .toString(),
|
|
|
|
|
// 'yyyy-MM-dd'),
|
|
|
|
|
// fontSize: 12,
|
|
|
|
|
// fontWeight: FontWeight.bold,
|
|
|
|
|
// )
|
|
|
|
|
// : SizedBox(),
|
|
|
|
|
// //),
|
|
|
|
|
// patientInfo.startTimes != null
|
|
|
|
|
// ?
|
|
|
|
|
// //
|
|
|
|
|
// // Container(
|
|
|
|
|
// // // height: 15,
|
|
|
|
|
// // // width: 60,
|
|
|
|
|
// // padding: EdgeInsets.all(5),
|
|
|
|
|
// // decoration: BoxDecoration(
|
|
|
|
|
// // borderRadius:
|
|
|
|
|
// // BorderRadius.circular(25),
|
|
|
|
|
// // color: HexColor("#20A169"),
|
|
|
|
|
// // ),
|
|
|
|
|
// // child:
|
|
|
|
|
|
|
|
|
|
AppText(
|
|
|
|
|
' ' + patientInfo.startTimes,
|
|
|
|
|
fontSize: 11,
|
|
|
|
|
fontWeight: FontWeight.bold,
|
|
|
|
|
)
|
|
|
|
|
//)
|
|
|
|
|
: SizedBox(),
|
|
|
|
|
SizedBox(
|
|
|
|
|
width: 3.5,
|
|
|
|
|
),
|
|
|
|
|
//,
|
|
|
|
|
SizedBox(
|
|
|
|
|
height: 0.5,
|
|
|
|
|
)
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
top: 8,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
// AppText(
|
|
|
|
|
// ' ' + patientInfo.startTimes,
|
|
|
|
|
// fontSize: 11,
|
|
|
|
|
// fontWeight: FontWeight.bold,
|
|
|
|
|
// )
|
|
|
|
|
// //)
|
|
|
|
|
// : SizedBox(),
|
|
|
|
|
// SizedBox(
|
|
|
|
|
// width: 3.5,
|
|
|
|
|
// ),
|
|
|
|
|
// //,
|
|
|
|
|
// SizedBox(
|
|
|
|
|
// height: 0.5,
|
|
|
|
|
// )
|
|
|
|
|
// ],
|
|
|
|
|
// ),
|
|
|
|
|
// margin: EdgeInsets.only(
|
|
|
|
|
// top: 8,
|
|
|
|
|
// ),
|
|
|
|
|
//)
|
|
|
|
|
]))
|
|
|
|
|
]),
|
|
|
|
|
SERVICES_PATIANT2[int.parse(patientType)] ==
|
|
|
|
|
"patientArrivalList"
|
|
|
|
|
"List_MyOutPatient"
|
|
|
|
|
? Row(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.end,
|
|
|
|
|
children: [
|
|
|
|
|
|