Merge branch 'hot_fixes' into 'diplomatic-quarter-live'

fix last vital sign data

See merge request Cloud_Solution/diplomatic-quarter!220

lib/core/service/medical/labs_service.dart

@@ -118,7 +118,7 @@ class LabsService extends BaseService {
     _requestSendLabReportEmail.orderDate = '${patientLabOrder.orderDate.year}-${patientLabOrder.orderDate.month}-${patientLabOrder.orderDate.day}';
     _requestSendLabReportEmail.patientMobileNumber = user.mobileNumber;
     _requestSendLabReportEmail.projectName = patientLabOrder.projectName;
-   // _requestSendLabReportEmail.setupID = "010266";
+   _requestSendLabReportEmail.setupID = user.setupID;
 
     await baseAppClient.post(SEND_LAB_RESULT_EMAIL,
         onSuccess: (dynamic response, int statusCode) {

lib/core/service/medical/vital_sign_service.dart

@@ -24,9 +24,17 @@ class VitalSignService extends BaseService {
       response['List_DoctorPatientVitalSign'].forEach((vital) {
         vitalSignResModelList.add(VitalSignResModel.fromJson(vital));
       });
+      bool isHaveWeight = false;
+      bool isHaveHeight = false;
       vitalSignResModelList.forEach((element) {
-        weightKg = '${element.weightKg}';
-        heightCm = '${element.heightCm}';
+        if (element.weightKg != 0 && !isHaveWeight) {
+          weightKg = '${element.weightKg}';
+          isHaveWeight = true;
+        }
+        if (element.heightCm != 0 && !isHaveHeight) {
+          heightCm = '${element.heightCm}';
+          isHaveHeight = true;
+        }
       });
     }, onFailure: (String error, int statusCode) {
       hasError = true;