Merge branch 'fix-issues' into 'development'

add prescription & add lab test changes

See merge request Cloud_Solution/doctor_app_flutter!461

lib/screens/procedures/entity_list_checkbox_search_widget.dart

@@ -133,47 +133,56 @@ class _EntityListCheckboxSearchWidgetState
                                           child: Row(
                                             children: [
                                               AppText(
-                                                  TranslationBase.of(context)
-                                                      .orderType),
-                                              Radio(
-                                                activeColor: Color(0xFFB9382C),
-                                                value: 0,
-                                                groupValue: selectedType,
-                                                onChanged: (value) {
-                                                  historyInfo.type =
-                                                      setSelectedType(value)
-                                                          .toString();
-
-                                                  historyInfo.type =
-                                                      value.toString();
-                                                },
+                                                TranslationBase.of(context)
+                                                    .orderType,
+                                                fontWeight: FontWeight.w700,
                                               ),
-                                              Text('routine'),
-                                              Radio(
-                                                activeColor: Color(0xFFB9382C),
-                                                groupValue: selectedType,
-                                                value: 1,
-                                                onChanged: (value) {
-                                                  historyInfo.type =
-                                                      setSelectedType(value)
-                                                          .toString();
+                                              Row(
+                                                children: [
+                                                  Radio(
+                                                    activeColor:
+                                                        Color(0xFFB9382C),
+                                                    value: 0,
+                                                    groupValue: selectedType,
+                                                    onChanged: (value) {
+                                                      historyInfo.type =
+                                                          setSelectedType(value)
+                                                              .toString();
+
+                                                      historyInfo.type =
+                                                          value.toString();
+                                                    },
+                                                  ),
+                                                  Text('routine'),
+                                                  Radio(
+                                                    activeColor:
+                                                        Color(0xFFB9382C),
+                                                    groupValue: selectedType,
+                                                    value: 1,
+                                                    onChanged: (value) {
+                                                      historyInfo.type =
+                                                          setSelectedType(value)
+                                                              .toString();
 
-                                                  historyInfo.type =
-                                                      value.toString();
-                                                },
+                                                      historyInfo.type =
+                                                          value.toString();
+                                                    },
+                                                  ),
+                                                  Text(TranslationBase.of(
+                                                          context)
+                                                      .urgent),
+                                                ],
                                               ),
-                                              Text(TranslationBase.of(context)
-                                                  .urgent),
                                             ],
                                           ),
                                         ),
                                       ),
                                       SizedBox(
-                                        height: 15.0,
+                                        height: 2.0,
                                       ),
                                       Padding(
                                         padding: EdgeInsets.symmetric(
-                                            horizontal: 12),
+                                            horizontal: 12, vertical: 12.0),
                                         child: TextFields(
                                           hintText: TranslationBase.of(context)
                                               .remarks,