fix main issues

lib/screens/patients/profile/UCAF/UCAF-input-screen.dart

@@ -38,6 +38,8 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
   final _whereController = TextEditingController();
   final _managementsLineController = TextEditingController();
   final _signsController = TextEditingController();
+
+  ///TODO Elham* fix this
   List<Map> conditionsData = [
     {"name": "CHRONIC", "isChecked": false},
     {"name": "RTA", "isChecked": false},
@@ -383,7 +385,7 @@ class _UCAFInputScreenState extends State<UCAFInputScreen> {
                         error: model.patientVitalSignsHistory == null ||
                                 model.patientVitalSignsHistory.length == 0
                             ? TranslationBase.of(context).vitalSignEmptyMsg
-                            : TranslationBase.of(context)))
+                            : TranslationBase.of(context).chiefComplaintEmptyMsg))
                 : Container(),
       ),
     );

lib/screens/prescription/drugtodrug.dart

@@ -28,6 +28,7 @@ class DrugToDrug extends StatefulWidget {
 class _DrugToDrug extends State<DrugToDrug> {
   int typeID = 1;
   bool isLoaded = false;
+  /// TODO Elham* fix this
   List<Map<dynamic, dynamic>> expandableList = [
     {'name': 'CRITICAL', 'level': 'LEVEL_4'},
     {'name': 'HIGH', 'level': 'LEVEL_3'},
@@ -35,15 +36,7 @@ class _DrugToDrug extends State<DrugToDrug> {
     {'name': 'LOW', 'level': 'LEVEL_1'},
     {'name': 'INFO', 'level': 'INFO'},
   ];
-  GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
-      patientMRN: 2954208,
-      //widget.patient.patientMRN,
-      episodeId: 210011002,
-      //widget.patient.episodeNo,
-      appointmentNo: 2016055308,
-      //widget.patient.appointmentNo,
-      doctorID: '',
-      editedBy: '');
+
 
   VitalSignsViewModel model = new VitalSignsViewModel();
   SOAPViewModel model2 = new SOAPViewModel();
@@ -115,6 +108,15 @@ class _DrugToDrug extends State<DrugToDrug> {
 
   getRequestedData() async {
 
+
+    GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
+      /// TODO Elham* fix this today
+        patientMRN: widget.patient.patientMRN,
+        episodeId: widget.patient.episodeNo,
+        appointmentNo:
+        widget.patient.appointmentNo,
+        doctorID: '',
+        editedBy: '');
     /// TODO Elham* rename model to meaning full not just modle with number
 
     await model.getPatientVitalSign(widget.patient);

lib/widgets/shared/user-guid/CusomRow.dart

@@ -38,6 +38,7 @@ class CustomRow extends StatelessWidget {
           width: 1,
         ),
         Expanded(
+          flex: 0,
           child: AppText(
             value,
             fontSize: