hot fixes

merge-requests/549/head
Mohammad Aljammal 5 years ago
parent 584d1e1346
commit c924ea667f

@ -88,7 +88,8 @@ class BaseAppClient {
print("URL : $url");
print("Body : ${json.encode(body)}");
var asd = json.encode(body);
var asd2;
if (await Helpers.checkConnection()) {
final response = await http.post(url,
body: json.encode(body),

@ -540,7 +540,8 @@ class _HomeScreenState extends State<HomeScreen> {
"patientSearchForm":
_patientSearchFormValues,
"selectedType": "0",
"arrivalType": "1"
"arrivalType": "1",
"isInpatient": false
});
},
),

@ -43,7 +43,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
childAspectRatio: 1 / 1.0,
crossAxisCount: 3,
children: [
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -55,7 +55,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine2: TranslationBase.of(context).signs,
route: VITAL_SIGN_DETAILS,
icon: 'patient/vital_signs.png'),
if (selectedPatientType != 7)
// if (selectedPatientType != 7)
PatientProfileButton(
key: key,
patient: patient,
@ -102,7 +102,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'patient/order_prescription.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -112,7 +112,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).procedures,
icon: 'patient/Order_Procedures.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
//if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -122,7 +122,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).insurance,
nameLine2: TranslationBase.of(context).service,
icon: 'patient/vital_signs.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -132,7 +132,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -143,7 +143,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).patient,
nameLine2: TranslationBase.of(context).ucaf,
icon: 'patient/ucaf.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,
@ -154,7 +154,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).referral,
nameLine2: TranslationBase.of(context).patient,
icon: 'patient/refer_patient.png'),
if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton(
key: key,
patient: patient,

@ -127,7 +127,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine1: TranslationBase.of(context).patientSick,
nameLine2: TranslationBase.of(context).leave,
icon: 'patient/patient_sick_leave.png'),
if (patientType == "1")
if (patient.admissionNo!=null && patient.admissionNo!="0")
PatientProfileButton(
key: key,
patient: patient,
@ -138,7 +138,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine2: TranslationBase.of(context).note,
icon: 'patient/Progress_notes.png'),
if (patientType == "1")
if (patient.admissionNo!=null && patient.admissionNo!="0")
PatientProfileButton(
key: key,
patient: patient,
@ -149,7 +149,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
nameLine2: "Sheet",
icon: 'patient/Progress_notes.png'),
if (patientType == "1")
if (patient.appointmentNo!=null && patient.appointmentNo!=0)
PatientProfileButton(
key: key,
patient: patient,

Loading…
Cancel
Save