fixes

lib/screens/patients/patient_search_screen.dart

@@ -93,7 +93,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
           });
           Navigator.of(context).pushNamed(PATIENTS, arguments: {
             "patientSearchForm": _patientSearchFormValues,
-            "selectedType": _selectedType,
+            "selectedType": isView == false ? '0' : _selectedType,
             "isSearch": true,
             "isView": isView
           });

lib/widgets/patients/PatientCard.dart

@@ -214,7 +214,7 @@ class PatientCard extends StatelessWidget {
                               ),
                             ),
                             if (SERVICES_PATIANT2[int.parse(patientType)] !=
-                                "List_InPatient")
+                                "List_MyInPatient")
                               Container(
                                 child: RichText(
                                   text: new TextSpan(
@@ -298,51 +298,52 @@ class PatientCard extends StatelessWidget {
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   mainAxisAlignment: MainAxisAlignment.start,
                                   children: <Widget>[
-                                    Expanded(
-                                      child: AppText(
-                                        TranslationBase.of(context)
-                                                .appointmentDate +
-                                            " : ",
-                                        fontSize: 14,
-                                      ),
+                                    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,
-                                            decoration: BoxDecoration(
-                                              borderRadius:
-                                                  BorderRadius.circular(25),
-                                              color: HexColor("#20A169"),
-                                            ),
-                                            child: AppText(
-                                              patientInfo.startTimes,
-                                              color: Colors.white,
-                                              fontSize: 1.5 *
-                                                  SizeConfig.textMultiplier,
-                                              textAlign: TextAlign.center,
-                                              fontWeight: FontWeight.bold,
-                                            ),
+                                        ?
+                                        //
+                                        //  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,
                                     ),
-                                    Container(
-                                      child: patientInfo.appointmentDate != null
-                                          ? AppText(
-                                              DateUtils
-                                                  .convertDateFromServerFormat(
-                                                      patientInfo
-                                                          .appointmentDate
-                                                          .toString(),
-                                                      'yyyy-MM-dd'),
-                                              fontSize: 1.5 *
-                                                  SizeConfig.textMultiplier,
-                                              fontWeight: FontWeight.bold,
-                                            )
-                                          : SizedBox(),
-                                    ),
+                                    //,
                                     SizedBox(
                                       height: 0.5,
                                     )