Merge branch 'fix-issues' into 'development'

jira bug fixing

See merge request Cloud_Solution/doctor_app_flutter!312

lib/screens/prescription/prescription_screen.dart

@@ -214,16 +214,16 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
                                                                               0]
                                                                           .entityList[
                                                                               index]
-                                                                          .startDate)
+                                                                          .createdOn)
                                                                       .day
                                                                       .toString(),
                                                                   color: Colors
                                                                       .green,
                                                                 ),
                                                                 AppText(
-                                                                  Helpers.getMonth(model.prescriptionList[0].entityList[index].startDate !=
+                                                                  Helpers.getMonth(model.prescriptionList[0].entityList[index].createdOn !=
                                                                               null
-                                                                          ? (DateTime.parse(model.prescriptionList[0].entityList[index].startDate)
+                                                                          ? (DateTime.parse(model.prescriptionList[0].entityList[index].createdOn)
                                                                               .month)
                                                                           : DateTime.now()
                                                                               .month)
@@ -261,9 +261,13 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
                                                                       child:
                                                                           AppText(
                                                                         model
-                                                                            .prescriptionList[0]
+                                                                            .prescriptionList[
-                                                                            .entityList[index]
+                                                                                0]
-                                                                            .startDate,
+                                                                            .entityList[
+                                                                                index]
+                                                                            .startDate
+                                                                            .replaceAll("-",
+                                                                                "/"),
                                                                         fontSize:
                                                                             12.0,
                                                                       ),