resolved conflicts

docker/statistics/Modules/Diabetes/Routes/api.php

@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register API routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| is assigned the "api" middleware group. Enjoy building your API!
+|
+*/
+
+Route::middleware('auth:api')->get('/diabetes', function () {
+    return "Diabetes";
+});

docker/statistics/Modules/Diabetes/Routes/web.php

@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['middleware' => ['auth', 'disablebackbutton', 'user-locale','subscription-tracking', 'password-expiry']], function () {
+    /* Diabetes Clinic */
+    Route::any('/diabetes_clinic/follow_up', 'DiabetesClinicController@follow_up')->name('diabetes_clinic.follow_up');
+    Route::any('/diabetes_clinic/save_follow_up', 'DiabetesClinicController@save_follow_up')->name('diabetes_clinic.save_follow_up');
+    Route::any('/diabetes_clinic/follow_up_details/{id}', 'DiabetesClinicController@follow_up_details');
+    Route::any('/diabetes_clinic/get_dispensable_drug_units/{drug_id}', 'DiabetesClinicController@get_dispensable_drug_units');
+    Route::any('/diabetes_clinic/clinic_registration', 'DiabetesClinicController@clinic_registration')->name('diabetes_clinic.clinic_registration');
+    Route::any('/diabetes_clinic/save_clinic_registration', 'DiabetesClinicController@save_clinic_registration')->name('diabetes_clinic.save_clinic_registration');
+});