diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..58bdec2c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,30 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.  
+
+# Type of change  
+
+- [ ] Bug fix  
+- [ ] New feature  
+- [ ] Enhancement  
+- [ ] Refactoring  
+- [ ] Documentation  
+- [ ] Other ( please specify )  
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+
diff --git a/.github/workflows/package-prod.yml b/.github/workflows/package-prod.yml
new file mode 100644
index 00000000..77c2c08e
--- /dev/null
+++ b/.github/workflows/package-prod.yml
@@ -0,0 +1,41 @@
+name: Package-prod
+
+on:
+  push:
+    branches: [ "master"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "master" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: prod
+
+jobs:
+  Package-prod:
+    runs-on: ubuntu-latest
+    steps:
+    
+    - name: Checkout code
+      uses: actions/checkout@v3
+      
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+        
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Create WAR file 
+      run: mvn -B package --file pom.xml
+      
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Common-API
+        path: target/commonapi-v1.0.war
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
new file mode 100644
index 00000000..ce0f3867
--- /dev/null
+++ b/.github/workflows/package.yml
@@ -0,0 +1,42 @@
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+      
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+        
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+        
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Common-API
+        path: target/commonapi-v1.0.war
+
diff --git a/.github/workflows/sast-and-package.yml b/.github/workflows/sast-and-package.yml
index 018ffc71..4ac6bca8 100644
--- a/.github/workflows/sast-and-package.yml
+++ b/.github/workflows/sast-and-package.yml
@@ -1,10 +1,21 @@
-name: Static Code Analysis and Packaging
+name: Package
+
 on:
   push:
-    branches: [ "master","develop" ]
-    
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+     
+env:
+  ENV_VAR: test
+
 jobs:
-  CodeQL:
+  Package-test:
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -14,39 +25,25 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+    
     - name: Checkout code 
       uses: actions/checkout@v2
+
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: Java    
+        
     - name: Build with Maven
-      run: mvn clean install
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        languages: Java   
-    
-  Packaging:
-    needs: codeql
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-    - name: Create WAR file 
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+      
+    - name: Build WAR file
       run: mvn -B package --file pom.xml
+      
     - name: Upload WAR file as artifact
       uses: actions/upload-artifact@v2 
       with:
         name: Common-API
-        path: target/commonapi-v1.0.war  
+        path: target/commonapi-v1.0.war
+
diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
new file mode 100644
index 00000000..1b3793bc
--- /dev/null
+++ b/.github/workflows/sast.yml
@@ -0,0 +1,52 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+     
+  pull_request:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+       
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+          java-version: 8
+          distribution: 'adopt'
+       
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.gitignore b/.gitignore
index c0f949c7..a0ab8f9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,8 @@ logs/
 # Ignore specific files
 swaasaPathcoughSoundAssessment1234567890121678177840715.wav
 replay_pid89928.log
-hs_err_pid89928.log
\ No newline at end of file
+hs_err_pid89928.log
+
+# Properties
+src/main/environment/common_local.properties
+
diff --git a/README.md b/README.md
index 24990d1e..82984715 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # AMRIT - Common Service 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  ![branch parameter](https://github.com/PSMRI/Common-API/actions/workflows/sast-and-package.yml/badge.svg) 
+
 
 Common API is a microservice whch acts as a gateway for AMRIT. There are many APIs that are exposed by Common-API. It contains APIs of common integrators like c-Zentrix, Everwell, Openkm and some master APIs like location master, alerts,  notification,language and location messages.
 ### Primary Features
diff --git a/pom.xml b/pom.xml
index 900e401d..fa77295b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<!-- <artifactId>iemr_1097</artifactId> <packaging>war</packaging> <name>1097 
-		services</name> <description></description> <url></url> <version>1.0</version> -->
-
+	
 	<groupId>com.iemr.common-API</groupId>
 	<artifactId>Common</artifactId>
 	<version>1.0.1</version>
@@ -28,7 +26,7 @@
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
 		<final-name>commonapi-v1.0</final-name>
-		<environment>dev</environment>
+		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<hostname-dev>10.208.122.32</hostname-dev>
@@ -51,6 +49,18 @@
 	</repositories>
 	<dependencies>
 
+		<dependency>
+		<groupId>org.apache.httpcomponents</groupId>
+		<artifactId>httpclient</artifactId>
+		
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/xmlpull/xmlpull -->
+<dependency>
+    <groupId>xmlpull</groupId>
+    <artifactId>xmlpull</artifactId>
+    <version>1.1.3.1</version>
+</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -83,13 +93,11 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 
-		<!-- JSTL -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 		</dependency>
 
-		<!-- Need this to compile JSP -->
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-jasper</artifactId>
@@ -101,13 +109,11 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -161,7 +167,6 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<!-- <version>2.6.1</version> -->
 			<version>2.8.0</version>
-			<!-- <scope>compile</scope> -->
 			<exclusions>
 				<exclusion>
 					<groupId>org.mapstruct</groupId>
@@ -269,11 +274,6 @@
 			<artifactId>byte-buddy</artifactId>
 			<version>1.7.9</version>
 		</dependency>
-
-		<!-- <dependency> <groupId>org.objenesis</groupId> <artifactId>objenesis</artifactId> 
-			<version>2.1</version> <scope>runtime</scope> </dependency> -->
-
-		<!-- Below dependencies are added for doing dbunit testing -->
 		<dependency>
 			<groupId>org.dbunit</groupId>
 			<artifactId>dbunit</artifactId>
@@ -292,8 +292,6 @@
 			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
-		<!-- DB Unit testing comoponents end -->
-		<!-- Spring security components Start -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
@@ -304,34 +302,28 @@
 			<artifactId>spring-security-config</artifactId>
 			<version>5.0.0.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
-		<!-- Spring security components End -->
-		<!-- Lobmok and mapper dependencies start -->
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<!-- <scope>provided</scope> <optional>true</optional> -->
 		</dependency>
 		<dependency>
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct-jdk8</artifactId>
 			<version>${org.mapstruct.version}</version>
-			<!-- <scope>provided</scope> -->
 		</dependency>
 		<dependency>
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct-processor</artifactId>
 			<version>${org.mapstruct.version}</version>
-			<!-- <scope>provided</scope> -->
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
-			<!-- <scope>runtime</scope> -->
 		</dependency>
+			<!-- <scope>runtime</scope> -->
 		<!-- Excel -->
 		
-
 <dependency>
     <groupId>org.apache.poi</groupId>
     <artifactId>poi-ooxml</artifactId>
@@ -344,11 +336,8 @@
     <version>5.0.0</version>
 </dependency>
 
-		<!-- lombok and mapper dependencies end -->
 	</dependencies>
 
-	
-
 	<build>
 		<finalName>commonapi-v1.0</finalName>
 		<plugins>
@@ -357,32 +346,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.0.2</version>
 			</plugin>
-		<!--	<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.4</version>
-				<executions>
-					<execution>
-						<id>get-the-git-infos</id>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-					<prefix>git</prefix>
-					<verbose>false</verbose>
-					<generateGitPropertiesFile>true</generateGitPropertiesFile>
-					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-					<format>json</format>
-					<gitDescribe>
-						<skip>false</skip>
-						<always>false</always>
-						<dirty>-dirty</dirty>
-					</gitDescribe>
-				</configuration>
-			</plugin> -->
+		
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -437,52 +401,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.wildfly.plugins</groupId>
-				<artifactId>wildfly-maven-plugin</artifactId>
-				<version>1.2.1.Final</version>
-				<configuration>
-					<echo>
-						${server-id}
-						$${server-hostname}
-						$${server-port}
-					</echo>
-					<id>${server-id}</id>
-					<hostname>$${server-hostname}</hostname>
-					<port>$${server-port}</port>
-					<username>piramaltest</username>
-					<password>buildrele@se@56</password>
-				</configuration>
-				<executions>
-					 <execution> <id>Undeploy-clean</id> <phase>clean</phase> <goals> 
-						<goal>undeploy</goal> </goals> </execution> 
-					 <execution> <id>Shutdown-clean</id> <phase>clean</phase> <goals> 
-						<goal>shutdown</goal> </goals> </execution> 
-					<execution>
-						<id>Undeploy</id>
-						<phase>install</phase>
-						<goals>
-							<goal>undeploy</goal>
-						</goals>
-					</execution>
-					 <execution> <id>Shutdown</id> <phase>install</phase> <goals> <goal>shutdown</goal> 
-						</goals> </execution> 
-					<execution>
-						<id>Install</id>
-						<phase>install</phase>
-						<goals>
-							<goal>deploy</goal>
-						</goals>
-					</execution>
-					< execution>
-						<id>Start</id>
-						<phase>install</phase>
-						<goals>
-							<goal>start</goal>
-						</goals>
-					</execution >
-				</executions>
-			</plugin> -->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -492,12 +410,6 @@
 				</configuration>
 			</plugin>
 
-<!-- 			<plugin> -->
-<!-- 				<groupId>com.github.ulisesbocchio</groupId> -->
-<!-- 				<artifactId>jasypt-maven-plugin</artifactId> -->
-<!-- 				<version>3.0.3</version> -->
-<!-- 			</plugin> -->
-
 		</plugins>
 	</build>
 	<reporting>
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
index dd232803..a306e9b2 100644
--- a/src/main/environment/common_dev.properties
+++ b/src/main/environment/common_dev.properties
@@ -3,6 +3,17 @@
 spring.jpa.database=default
 
 ## Primary db
+<<<<<<< HEAD
+spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
+spring.datasource.username=<Enter your AMRIT DB_IEMR username>
+spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+## Secondary db
+secondary.datasource.username=<Enter your DB_REPORTING username>
+secondary.datasource.password=<Enter your DB_REPORTING password>
+secondary.datasource.url=<Enter DB_REPORTING URL here>
+=======
 encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
 spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_iemr?autoReconnect=true&useSSL=false
@@ -12,6 +23,7 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 encDbUserNameSec=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPassSec=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
 secondary.datasource.url=jdbc:mysql://10.208.122.32:3306/db_reporting?autoReconnect=true&useSSL=false
+>>>>>>> 2c9c4f37f670158e36f1413a3817860f795b13db
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # KM config
@@ -24,9 +36,8 @@ cti-logger_base_url=http://10.208.122.99/logger
 
 # Identity Config
 
-identity-api-url=http://10.208.122.32:8080
-#identity-api-url=http://10.208.122.32:8080/hwc-identity-0.0.1
-identity-1097-api-url=http://10.208.122.32:8080/1097identityapi-v1.0
+identity-api-url=<Enter your socket address here>
+identity-1097-api-url=<Enter your socket address here>/1097identityapi-v1.0
 
 #### SMS Configuration
 send-sms=true
@@ -51,7 +62,7 @@ start-avni-scheduler=false
 cron-avni-registration=0 0/1 * * * ? *
 
 ### generate Beneficiary Config
-genben-api=http://10.208.122.32:8080/bengenapi-v1.0
+genben-api=<Enter your socket address here>/bengenapi-v1.0
 
 ### Redis IP
 spring.redis.host=localhost
@@ -81,3 +92,7 @@ callRetryConfiguration=3
 
 #avni registration Duration
 avniRegistrationLimit=7
+
+
+
+
diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties
index 8f19692b..fa714013 100644
--- a/src/main/environment/common_local.properties
+++ b/src/main/environment/common_local.properties
@@ -1,10 +1,21 @@
-# dev env 
+# local env 
 # DB Connections 
+<<<<<<< HEAD
+spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
+spring.datasource.username=<Enter your AMRIT DB_IEMR username>
+spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+=======
 spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr?autoReconnect=true&useSSL=false
 encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
+>>>>>>> 2c9c4f37f670158e36f1413a3817860f795b13db
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
+secondary.datasource.username=<Enter your DB_REPORTING username>
+secondary.datasource.password=<Enter your DB_REPORTING password>
+secondary.datasource.url=<Enter DB_REPORTING URL here>
+secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
+
 # KM config
 km-base-url=http://10.208.122.38:8084/OpenKM
 km-base-path=10.208.122.38:8084/OpenKM
@@ -14,8 +25,8 @@ cti-server-ip=10.208.122.99
 cti-logger_base_url=http://10.208.122.99/logger
 
 # Identity Config
-identity-api-url = http://10.208.122.38:8080/identity-0.0.1
-identity-1097-api-url = http://10.208.122.38:8080/1097identityapi-v1.0
+identity-api-url = http://localhost:8080/identity-0.0.1
+identity-1097-api-url = http://localhost:8080/1097identityapi-v1.0
 
 #### SMS Configuration
 send-sms=false
@@ -32,10 +43,11 @@ start-email-scheduler=true
 cron-scheduler-email=0 0/1 * * * ? *
 
 ### generate Beneficiary Config
-genben-api=http://10.208.122.38:8080/bengenapi-v1.0
+genben-api=http://localhost:8080/bengenapi-v1.0
 
 ### Redis IP
 spring.redis.host=localhost
 #snomedcti
 snomedCTPageSize=10
 ##missing commits
+
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
index f089c3fb..d69feebb 100644
--- a/src/main/environment/common_test.properties
+++ b/src/main/environment/common_test.properties
@@ -5,16 +5,28 @@ spring.jpa.database=default
 ##--------------------------------------------## Primary db-------------------------------------------------------------------
 
 
+<<<<<<< HEAD
+spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
+spring.datasource.username=<Enter your AMRIT DB_IEMR username>
+spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+=======
 encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
 spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_iemr?autoReconnect=true&useSSL=false
+>>>>>>> 2c9c4f37f670158e36f1413a3817860f795b13db
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
 
+<<<<<<< HEAD
+secondary.datasource.username=<Enter your DB_REPORTING username>
+secondary.datasource.password=<Enter your DB_REPORTING password>
+secondary.datasource.url=<Enter DB_REPORTING URL here>
+=======
 encDbUserNameSec=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPassSec=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
 secondary.datasource.url=jdbc:mysql://10.208.122.38:3306/db_reporting?autoReconnect=true&useSSL=false
+>>>>>>> 2c9c4f37f670158e36f1413a3817860f795b13db
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 ##-------------------------------------------------------------# KM config--------------------------------------------------
 
@@ -26,11 +38,11 @@ cti-server-ip=10.208.122.99
 cti-logger_base_url=http://10.208.122.99/logger
 ##-------------------------------------------------#### Identity Config--------------------------------------------------------------
 
-identity-api-url=http://10.208.122.38:8080/identity-0.0.1
-identity-1097-api-url=http://10.208.122.38:8080/1097identityapi-v1.0
+identity-api-url=<Enter your socket address here>/identity-0.0.1
+identity-1097-api-url=<Enter your socket address here>/1097identityapi-v1.0
 
 ### generate Beneficiary Config
-genben-api=http://10.208.122.38:8080/bengenapi-v1.0
+genben-api=<Enter your socket address here>/bengenapi-v1.0
 
 ##---------------------------------------------#### SMS Configuration------------------------------------------------------------------
 
@@ -63,16 +75,10 @@ cron-scheduler-registration=0 34 19 * * ? *
 start-everwelldatasync-scheduler=false
 cron-scheduler-everwelldatasync=0 0/5 * * * ? *
 ##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
-#run in every 2 hrs
+# run at everyday 12:01AM
 start-nhmdashboard-scheduler=true
-cron-scheduler-nhmdashboard=0 0 0/2 * * ? *
+cron-scheduler-nhmdashboard=0 1 * * * ? *
 
-
-## how much old data it should fetch
-## n day / n hour // n min
-get-agent-summary-report-job=2 hour
-## n day / n hour // n min
-get-details-call-report-job=2 hour
 ##-------------------------------------------------### Redis IP--------------------------------------------------------------
 
 spring.redis.host=localhost
@@ -99,7 +105,11 @@ callRetryConfiguration=3
 #avni registration Duration
 avniRegistrationLimit=7
 
+#--------------------------NHM Agent Real Time Data----------------------------
+nhm.agent.real.time.data.url= http://175.101.1.83/apps/utility/alive_api.php
+nhm.agent.real.time.data.cron.scheduler=0 */2 * ? * *
+nhm.agent.real.time.data.cron.flag=true
 
-
-
-
+biometric.discover.url = http://127.0.0.1:port/
+biometric.deviceInfo.url = https://127.0.0.1:port/rd/info
+biometric.capture.url = https://127.0.0.1:port/rd/capture
\ No newline at end of file
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
index f666ef81..2249d9d7 100644
--- a/src/main/environment/common_uat.properties
+++ b/src/main/environment/common_uat.properties
@@ -1,11 +1,22 @@
 
 # UAT env 
 # DB Connections 
+<<<<<<< HEAD
+spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
+spring.datasource.username=<Enter your AMRIT DB_IEMR username>
+spring.datasource.password=<Enter your AMRIT DB_IEMR password>
+=======
 spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_iemr?autoReconnect=true&useSSL=false
 encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
 encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
+>>>>>>> 2c9c4f37f670158e36f1413a3817860f795b13db
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
+secondary.datasource.username=<Enter your DB_REPORTING username>
+secondary.datasource.password=<Enter your DB_REPORTING password>
+secondary.datasource.url=<Enter DB_REPORTING URL here>
+secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
+
 # KM config
 km-base-url=http://172.16.19.40:8084/OpenKM
 km-base-path=deviemr.piramalswasthya.org:8084/OpenKM
@@ -15,8 +26,8 @@ cti-server-ip=172.16.19.47
 cti-logger_base_url=http://helplines.piramalswasthya.org/logger
 
 # Identity Config
-identity-api-url = http://172.16.19.40:8080/identity-0.0.1
-identity-1097-api-url = http://172.16.19.40:8080/1097identityapi-v1.0
+identity-api-url = <Enter your socket address here>/identity-0.0.1
+identity-1097-api-url = <Enter your socket address here>/1097identityapi-v1.0
 
 #### SMS Configuration
 send-sms=true
@@ -33,7 +44,7 @@ start-email-scheduler=true
 cron-scheduler-email=0 0/1 * * * ? *
 
 ### generate Beneficiary IDs URL
-genben-api=http://172.16.19.40:8080/bengenapi-v1.0
+genben-api=<Enter your socket address here>/bengenapi-v1.0
 
 ### Redis IP
 spring.redis.host=localhost
diff --git a/src/main/java/com/iemr/common/CommonApplication.java b/src/main/java/com/iemr/common/CommonApplication.java
index c93f50f5..92d9e8f7 100644
--- a/src/main/java/com/iemr/common/CommonApplication.java
+++ b/src/main/java/com/iemr/common/CommonApplication.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common;
 
 import org.springframework.boot.SpringApplication;
@@ -5,33 +26,31 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
 
 import com.iemr.common.utils.IEMRApplBeans;
 
-/**
- * @author VI314759
- *
- */
 @SpringBootApplication
+@EnableScheduling
 public class CommonApplication extends SpringBootServletInitializer {
-	/**
-	 * @return
-	 */
+
 	@Bean
 	public IEMRApplBeans instantiateBeans() {
 		return new IEMRApplBeans();
 	}
 
-	/**
-	 * @param args
-	 */
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+    
 	public static void main(String[] args) {
-		SpringApplication.run(commonApplication, args);
+		SpringApplication.run(CommonApplication.class, args);
 	}
 
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 		return application.sources(new Class[] { CommonApplication.class });
 	}
 
-	private static Class<CommonApplication> commonApplication = CommonApplication.class;
 }
diff --git a/src/main/java/com/iemr/common/config/InterceptorConfig.java b/src/main/java/com/iemr/common/config/InterceptorConfig.java
index 89ebb855..0a325bba 100644
--- a/src/main/java/com/iemr/common/config/InterceptorConfig.java
+++ b/src/main/java/com/iemr/common/config/InterceptorConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/config/PrimaryDBConfig.java b/src/main/java/com/iemr/common/config/PrimaryDBConfig.java
index ef07fabb..a115b0f3 100644
--- a/src/main/java/com/iemr/common/config/PrimaryDBConfig.java
+++ b/src/main/java/com/iemr/common/config/PrimaryDBConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import javax.persistence.EntityManagerFactory;
@@ -28,9 +49,11 @@
 @EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = { "com.iemr.common.repository",
 		"com.iemr.common.repo", "com.iemr.common.notification.agent", "com.iemr.common.covidVaccination" })
 public class PrimaryDBConfig {
+
 	
 	@Autowired
 	private CryptoUtil cryptoUtil;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Primary
@@ -52,10 +75,8 @@ public DataSource dataSource() {
 		org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
 		datasource.setPoolProperties(p);
 
-		
-
-		datasource.setUsername(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbUserName")));
-		datasource.setPassword(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbPass")));
+		datasource.setUsername(ConfigProperties.getPropertyByName("spring.datasource.username"));
+		datasource.setPassword(ConfigProperties.getPropertyByName("spring.datasource.password"));
 
 		return datasource;
 	}
diff --git a/src/main/java/com/iemr/common/config/RedisConfig.java b/src/main/java/com/iemr/common/config/RedisConfig.java
index 97191ab0..ae1519e0 100644
--- a/src/main/java/com/iemr/common/config/RedisConfig.java
+++ b/src/main/java/com/iemr/common/config/RedisConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/com/iemr/common/config/ScheduleJob.java b/src/main/java/com/iemr/common/config/ScheduleJob.java
index 164e1ef4..c5e5053a 100644
--- a/src/main/java/com/iemr/common/config/ScheduleJob.java
+++ b/src/main/java/com/iemr/common/config/ScheduleJob.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/SecondaryDBConfig.java b/src/main/java/com/iemr/common/config/SecondaryDBConfig.java
index 980da8b4..3fab13e8 100644
--- a/src/main/java/com/iemr/common/config/SecondaryDBConfig.java
+++ b/src/main/java/com/iemr/common/config/SecondaryDBConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import javax.persistence.EntityManagerFactory;
@@ -7,9 +28,7 @@
 import org.apache.tomcat.jdbc.pool.PoolProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
@@ -20,65 +39,51 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import com.iemr.common.utils.CryptoUtil;
 import com.iemr.common.utils.config.ConfigProperties;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories(
-  entityManagerFactoryRef = "secondaryEntityManagerFactory",
-  transactionManagerRef = "secondaryTransactionManager",
-  basePackages = { "com.iemr.common.secondary.repository.callreport" }
-)
+@EnableJpaRepositories(entityManagerFactoryRef = "secondaryEntityManagerFactory", transactionManagerRef = "secondaryTransactionManager", basePackages = {
+		"com.iemr.common.secondary.repository.callreport" })
 public class SecondaryDBConfig {
-	
-	@Autowired
-	private CryptoUtil cryptoUtil;
-	
+
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
 	@Bean(name = "secondaryDataSource")
-	  @ConfigurationProperties(prefix = "secondary.datasource")
-	  public DataSource dataSource() {
-		 PoolConfiguration p = new PoolProperties();
-		  p.setMaxActive(30);
-		  p.setMaxIdle(15);
-		  p.setMinIdle(5);
-		  p.setInitialSize(5);
-		  p.setMaxWait(10000);
-		  p.setMinEvictableIdleTimeMillis(15000);
-		  p.setRemoveAbandoned(true);
-		  p.setLogAbandoned(true);
-		  p.setRemoveAbandonedTimeout(600);
-		  p.setTestOnBorrow(true);
-		  p.setValidationQuery("SELECT 1");
-		  org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
-		  datasource.setPoolProperties(p);
-		  
+	@ConfigurationProperties(prefix = "secondary.datasource")
+	public DataSource dataSource() {
+		PoolConfiguration p = new PoolProperties();
+		p.setMaxActive(30);
+		p.setMaxIdle(15);
+		p.setMinIdle(5);
+		p.setInitialSize(5);
+		p.setMaxWait(10000);
+		p.setMinEvictableIdleTimeMillis(15000);
+		p.setRemoveAbandoned(true);
+		p.setLogAbandoned(true);
+		p.setRemoveAbandonedTimeout(600);
+		p.setTestOnBorrow(true);
+		p.setValidationQuery("SELECT 1");
+		org.apache.tomcat.jdbc.pool.DataSource datasource = new org.apache.tomcat.jdbc.pool.DataSource();
+		datasource.setPoolProperties(p);
 
-			datasource.setUsername(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbUserNameSec")));
-			datasource.setPassword(cryptoUtil.decrypt(ConfigProperties.getPropertyByName("encDbPassSec")));
-		  
-	    return datasource;
-	  }
-	  
-	  @Bean(name = "secondaryEntityManagerFactory")
-	  public LocalContainerEntityManagerFactoryBean 
-	  barEntityManagerFactory(
-	    EntityManagerFactoryBuilder builder,
-	    @Qualifier("secondaryDataSource") DataSource dataSource
-	  ) {
-	    return
-	      builder
-	        .dataSource(dataSource)
-	        .packages("common.iemr.common.secondary.data.report")
-	        .persistenceUnit("db_reporting")
-	        .build();
-	  }
-	  @Bean(name = "secondaryTransactionManager")
-	  public PlatformTransactionManager barTransactionManager(
-	    @Qualifier("secondaryEntityManagerFactory") EntityManagerFactory
-	    secondaryEntityManagerFactory
-	  ) {
-	    return new JpaTransactionManager(secondaryEntityManagerFactory);
-	  }
-}
+		datasource.setUsername(ConfigProperties.getPropertyByName("secondary.datasource.username"));
+		datasource.setPassword(ConfigProperties.getPropertyByName("secondary.datasource.password"));
+
+		return datasource;
+	}
+
+	@Bean(name = "secondaryEntityManagerFactory")
+	public LocalContainerEntityManagerFactoryBean barEntityManagerFactory(EntityManagerFactoryBuilder builder,
+			@Qualifier("secondaryDataSource") DataSource dataSource) {
+		return builder.dataSource(dataSource).packages("common.iemr.common.secondary.data.report")
+				.persistenceUnit("db_reporting").build();
+	}
+
+	@Bean(name = "secondaryTransactionManager")
+	public PlatformTransactionManager barTransactionManager(
+			@Qualifier("secondaryEntityManagerFactory") EntityManagerFactory secondaryEntityManagerFactory) {
+		return new JpaTransactionManager(secondaryEntityManagerFactory);
+	}
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/config/SwaggerConfig.java b/src/main/java/com/iemr/common/config/SwaggerConfig.java
index f5563bf0..2757fbf9 100644
--- a/src/main/java/com/iemr/common/config/SwaggerConfig.java
+++ b/src/main/java/com/iemr/common/config/SwaggerConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config;
 
 import org.springframework.context.annotation.Bean;
@@ -26,10 +47,10 @@ public Docket productApi()
 	private ApiInfo metaData()
 	{
 		ApiInfoBuilder builder = new ApiInfoBuilder();
-		builder.contact(new Contact("Wipro HCIT", "https://www.wipro.com", "mywipro@wipro.com"));
-		builder.description("Common APIs for AMRIT");
+		builder.contact(new Contact("AMRIT", "https://psmri.github.io/PSMRI/", "amrit@piramalswasthya.org"));
+		builder.description("Common services that are used across various AMRIT modules are encapsulated in common-api. Integrations like DMS, call centre to AMRIT are through common-api service.");
 		builder.version("1.0");
-		builder.title("Common APIs for AMRIT");
+		builder.title("Common API");
 		return builder.build();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/config/encryption/SecurePassword.java b/src/main/java/com/iemr/common/config/encryption/SecurePassword.java
index d15dbbcb..15463b7a 100644
--- a/src/main/java/com/iemr/common/config/encryption/SecurePassword.java
+++ b/src/main/java/com/iemr/common/config/encryption/SecurePassword.java
@@ -1,6 +1,28 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.encryption;
 
 import java.math.BigInteger;
+
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
@@ -11,45 +33,99 @@
 import org.springframework.stereotype.Service;
 
 @Service
-public class SecurePassword
-{
-	public String generateStrongPassword(String password) throws NoSuchAlgorithmException, InvalidKeySpecException
-	{
-		int iterations = 1000;
+public class SecurePassword {
+	public String generateStrongPassword(String password) throws NoSuchAlgorithmException, InvalidKeySpecException {
+		int iterations = 1001;
 		char[] chars = password.toCharArray();
 		byte[] salt = getSalt();
 
 		PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 512);
-		SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+		SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
 		byte[] hash = skf.generateSecret(spec).getEncoded();
 		return iterations + ":" + toHex(salt) + ":" + toHex(hash);
 	}
 
-	private byte[] getSalt() throws NoSuchAlgorithmException
-	{
+	private byte[] getSalt() throws NoSuchAlgorithmException {
 		SecureRandom sr = SecureRandom.getInstance("SHA1PRNG");
 		byte[] salt = new byte[16];
 		sr.nextBytes(salt);
 		return salt;
 	}
 
-	private String toHex(byte[] array) throws NoSuchAlgorithmException
-	{
+	private String toHex(byte[] array) {
 		BigInteger bi = new BigInteger(1, array);
 		String hex = bi.toString(16);
 		int paddingLength = array.length * 2 - hex.length();
-		if (paddingLength > 0)
-		{
+		if (paddingLength > 0) {
 			return String.format(new StringBuilder().append("%0").append(paddingLength).append("d").toString(),
-					new Object[]
-			{ Integer.valueOf(0) }) + hex;
+					new Object[] { Integer.valueOf(0) }) + hex;
 		}
 		return hex;
 	}
 
-	public boolean validatePassword(String originalPassword, String storedPassword)
-			throws NoSuchAlgorithmException, InvalidKeySpecException
-	{
+	public int validatePassword(String originalPassword, String storedPassword)
+			throws NoSuchAlgorithmException, InvalidKeySpecException {
+		int validCount = 0;
+		String[] parts = storedPassword.split(":");
+		int iterations = Integer.parseInt(parts[0]);
+		byte[] salt = fromHex(parts[1]);
+		byte[] hash = fromHex(parts[2]);
+		if (iterations == 1000) {
+			PBEKeySpec spec = new PBEKeySpec(originalPassword.toCharArray(), salt, 1000, hash.length * 8);
+			SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+			byte[] testHash = skf.generateSecret(spec).getEncoded();
+			int diff = hash.length ^ testHash.length;
+			for (int i = 0; (i < hash.length) && (i < testHash.length); i++) {
+				diff |= hash[i] ^ testHash[i];
+			}
+			if (diff == 0) {
+				// return 1 if using SHA1 algorithm to execute save and login Operation
+				validCount = 1;
+				return validCount;
+			} else {
+				PBEKeySpec spec1 = new PBEKeySpec(originalPassword.toCharArray(), salt, iterations, hash.length * 8);
+				SecretKeyFactory skf1 = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+				byte[] testHash1 = skf1.generateSecret(spec1).getEncoded();
+
+				int diff1 = hash.length ^ testHash1.length;
+				for (int i = 0; (i < hash.length) && (i < testHash1.length); i++) {
+					diff1 |= hash[i] ^ testHash1[i];
+				}
+				if (diff1 == 0) {
+					// return 2 if using SHA512 algorithm to execute login Operation
+					validCount = 2;
+					return validCount;
+				} else {
+					// return 0 if wrong password
+					validCount = 0;
+					return validCount;
+				}
+			}
+		}
+		if (iterations == 1001) {
+
+			PBEKeySpec spec = new PBEKeySpec(originalPassword.toCharArray(), salt, iterations, hash.length * 8);
+			SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+			byte[] testHash = skf.generateSecret(spec).getEncoded();
+
+			int diff = hash.length ^ testHash.length;
+			for (int i = 0; (i < hash.length) && (i < testHash.length); i++) {
+				diff |= hash[i] ^ testHash[i];
+			}
+			if (diff == 0) {
+				// return 3 if using SHA512 algorithm to execute login Operation
+				validCount = 3;
+				return validCount;
+			} else {
+				validCount = 0;
+				return validCount;
+			}
+		}
+		return validCount;
+	}
+
+	public boolean validatePasswordExisting(String originalPassword, String storedPassword)
+			throws NoSuchAlgorithmException, InvalidKeySpecException {
 		String[] parts = storedPassword.split(":");
 		int iterations = Integer.parseInt(parts[0]);
 		byte[] salt = fromHex(parts[1]);
@@ -60,18 +136,15 @@ public boolean validatePassword(String originalPassword, String storedPassword)
 		byte[] testHash = skf.generateSecret(spec).getEncoded();
 
 		int diff = hash.length ^ testHash.length;
-		for (int i = 0; (i < hash.length) && (i < testHash.length); i++)
-		{
+		for (int i = 0; (i < hash.length) && (i < testHash.length); i++) {
 			diff |= hash[i] ^ testHash[i];
 		}
 		return diff == 0;
 	}
 
-	private byte[] fromHex(String hex) throws NoSuchAlgorithmException
-	{
+	private byte[] fromHex(String hex) {
 		byte[] bytes = new byte[hex.length() / 2];
-		for (int i = 0; i < bytes.length; i++)
-		{
+		for (int i = 0; i < bytes.length; i++) {
 			bytes[i] = ((byte) Integer.parseInt(hex.substring(2 * i, 2 * i + 2), 16));
 		}
 		return bytes;
diff --git a/src/main/java/com/iemr/common/config/prototype/BeneficiaryOccupation.java b/src/main/java/com/iemr/common/config/prototype/BeneficiaryOccupation.java
index abc26f25..a4234bbf 100644
--- a/src/main/java/com/iemr/common/config/prototype/BeneficiaryOccupation.java
+++ b/src/main/java/com/iemr/common/config/prototype/BeneficiaryOccupation.java
@@ -1,14 +1,27 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.prototype;
 
-import lombok.Data;
-
-@Data
-/**
- * @author VI314759
- *
- */
-public class BeneficiaryOccupation
-{
+public class BeneficiaryOccupation {
 	private Long occupationID;
 	private String occupationType;
 	private Boolean deleted;
@@ -17,8 +30,60 @@ public class BeneficiaryOccupation
 	private String key;
 	private String operation;
 
-	public BeneficiaryOccupation()
-	{
+	public Long getOccupationID() {
+		return occupationID;
+	}
+
+	public String getOccupationType() {
+		return occupationType;
+	}
+
+	public Boolean getDeleted() {
+		return deleted;
+	}
+
+	public String getCreatedby() {
+		return createdby;
+	}
+
+	public String getModifiedby() {
+		return modifiedby;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public String getOperation() {
+		return operation;
+	}
 
+	public void setOccupationID(Long occupationID) {
+		this.occupationID = occupationID;
 	}
+
+	public void setOccupationType(String occupationType) {
+		this.occupationType = occupationType;
+	}
+
+	public void setDeleted(Boolean deleted) {
+		this.deleted = deleted;
+	}
+
+	public void setCreatedby(String createdby) {
+		this.createdby = createdby;
+	}
+
+	public void setModifiedby(String modifiedby) {
+		this.modifiedby = modifiedby;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public void setOperation(String operation) {
+		this.operation = operation;
+	}
+
 }
diff --git a/src/main/java/com/iemr/common/config/quartz/AutowiringSpringBeanJobFactory.java b/src/main/java/com/iemr/common/config/quartz/AutowiringSpringBeanJobFactory.java
index 5255ea8e..7b1a8479 100644
--- a/src/main/java/com/iemr/common/config/quartz/AutowiringSpringBeanJobFactory.java
+++ b/src/main/java/com/iemr/common/config/quartz/AutowiringSpringBeanJobFactory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.spi.TriggerFiredBundle;
diff --git a/src/main/java/com/iemr/common/config/quartz/QuartzConfig.java b/src/main/java/com/iemr/common/config/quartz/QuartzConfig.java
index 3128ffa4..6d569e50 100644
--- a/src/main/java/com/iemr/common/config/quartz/QuartzConfig.java
+++ b/src/main/java/com/iemr/common/config/quartz/QuartzConfig.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import java.io.IOException;
@@ -25,12 +46,8 @@
 public class QuartzConfig {
 
 	private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
-
-	// @Autowired
-	// private DataSource dataSource;
-
-	// @Autowired(required = true)
-	// private ConfigProperties configProperties;
+	private static final String quartzJobGroup = "spring-quartz";
+	private static final String quartzJobDefaultSchedule = "0 0 0 31 12 ? *";
 
 	@Autowired
 	private PlatformTransactionManager transactionManager;
@@ -91,23 +108,22 @@ public JobDetailFactoryBean processMQJobForUnblock() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleJobServiceForUnblock.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForUnblock() {
 		Boolean startJob = ConfigProperties.getBoolean("start-unblock-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		;
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-unblock");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForUnblock().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -117,23 +133,22 @@ public JobDetailFactoryBean processMQJobForSMS() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleJobServiceForSMS.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForSMS() {
 		Boolean startJob = ConfigProperties.getBoolean("start-sms-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		;
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-sms");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForSMS().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -143,23 +158,21 @@ public JobDetailFactoryBean processMQJobForEmail() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleJobServiceForEmail.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForEmail() {
 		Boolean startJob = ConfigProperties.getBoolean("start-email-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-email");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForEmail().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -169,23 +182,21 @@ public JobDetailFactoryBean processMQJobForRegistration() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleForEverwellRegistration.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForRegistration() {
 		Boolean startJob = ConfigProperties.getBoolean("start-registration-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-registration");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForRegistration().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -195,23 +206,21 @@ public JobDetailFactoryBean processMQJobForEverwellDataSync() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleForEverwellDataSync.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForEverwellDataSync() {
 		Boolean startJob = ConfigProperties.getBoolean("start-everwelldatasync-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-everwelldatasync");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForEverwellDataSync().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -220,24 +229,22 @@ public CronTriggerFactoryBean processMQTriggerForEverwellDataSync() {
 	public JobDetailFactoryBean processMQJobForCtiDataSync() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
-		jobDetailFactory.setJobClass(ScheduleForCzentrixCall.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setJobClass(ScheduleForCallCentre.class);
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForCtiDataSync() {
 		Boolean startJob = ConfigProperties.getBoolean("start-ctidatasync-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-ctidatasync");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForCtiDataSync().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -247,23 +254,21 @@ public JobDetailFactoryBean processMQJobForAvniRegistration() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleJobServiceForAvniRegistration.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForAvniRegistration() {
 		Boolean startJob = ConfigProperties.getBoolean("start-avni-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-avni-registration");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForAvniRegistration().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 		return cronTriggerFactoryBean;
 	}
 
@@ -273,26 +278,23 @@ public JobDetailFactoryBean processMQJobForNHMDashboardData() {
 		JobDetailFactoryBean jobDetailFactory;
 		jobDetailFactory = new JobDetailFactoryBean();
 		jobDetailFactory.setJobClass(ScheduleJobForNHMDashboardData.class);
-		jobDetailFactory.setGroup("spring-quartz");
+		jobDetailFactory.setGroup(quartzJobGroup);
 		return jobDetailFactory;
 	}
 
 	@Bean
 	public CronTriggerFactoryBean processMQTriggerForNHMDashboardData() {
 		Boolean startJob = ConfigProperties.getBoolean("start-nhmdashboard-scheduler");
-		CronTriggerFactoryBean cronTriggerFactoryBean = null;
-		String scheduleConfig = "0 0 0 31 12 ? *";
+		CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+		String scheduleConfig = quartzJobDefaultSchedule;
 		if (startJob) {
 			scheduleConfig = ConfigProperties.getPropertyByName("cron-scheduler-nhmdashboard");
 		}
-		cronTriggerFactoryBean = new CronTriggerFactoryBean();
 		cronTriggerFactoryBean.setJobDetail(processMQJobForNHMDashboardData().getObject());
-
 		cronTriggerFactoryBean.setCronExpression(scheduleConfig);
-		cronTriggerFactoryBean.setGroup("spring-quartz");
+		cronTriggerFactoryBean.setGroup(quartzJobGroup);
 
 		return cronTriggerFactoryBean;
-
 	}
 
 }
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java
new file mode 100644
index 00000000..ed53b8ed
--- /dev/null
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java
@@ -0,0 +1,51 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.config.quartz;
+
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.iemr.common.service.ctiCall.CallCentreDataSync;
+
+
+@Service
+@Transactional
+public class ScheduleForCallCentre implements Job {
+	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@Autowired
+	private CallCentreDataSync callCentreDataSync;
+
+	@Override
+	public void execute(JobExecutionContext arg0) throws JobExecutionException
+	{
+		logger.info("Started job for sync " + arg0.getClass().getName());
+		callCentreDataSync.ctiDataSync();
+		logger.info("Completed job for sync " + arg0.getClass().getName());
+	}
+}
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForCzentrixCall.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForCzentrixCall.java
deleted file mode 100644
index e8dc25cd..00000000
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleForCzentrixCall.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iemr.common.config.quartz;
-
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.iemr.common.service.ctiCall.CzentrixDataSync;
-
-
-@Service
-@Transactional
-public class ScheduleForCzentrixCall implements Job {
-	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
-	@Autowired
-	private CzentrixDataSync czentrixDataSync;
-
-	@Override
-	public void execute(JobExecutionContext arg0) throws JobExecutionException
-	{
-		logger.info("Started job for sync " + arg0.getClass().getName());
-		czentrixDataSync.ctiDataSync();
-		logger.info("Completed job for sync " + arg0.getClass().getName());
-	}
-}
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellDataSync.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellDataSync.java
index 9632ac28..a776b8aa 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellDataSync.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellDataSync.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellRegistration.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellRegistration.java
index 7f5d092e..86006fdc 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellRegistration.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleForEverwellRegistration.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMAgentRealTimeData.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMAgentRealTimeData.java
new file mode 100644
index 00000000..51e5c8e2
--- /dev/null
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMAgentRealTimeData.java
@@ -0,0 +1,29 @@
+package com.iemr.common.config.quartz;
+
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.iemr.common.service.nhm_dashboard.NHM_AgentRealTimeDataService;
+@Component
+public class ScheduleJobForNHMAgentRealTimeData {
+	@Value("${nhm.agent.real.time.data.cron.flag}")
+	private boolean nhmFlag;
+	
+	private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+	
+	@Autowired
+	NHM_AgentRealTimeDataService agentRealTimeDataService;
+	@Scheduled(cron = "${nhm.agent.real.time.data.cron.scheduler}")
+	public void getAllNHMAgentRealTimeData() throws IOException {
+		if(nhmFlag) {
+			log.info("Calling Scheduler for NHM_Agent_Real_Time_Data");
+			agentRealTimeDataService.getData();
+		}
+	}
+}
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMDashboardData.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMDashboardData.java
index 441356a4..fda36f0d 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMDashboardData.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobForNHMDashboardData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
@@ -17,16 +38,15 @@ public class ScheduleJobForNHMDashboardData implements Job {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
-	private NHM_DashboardService nhm_DashboardService;
+	private NHM_DashboardService nhmDashboardService;
 
 	@Override
 	public void execute(JobExecutionContext arg0) throws JobExecutionException {
 		logger.info("Started job for NHM dashboard data pull from cti " + arg0.getClass().getName());
 		try {
-			String s = nhm_DashboardService.pull_NHM_Data_CTI();
+			String s = nhmDashboardService.pull_NHM_Data_CTI();
 			logger.info(s);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			logger.error(e.getLocalizedMessage());
 		}
 		logger.info("Completed job for NHM dashboard data pull from cti " + arg0.getClass().getName());
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForAvniRegistration.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForAvniRegistration.java
index d18ac9b4..54b94c21 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForAvniRegistration.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForAvniRegistration.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForEmail.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForEmail.java
index 1ab7a5c6..520c4002 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForEmail.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForEmail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForSMS.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForSMS.java
index 4ae85e34..d38df02e 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForSMS.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForSMS.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForUnblock.java b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForUnblock.java
index 5956d7f9..d2fd77a7 100644
--- a/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForUnblock.java
+++ b/src/main/java/com/iemr/common/config/quartz/ScheduleJobServiceForUnblock.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.config.quartz;
 
 import org.quartz.Job;
diff --git a/src/main/java/com/iemr/common/constant/Constants.java b/src/main/java/com/iemr/common/constant/Constants.java
new file mode 100644
index 00000000..c6f98e02
--- /dev/null
+++ b/src/main/java/com/iemr/common/constant/Constants.java
@@ -0,0 +1,15 @@
+package com.iemr.common.constant;
+
+public class Constants {
+
+	public static final String NHM_CRON_JOB = "nhmCronJob";
+	public static final String NHM_CRON_SCHEDULER = "nhm-cron-scheduler";
+	public static final String LOGGED_IN = "Loggedin";
+	public static final String FREE = "Free";
+	public static final String IN_CALL = "Incall";
+	public static final String AWT = "AWT";
+	public static final String HOLD = "Hold";
+	public static final String NOT_READY = "Not Ready";
+	public static final String AUX = "Aux";
+
+}
diff --git a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
index aa602574..598a78d4 100644
--- a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
+++ b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java
@@ -1,9 +1,29 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.beneficiary;
 
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-// import javax.transaction.Transactional;
 import javax.ws.rs.core.MediaType;
 
 import org.json.JSONArray;
@@ -13,7 +33,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,7 +41,6 @@
 import com.google.gson.GsonBuilder;
 import com.iemr.common.data.beneficiary.BenPhoneMap;
 import com.iemr.common.data.beneficiary.BeneficiaryRegistrationData;
-import com.iemr.common.data.beneficiary.BeneficiaryType;
 import com.iemr.common.data.directory.Directory;
 import com.iemr.common.model.beneficiary.BeneficiaryModel;
 import com.iemr.common.service.beneficiary.BenRelationshipTypeService;
@@ -32,7 +50,6 @@
 import com.iemr.common.service.beneficiary.IEMRSearchUserService;
 import com.iemr.common.service.beneficiary.RegisterBenificiaryService;
 import com.iemr.common.service.beneficiary.SexualOrientationService;
-import com.iemr.common.service.callhandling.CalltypeService;
 import com.iemr.common.service.directory.DirectoryService;
 import com.iemr.common.service.location.LocationService;
 import com.iemr.common.service.reports.CallReportsService;
@@ -50,11 +67,6 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-/**
- * Controller class to get the user and beneficiary related data
- *
- */
-
 @RequestMapping({ "/beneficiary" })
 @RestController
 public class BeneficiaryRegistrationController {
@@ -62,6 +74,7 @@ public class BeneficiaryRegistrationController {
 	private InputMapper inputMapper = new InputMapper();
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+	private static final String AUTHORIZATION = "authorization";
 	private RegisterBenificiaryService registerBenificiaryService;
 	private IEMRBeneficiaryTypeService iemrBeneficiaryTypeService;
 	private IEMRSearchUserService iemrSearchUserService;
@@ -78,7 +91,6 @@ public class BeneficiaryRegistrationController {
 	private BenRelationshipTypeService benRelationshipTypeService;
 	private BeneficiaryOccupationService beneficiaryOccupationService;
 	private GovtIdentityTypeService govtIdentityTypeService;
-	private CalltypeService calltypeService;
 
 	@Autowired
 	public void setBenRelationshipTypeService(BenRelationshipTypeService benRelationshipTypeService) {
@@ -155,11 +167,6 @@ public void setSexualOrientationService(SexualOrientationService sexualOrientati
 		this.sexualOrientationService = sexualOrientationService;
 	}
 
-	@Autowired
-	public void setCalltypeService(CalltypeService calltypeService) {
-		this.calltypeService = calltypeService;
-	}
-
 	@Autowired
 	public void setGovtIdentityTypeService(GovtIdentityTypeService govtIdentityTypeService) {
 		this.govtIdentityTypeService = govtIdentityTypeService;
@@ -168,10 +175,9 @@ public void setGovtIdentityTypeService(GovtIdentityTypeService govtIdentityTypeS
 	@Autowired
 	private CallReportsService callReportsService;
 
-	@ApiOperation(value = "Creates a new beneficiary")
+	@ApiOperation(value = "Create a new beneficiary")
 	@CrossOrigin()
 	@RequestMapping(value = "/create", method = RequestMethod.POST, produces = "application/json", consumes = "application/json", headers = "Authorization")
-	// @Transactional
 
 	public String createBeneficiary(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer\",\"firstName\":\"String\",\"lastName\":\"String\",\"dOB\":\"Timestamp\","
@@ -189,8 +195,6 @@ public String createBeneficiary(
 		logger.info("Create beneficiary request " + beneficiaryModel);
 		try {
 
-			// BeneficiaryModel beneficiaryModel =
-			// inputMapper.gson().fromJson(createRequest, BeneficiaryModel.class);
 			response.setResponse(registerBenificiaryService.save(beneficiaryModel, httpRequest));
 		} catch (Exception e) {
 			logger.error("create beneficiary failed with error " + e.getMessage(), e);
@@ -201,108 +205,15 @@ public String createBeneficiary(
 		return response.toString();
 	}
 
-	// @ApiOperation(value = "Creates a new beneficiary")
-	// @CrossOrigin()
-	// @RequestMapping(value = "/createV1", method = RequestMethod.POST, produces =
-	// "application/json",
-	// consumes = "application/json", headers = "Authorization")
-	// @Transactional
-	//
-	// public String createBeneficiaryV1(@RequestBody BeneficiaryModel
-	// beneficiaryModel, HttpServletRequest httpRequest)
-	// {
-	// OutputResponse response = new OutputResponse();
-	//
-	// logger.info("Create beneficiary request " + beneficiaryModel);
-	// try
-	// {
-	//
-	// // BeneficiaryModel beneficiaryModel =
-	// inputMapper.gson().fromJson(createRequest, BeneficiaryModel.class);
-	// response.setResponse(registerBenificiaryService.save(beneficiaryModel,
-	// httpRequest));
-	// } catch (Exception e)
-	// {
-	// logger.error("create beneficiary failed with error " + e.getMessage(), e);
-	// response.setError(e);
-	// }
-	//
-	// logger.info("create beneficiary response " + response.toString());
-	// return response.toString();
-	// }
-
-	/**
-	 * @param beneficiaryType
-	 * @return
-	 */
-	@Deprecated
-	@ApiOperation(value = "Creates a new beneficiary")
-	@CrossOrigin()
-	@RequestMapping(value = "/update/relationship", method = RequestMethod.POST, produces = "application/json", headers = "Authorization")
-	public String addBeneficiaryRelation(@RequestBody String beneficiaryType) {
-		OutputResponse response = new OutputResponse();
-		logger.info("Update relationship request " + beneficiaryType);
-		try {
-			BeneficiaryType iBeneficiaryType = inputMapper.gson().fromJson(beneficiaryType, BeneficiaryType.class);
-			iBeneficiaryType = this.iemrBeneficiaryTypeService.addRelation(iBeneficiaryType);
-			if (iBeneficiaryType != null)
-				response.setResponse("Success");
-		} catch (Exception e) {
-			logger.error("Update relationship failed with " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("update relationship response " + response.toString());
-		return response.toString();
-	}
-
 	@CrossOrigin()
-	@ApiOperation(value = "Get beneficiary relationship", consumes = "application/json", produces = "application/json")
-	@Deprecated
-	@RequestMapping(value = "/get/relationship", method = RequestMethod.POST, produces = "application/json", headers = "Authorization")
-	public String getBeneficiaryRelation() {
-		OutputResponse response = new OutputResponse();
-		logger.info("Get relationship request");
-		try {
-			Iterable<BeneficiaryType> iBeneficiaryTypes;
-			iBeneficiaryTypes = this.iemrBeneficiaryTypeService.getRelations();
-		} catch (Exception e) {
-			logger.error("get relationships failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("Get relationship response " + response.toString());
-		return response.toString();
-	}
-
-	@CrossOrigin()
-	@Deprecated
-	@ApiOperation(value = "Search user by beneficiaryID")
-	@RequestMapping(value = "/searchUser/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String searchUser(@PathVariable("id") String beneficiaryId, HttpServletRequest httpRequest) {
-		logger.info("serach user beneficiaryId:" + beneficiaryId);
-		OutputResponse response = new OutputResponse();
-
-		String auth = httpRequest.getHeader("authorization");
-		try {
-			List<BeneficiaryModel> iBeneficiary = this.iemrSearchUserService.userExitsCheckWithId(beneficiaryId, auth,
-					false);
-			response.setResponse(OutputMapper.gsonWithoutExposeRestriction().toJson(iBeneficiary));
-		} catch (Exception e) {
-			logger.error("serach user failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("Serach user response " + response.toString());
-		return response.toString();
-	}
-
-	@CrossOrigin()
-	@ApiOperation(value = "Provides the list of beneficiaries for given beneficiaryID")
+	@ApiOperation(value = "Provide the list of beneficiaries based on beneficiary id")
 	@RequestMapping(value = "/searchUserByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String searchUserByID(
 			@ApiParam("{\"beneficiaryRegID\":\"Long\", \"beneficiaryID\":\"Long\", \"HealthID\":\"String\", \"HealthIDNo\":\"String\"} ") @RequestBody String request,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
 
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		logger.info("Search user by ID request " + request);
 		try {
 			BeneficiaryModel benificiaryDetails = InputMapper.gson().fromJson(request, BeneficiaryModel.class);
@@ -340,14 +251,14 @@ public String searchUserByID(
 		return response.toString();
 	}
 
-	@ApiOperation(value = "Provides the list of beneficiaries who has phone number provided")
+	@ApiOperation(value = "Provide the list of beneficiaries based on phone number")
 	@CrossOrigin()
 	@RequestMapping(value = "/searchUserByPhone", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String searchUserByPhone(
 			@ApiParam("{\"phoneNo\":\"String\",\"pageNo\":\"Integer\",\"rowsPerPage\":\"Integer\"}") @RequestBody String request,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		logger.info("Serach user by phone no request " + request);
 		try {
 			JSONObject requestObj = new JSONObject(request);
@@ -369,7 +280,7 @@ public String searchUserByPhone(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Provides the list of beneficiaries who match search criteria provided")
+	@ApiOperation(value = "Provide the list of beneficiaries based on search criteria")
 	@RequestMapping(value = "/searchBeneficiary", method = RequestMethod.POST, headers = "Authorization")
 	public String searchBeneficiary(
 			@ApiParam("{\"firstName\":\"String\",\"lastName\":\"String\",\"genderID\":\"Integer\",\"beneficiaryID\":\"String\","
@@ -377,7 +288,7 @@ public String searchBeneficiary(
 			HttpServletRequest httpRequest) {
 		logger.info("searchBeneficiary request " + request);
 		OutputResponse output = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		try {
 			output.setResponse(iemrSearchUserService.findBeneficiary(request, auth));
 		} catch (NumberFormatException ne) {
@@ -392,7 +303,7 @@ public String searchBeneficiary(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Provides the all common data list needed for beneficiary registration")
+	@ApiOperation(value = "Provide all common data list needed for beneficiary registration")
 	@RequestMapping(value = "/getRegistrationData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getRegistrationData() {
 		OutputResponse response = new OutputResponse();
@@ -419,12 +330,11 @@ public String getRegistrationData() {
 			logger.error("get user registration data failed with error " + e.getMessage(), e);
 		}
 		logger.info("get user registration data response " + response.toString());
-		// return beneficiaryRegistrationData.toString();
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Provides the all common data list needed for beneficiary registration")
+	@ApiOperation(value = "Provide all common data V1 list needed for beneficiary registration")
 	@RequestMapping(value = "/getRegistrationDataV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getRegistrationDataV1(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request) {
@@ -454,14 +364,12 @@ public String getRegistrationDataV1(
 			logger.error("get user registration data failed with error " + e.getMessage(), e);
 		}
 		logger.info("get user registration data response " + response.toString());
-		// return beneficiaryRegistrationData.toString();
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Updating beneficiary details")
+	@ApiOperation(value = "Update beneficiary details")
 	@RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	// @Transactional
 	public String updateBenefciary(
 			@ApiParam("{\"beneficiaryRegID\":\"Long\",\"firstName\":\"String\",\"lastName\":\"String\","
 					+ "\"dOB\":\"Timestamp\",\"ageUnits\":\"String\",\"fatherName\":\"String\",\"spouseName\":\"String\","
@@ -477,7 +385,7 @@ public String updateBenefciary(
 					+ "\"changeInFamilyDetails\":\"Boolean\"}") @RequestBody String benificiaryRequest,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		Integer updateCount = 0;
 		try {
 			BeneficiaryModel benificiaryDetails = inputMapper.gson().fromJson(benificiaryRequest,
@@ -505,13 +413,12 @@ public String updateBenefciary(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "Fetching beneficiary details by phone no")
+	@ApiOperation(value = "Fetch beneficiary details by phone no")
 	@RequestMapping(value = "/getBeneficiariesByPhoneNo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getBeneficiariesByPhone(@ApiParam("{\"phoneNo\":\"String\"}") @RequestBody String request,
 			HttpServletRequest httpRequest) {
-		// String response = "[]";
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		logger.info("getBeneficiariesByPhoneNo request " + request);
 		try {
 			BenPhoneMap benPhoneMap = inputMapper.gson().fromJson(request, BenPhoneMap.class);
@@ -522,20 +429,18 @@ public String getBeneficiariesByPhone(@ApiParam("{\"phoneNo\":\"String\"}") @Req
 			response.setError(e);
 			logger.error("getBeneficiariesByPhoneNo failed with error " + e.getMessage(), e);
 		}
-//		logger.info("getBeneficiariesByPhoneNo response " + response.toString());
 		return response.toString();
 	}
 
 	@CrossOrigin()
 	@ApiOperation(value = "Update beneficiary community or education")
 	@RequestMapping(value = "/updateCommunityorEducation", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	// @Transactional
 	public String updateBenefciaryCommunityorEducation(
 			@ApiParam("{\"beneficiaryRegID\":\"Long\",\"i_bendemographics\":{\"communityID\":\"Integer\","
 					+ "\"educationID\":\"Integer\"}}") @RequestBody String benificiaryRequest,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		Integer updateCount = 0;
 		try {
 			BeneficiaryModel benificiaryDetails = inputMapper.gson().fromJson(benificiaryRequest,
@@ -551,12 +456,7 @@ public String updateBenefciaryCommunityorEducation(
 				responseObj.put("updateCount", updateCount);
 				response.setResponse(responseObj.toString());
 			}
-		}
-//		catch (JSONException e) {
-//			logger.error("Update beneficiary failed with error " + e.getMessage(), e);
-//			response.setError(e);
-//		}
-		catch (Exception e) {
+		} catch (Exception e) {
 			logger.error("Update beneficiary failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -565,13 +465,13 @@ public String updateBenefciaryCommunityorEducation(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "For Generating beneficiary IDs")
+	@ApiOperation(value = "Generate beneficiary id")
 	@RequestMapping(value = "/generateBeneficiaryIDs", headers = "Authorization", method = {
 			RequestMethod.POST }, produces = { "application/json" })
 	public String getBeneficiaryIDs(
 			@ApiParam("{\"benIDRequired\":\"Integer\",\"vanID\":\"Integer\"}") @RequestBody String request,
 			HttpServletRequest httpRequest) {
-		logger.info("generateBeneficiaryIDs request " + request.toString());
+		logger.info("generateBeneficiaryIDs request " + request);
 		OutputResponse response = new OutputResponse();
 		try {
 
@@ -582,9 +482,6 @@ public String getBeneficiaryIDs(
 			logger.error(e.getMessage());
 			response.setError(e);
 		}
-		/**
-		 * sending the response...
-		 */
 		return response.toString();
 	}
 
diff --git a/src/main/java/com/iemr/common/controller/biometric/BiometricController.java b/src/main/java/com/iemr/common/controller/biometric/BiometricController.java
new file mode 100644
index 00000000..79546c87
--- /dev/null
+++ b/src/main/java/com/iemr/common/controller/biometric/BiometricController.java
@@ -0,0 +1,44 @@
+package com.iemr.common.controller.biometric;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+ 
+
+import com.iemr.common.service.biometric.BiometricService;
+import com.iemr.common.utils.response.OutputResponse;
+
+ 
+
+import io.swagger.annotations.ApiOperation;
+
+@CrossOrigin
+@RestController
+@RequestMapping(value = "/biometric")
+public class BiometricController {
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+	@Autowired
+	private BiometricService biometricService;
+	@CrossOrigin
+	@RequestMapping(value = { "/getBiometricData/{pid}" }, method = { RequestMethod.GET }, headers = "Authorization")
+	public String saveBenNurseDataCAC(@PathVariable("pid") String pid,
+			@RequestHeader(value = "Authorization") String Authorization) {
+		OutputResponse response = new OutputResponse();
+		try {
+			String pidResponse = biometricService.getBioData(pid);
+			response.setResponse(pidResponse);
+		}catch (Exception e) {
+			logger.error("Error while fetching Biometric data : "+e.getMessage());
+		}
+		return response.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java
index 82226a25..e03bfbfd 100644
--- a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java
+++ b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.brd;
 
 import javax.ws.rs.core.MediaType;
@@ -7,17 +28,15 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.iemr.common.service.brd.BRDIntegrationService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 
 @RestController
 @RequestMapping("/brd")
@@ -29,6 +48,7 @@ public class BRDIntegrationController {
 	@Autowired
 	private BRDIntegrationService integrationService;
 
+	@ApiOperation(value = "Get integration data")
 	@RequestMapping(value = "/getIntegrationData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	@CrossOrigin()
 	public String getDetails(@RequestBody String request) {
@@ -44,7 +64,6 @@ public String getDetails(@RequestBody String request) {
 			logger.error("Error while getching BRD Integration data :" + e);
 			response.setError(5000, "Unable to get BRD data");
 		}
-		System.out.println(response.toStringWithSerializeNulls());
 		return response.toStringWithSerializeNulls();
 	}
 
diff --git a/src/main/java/com/iemr/common/controller/callhandling/CallController.java b/src/main/java/com/iemr/common/controller/callhandling/CallController.java
index f8cfe334..762c7d1c 100644
--- a/src/main/java/com/iemr/common/controller/callhandling/CallController.java
+++ b/src/main/java/com/iemr/common/controller/callhandling/CallController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.callhandling;
 
 import java.util.List;
@@ -28,6 +49,7 @@
 import com.iemr.common.utils.response.OutputResponse;
 import com.iemr.common.utils.sessionobject.SessionObject;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RequestMapping(value = "/call")
@@ -35,6 +57,8 @@
 public class CallController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+	private static final String XFORWARDEDFOR = "X-FORWARDED-FOR";
+	private static final String AUTHORIZATION = "authorization";
 	private CalltypeServiceImpl calltypeServiceImpl;
 
 	@Autowired
@@ -50,6 +74,7 @@ public void setBeneficiaryCallService(BeneficiaryCallService beneficiaryCallServ
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get call types")
 	@RequestMapping(value = "/getCallTypes", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAllCallTypes(
 			@ApiParam("{\"providerServiceMapID\":\"Integer - provider service ID\", \"isInbound\": Optional boolean,"
@@ -67,6 +92,7 @@ public String getAllCallTypes(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get call types V1")
 	@RequestMapping(value = "/getCallTypesV1", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getCallTypesV1(
 			@ApiParam("{\"providerServiceMapID\":\"Integer - provider service ID\", \"isInbound\": Optional boolean,"
@@ -83,6 +109,7 @@ public String getCallTypesV1(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Start call")
 	@RequestMapping(value = "/startCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String startCall(
 			@ApiParam(value = "{\"calledServiceID\":\"Integer - provider service ID\", "
@@ -95,7 +122,7 @@ public String startCall(
 			HttpServletRequest fromRequest) {
 		OutputResponse response = new OutputResponse();
 		try {
-			String remoteAddress = fromRequest.getHeader("X-FORWARDED-FOR");
+			String remoteAddress = fromRequest.getHeader(XFORWARDEDFOR);
 			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = fromRequest.getRemoteAddr();
 			}
@@ -110,6 +137,7 @@ public String startCall(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Update beneficiary in call")
 	@RequestMapping(value = "/updatebeneficiaryincall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateBeneficiaryIDInCall(@ApiParam(value = "{\"benCallID\":\"Integer - callID as in CRM\", "
 			+ "\"isCalledEarlier\":\"Boolean - to be set as true or false if called earlier is yes or no\","
@@ -131,6 +159,7 @@ public String updateBeneficiaryIDInCall(@ApiParam(value = "{\"benCallID\":\"Inte
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Close call")
 	@RequestMapping(value = "/closeCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String closeCall(
 			@ApiParam(value = "{\"benCallID\":\"Integer - callID as in CRM\", \"remarks\":\"String - call remarks\", "
@@ -145,14 +174,13 @@ public String closeCall(
 					+ "\"agentIPAddress\":\"Optional String - agent IP address\", "
 					+ "\"agentID\":\"Optional String - agentID\", \"isSelf\":\"Optional boolean\", "
 					+ "\"isFeedback\":\"optional Boolean true if IVRS feedback to be taken\", "
-					+ "\"isTransfered\":\"Boolean - transfer call or not\""
-					+ "}") @RequestBody String request,
+					+ "\"isTransfered\":\"Boolean - transfer call or not\"" + "}") @RequestBody String request,
 			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		try {
 			logger.info("closeCallReqObj " + request);
 			JSONObject requestObject = new JSONObject(request);
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
+			String remoteAddress = serverRequest.getHeader(XFORWARDEDFOR);
 			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
@@ -170,43 +198,8 @@ public String closeCall(
 		return response.toString();
 	}
 
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/closeCallV1", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String closeCallV1(
-			@ApiParam(value = "{\"benCallID\":\"Integer - callID as in CRM\", \"remarks\":\"String - call remarks\", "
-					+ "\"callClosureType\":\"String - closure type\", \"callTypeID\":\"Integer - call type ID\", "
-					+ "\"endCall\":\"Optional Boolean - true to disconnect call from CTI\", "
-					+ "\"isFollowupRequired\":\"Optional Boolean - for requesting followup\", "
-					+ "\"fitToBlock\":\"Optional Boolean - set means phone no is fit to block\", "
-					+ "\"beneficiaryRegID\":\"Optional Integer - beneficiary ID requessting for followup\", "
-					+ "\"requestedFor\":\"Optional String - followup requested for\", "
-					+ "\"preferredLanguageName\":\"Optional String - name of language preferred by user\", "
-					+ "\"agentIPAddress\":\"Optional String - agent IP address\", "
-					+ "\"agentID\":\"Optional String - agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			JSONObject requestObject = new JSONObject(request);
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			Integer updateCount = beneficiaryCallService.closeCallV1(request, remoteAddress);
-			requestObject.put("updateCount", updateCount);
-			response.setResponse(requestObject.toString());
-		} catch (JSONException e) {
-			logger.error("", e);
-			response.setError(e);
-		} catch (Exception e) {
-			logger.error("", e);
-			response.setError(e);
-		}
-
-		return response.toString();
-	}
-
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call list")
 	@RequestMapping(value = "/outboundCallList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" called service ID integer\", "
 			+ "\"assignedUserID\":\"Optional - Integer ID of user that is assigned to\", "
@@ -215,7 +208,7 @@ public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" c
 			+ "\"filterStartDate\":\"JSON date\", " + "\"filterEndDate\":\"JSON Date\"}") @RequestBody String request,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		try {
 			response.setResponse(beneficiaryCallService.outboundCallList(request, auth));
 		} catch (Exception e) {
@@ -227,6 +220,7 @@ public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" c
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call count")
 	@RequestMapping(value = "/outboundCallCount", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundCallCount(@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\", "
 			+ "\"preferredLanguageName\":\"Optional - String name of the language selected by user\", "
@@ -244,6 +238,7 @@ public String outboundCallCount(@ApiParam(value = "{\"providerServiceMapID\":\"c
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Filter call list")
 	@RequestMapping(value = "/filterCallList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String filterCallList(
 			@ApiParam(value = "{\"calledServiceID\":\" called service ID integer\", "
@@ -254,7 +249,7 @@ public String filterCallList(
 					+ "\"is1097\" : \"boolean true for 1097\"}") @RequestBody String request,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		try {
 			response.setResponse(beneficiaryCallService.filterCallList(request, auth));
 		} catch (Exception e) {
@@ -265,6 +260,7 @@ public String filterCallList(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Filter call list page")
 	@RequestMapping(value = "/filterCallListPage", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String filterCallListPaginated(@ApiParam(value = "{\"calledServiceID\":\" called service ID integer\", "
 			+ "\"callTypeID\":\"optional call type ID from dropdown\", " + "\"filterStartDate\":\"JSON date\", "
@@ -274,7 +270,7 @@ public String filterCallListPaginated(@ApiParam(value = "{\"calledServiceID\":\"
 			+ "\"is1097\" : \"boolean true for 1097\", \"pageNo\\\":\"optional page no\", , \"pageSize\":\"optional page size\" }") @RequestBody String request,
 			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		String auth = httpRequest.getHeader("authorization");
+		String auth = httpRequest.getHeader(AUTHORIZATION);
 		try {
 			response.setResponse(beneficiaryCallService.filterCallListWithPagination(request, auth));
 		} catch (Exception e) {
@@ -285,6 +281,7 @@ public String filterCallListPaginated(@ApiParam(value = "{\"calledServiceID\":\"
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound allocation")
 	@RequestMapping(value = "/outboundAllocation", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundAllocation(@ApiParam(value = "{\"userID\":[Integer Array list of user IDs], "
 			+ "\"allocateNo\":\"Integer - number of calls to be allocated for user\", "
@@ -301,6 +298,7 @@ public String outboundAllocation(@ApiParam(value = "{\"userID\":[Integer Array l
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Complete outbound call")
 	@RequestMapping(value = "/completeOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String completeOutboundCall(@ApiParam(value = "{\"outboundCallReqID\":\"Integer - Outbound call id\", "
 			+ "\"isCompleted\":\"Boolean - Value indicating call is completed/pending\", "
@@ -317,6 +315,7 @@ public String completeOutboundCall(@ApiParam(value = "{\"outboundCallReqID\":\"I
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Update outbound call")
 	@RequestMapping(value = "/updateOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateOutboundCall(@ApiParam(value = "{\"outboundCallReqID\":\"Integer - Outbound call id\", "
 			+ "\"isCompleted\":\"Boolean - Value indicating call is completed/pending\", "
@@ -334,6 +333,7 @@ public String updateOutboundCall(@ApiParam(value = "{\"outboundCallReqID\":\"Int
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Reset outbound call")
 	@RequestMapping(value = "/resetOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String resetOutboundCall(
 			@ApiParam(value = "{\"outboundCallReqIDs\":\"[Long - Array of Outbound call ids]\"}") @RequestBody String request) {
@@ -349,6 +349,7 @@ public String resetOutboundCall(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get blacklist numbers")
 	@RequestMapping(value = "/getBlacklistNumbers", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getBlacklistNumbers(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer - provider service map id\", "
@@ -367,6 +368,7 @@ public String getBlacklistNumbers(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Unblock blocked numbers")
 	@RequestMapping(value = "/unblockBlockedNumbers", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String unblockBlockedNumbers() {
 		OutputResponse response = new OutputResponse();
@@ -381,6 +383,7 @@ public String unblockBlockedNumbers() {
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Block phone number")
 	@RequestMapping(value = "/blockPhoneNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String blockPhoneNumber(
 			@ApiParam(value = "{\"phoneBlockID\":\"Integer - ID of the number to be blocked\"}") @RequestBody String request) {
@@ -396,6 +399,7 @@ public String blockPhoneNumber(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Unblock phone number")
 	@RequestMapping(value = "/unblockPhoneNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String unblockPhoneNumber(
 			@ApiParam(value = "{\"phoneBlockID\":\"Integer - ID of the number to be unblocked\"}") @RequestBody String request) {
@@ -411,6 +415,7 @@ public String unblockPhoneNumber(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Update beneficiary call CDI status")
 	@RequestMapping(value = "/updateBeneficiaryCallCDIStatus", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateBeneficiaryCallCDIStatus(@ApiParam(value = "{\"benCallID\":\"Integer - callID as in CRM\", "
 			+ "\"cDICallStatus\":\"String - cdi outbound call status\"}") @RequestBody String request) {
@@ -431,6 +436,7 @@ public String updateBeneficiaryCallCDIStatus(@ApiParam(value = "{\"benCallID\":\
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get call history by call id")
 	@RequestMapping(value = "/getCallHistoryByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getCallHistoryByCallID(
 			@ApiParam(value = "{\"callID\":\"String - call ID from CTI\"}") @RequestBody String request) {
@@ -446,6 +452,7 @@ public String getCallHistoryByCallID(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call list by call id")
 	@RequestMapping(value = "/outboundCallListByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundCallListByCallID(@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\", "
 			+ "\"callID\":\"call ID as by CTI\"}") @RequestBody String request) {
@@ -461,6 +468,7 @@ public String outboundCallListByCallID(@ApiParam(value = "{\"providerServiceMapI
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Nuisance call history")
 	@RequestMapping(value = "/nueisanceCallHistory", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String nueisanceCallHistory(
 			@ApiParam(value = "{\"calledServiceID\":\"called service ID integer\", "
@@ -469,14 +477,8 @@ public String nueisanceCallHistory(
 			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		try {
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			String auth = serverRequest.getHeader("authorization");
+			String auth = serverRequest.getHeader(AUTHORIZATION);
 			response.setResponse(beneficiaryCallService.nueisanceCallHistory(request, auth).toString());
-			// response.setResponse(beneficiaryCallService.filterCallList(request,
-			// auth).toString());
 		} catch (Exception e) {
 			logger.error("outboundCallList failed with error " + e.getMessage(), e);
 			response.setError(e);
@@ -486,8 +488,10 @@ public String nueisanceCallHistory(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Beneficiary by call id")
 	@RequestMapping(value = "/beneficiaryByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String beneficiaryByCallID(@ApiParam("{\"callID\":\"String\"}") @RequestBody CallRequestByIDModel request, HttpServletRequest serverRequest) {
+	public String beneficiaryByCallID(@ApiParam("{\"callID\":\"String\"}") @RequestBody CallRequestByIDModel request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		try {
 			BeneficiaryCallModel callData = beneficiaryCallService.beneficiaryByCallID(request,
@@ -501,6 +505,7 @@ public String beneficiaryByCallID(@ApiParam("{\"callID\":\"String\"}") @RequestB
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get calls by beneficiary regitration id and received role name")
 	@RequestMapping(value = "/isAvailed", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String isAvailed(@ApiParam(value = "{\"beneficiaryRegID\":\"beneficiary reg id\", "
 			+ "\"receivedRoleName\":\"availed service role\"}") @RequestBody String request) {
@@ -517,6 +522,7 @@ public String isAvailed(@ApiParam(value = "{\"beneficiaryRegID\":\"beneficiary r
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get beneficiary requested outbound call")
 	@RequestMapping(value = "/getBenRequestedOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getBenRequestedOutboundCall(@ApiParam(value = "{\"beneficiaryRegID\":\"beneficiary reg id\", "
 			+ "\"calledServiceID\":\"providerServiceMapID\", is1097: boolean}") @RequestBody String request) {
@@ -533,23 +539,8 @@ public String getBenRequestedOutboundCall(@ApiParam(value = "{\"beneficiaryRegID
 		return response.toString();
 	}
 
-	// updateBenCallIdsInPhoneBlock
-	@CrossOrigin()
-	@Deprecated
-	@RequestMapping(value = "/updateBenCallIdsInPhoneBlock", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON)
-	public String updateBenCallIdsInPhoneBlock() {
-		OutputResponse response = new OutputResponse();
-		try {
-			beneficiaryCallService.updateBenCallIdsInPhoneBlock();
-			response.setResponse("Success");
-		} catch (Exception e) {
-			logger.error("updateBenCallIdsInPhoneBlock failed wih error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toString();
-	}
-
 	@CrossOrigin()
+	@ApiOperation(value = "Auto preview dialing")
 	@RequestMapping(value = "/isAutoPreviewDialing", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String isAutoPreviewDialing(@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\", "
 			+ "\"isDialPreferenceManual\":\"flag to be marked yes based on providerServiceMapID\"}") @RequestBody String request) {
@@ -567,6 +558,7 @@ public String isAutoPreviewDialing(@ApiParam(value = "{\"providerServiceMapID\":
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Check auto preview dialing")
 	@RequestMapping(value = "/checkAutoPreviewDialing", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String checkAutoPreviewDialing(
 			@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\"}") @RequestBody String request) {
@@ -584,11 +576,12 @@ public String checkAutoPreviewDialing(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get file path CTI")
 	@RequestMapping(value = "/getFilePathCTI", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getFilePathCTI(@ApiParam("{\"agentID\":\"String\",\"callID\":\"String\"}") @RequestBody String request) {
+	public String getFilePathCTI(
+			@ApiParam("{\"agentID\":\"String\",\"callID\":\"String\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
-//			response.setResponse(beneficiaryCallService.CTIFilePath(request));
 			String pathResponse = beneficiaryCallService.cTIFilePathNew(request);
 			if (pathResponse != null)
 				response.setResponse(pathResponse);
@@ -607,6 +600,7 @@ public String getFilePathCTI(@ApiParam("{\"agentID\":\"String\",\"callID\":\"Str
 	private SessionObject s;
 
 	@CrossOrigin()
+	@ApiOperation(value = "Redis insert")
 	@RequestMapping(value = "/redisInsert", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String redisInsert(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
@@ -622,6 +616,7 @@ public String redisInsert(@RequestBody String request) {
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Redis fetch")
 	@RequestMapping(value = "/redisFetch", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String redisFetch(@ApiParam("{\"sessionID\":\"sessionID/callID String\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
diff --git a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java
index c7cd3d6a..529c759c 100644
--- a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java
+++ b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.carestream;
 
 import java.io.IOException;
@@ -20,18 +41,17 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @PropertySource("classpath:myapp.properties")
 @RestController
 @RequestMapping(value = "/carestream")
-public class CareStreamCreateOrderController
-{
+public class CareStreamCreateOrderController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	private static final char END_OF_BLOCK = '\u001c';
 	private static final char START_OF_BLOCK = '\u000b';
 	private static final char CARRIAGE_RETURN = 13;
-	private static final int MAX_BYTES = 1024;
 
 	@Value("${carestream_socket_ip}")
 	private String carestreamSocketIP;
@@ -40,33 +60,26 @@ public class CareStreamCreateOrderController
 	private int carestreamSocketPort;
 
 	@CrossOrigin()
-	@RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST },
-			produces =
-	{ "application/json" })
+	@ApiOperation(value = "Create order")
+	@RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+			"application/json" })
 	public String createOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\","
-			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String createOrder) throws UnknownHostException, IOException
-	{
-		// JSONObject requestOBJ = new JSONObject(providerBlocking);
+			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String createOrder)
+			throws UnknownHostException, IOException {
 		OutputResponse response = new OutputResponse();
 		Socket socket = null;
-		try
-		{
+		try {
 
 			CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(createOrder, CreateOrderData.class);
 
-			// public static void main(String[] args) {
-
 			String firstName = benificiaryDetails.getFirstName();
-
 			String lastName = benificiaryDetails.getLastName();
 			String patientID = benificiaryDetails.getPatientID();
 			String dob = benificiaryDetails.getDob();
 			String gender = benificiaryDetails.getGender();
 			String acc = benificiaryDetails.getAcc();
 
-			// Socket socket = new Socket("192.168.1.101", 1235);
 			socket = new Socket(carestreamSocketIP, carestreamSocketPort);
-			// System.out.println("Connected to Server");
 
 			StringBuffer testHL7MassageToTransmit = new StringBuffer();
 			testHL7MassageToTransmit.append(START_OF_BLOCK)
@@ -83,97 +96,46 @@ public String createOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"
 
 			InputStream in = socket.getInputStream();
 			OutputStream out = socket.getOutputStream();
-			// Send the MLLP -wrapped HL7 message to the server
 			out.write(testHL7MassageToTransmit.toString().getBytes());
 
-			// byte[] byteBuffer = new byte[MAX_BYTES];
-			// StringBuilder resultCS = new StringBuilder();
-			// String responseFromCS = "";
-			// int numBytes = 0;
-			// do {
-			// numBytes = in.read(byteBuffer);
-			// resultCS.append(new String(byteBuffer).trim());
-			// } while (!(numBytes<MAX_BYTES));
-			//
-			// if (resultCS != null && resultCS.length() > 0) {
-			// response.setResponse("Order successfully created");
-			// } else {
-			// response.setResponse("Error in order creation");
-			// }
-			//
 			byte[] byteBuffer = new byte[50];
-			if(in.read(byteBuffer)>0){
-			//in.read(byteBuffer);
-			
-			String resultCS = new String(byteBuffer);
-			if (resultCS != null && resultCS.length() > 0)
-			{
-				response.setResponse("Order successfully created");
-			} else
-			{
-				response.setResponse("Error in order creation");
+			if (in.read(byteBuffer) > 0) {
+
+				String resultCS = new String(byteBuffer);
+				if (resultCS != null && resultCS.length() > 0) {
+					response.setResponse("Order successfully created");
+				} else {
+					response.setResponse("Error in order creation");
+				}
 			}
-			}
-
-			// String s = new Gson().toJson(byteBuffer);
-			// System.out.println("Receiver from server: "+ new
-			// String(byteBuffer));
-
-			// Close the socket and its streams
-
-			// socket.close();
-
-			// socket.getInputStream();
-
-			/*
-			 * String ip = "localhost"; int port = 8082;
-			 * 
-			 * String testMassage = "This is the test Massage that the client will transmit"; byte[] byteBuffer1 =
-			 * testMassage.getBytes(); Socket socket1 = new Socket(ip, port); System.out.println(
-			 * "connected to the Server"); InputStream in1 = socket.getInputStream(); OutputStream out1 =
-			 * socket.getOutputStream();
-			 * 
-			 * // Send the Massage to the server out1.write(byteBuffer); in1.read(byteBuffer); // Close the socket and
-			 * its Streams System.out.println("Massage received form Server11" + new String(byteBuffer));
-			 */
 
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 			response.setError(e);
 
-		} finally
-		{
+		} finally {
 			if (socket != null)
 				socket.close();
 		}
 
-		/**
-		 * sending the response...
-		 */
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST },
-			produces =
-	{ "application/json" })
+	@ApiOperation(value = "Update order")
+	@RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+			"application/json" })
 	public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\","
-			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}")  @RequestBody String UpdateOrder) throws UnknownHostException, IOException
-	{
-		// JSONObject requestOBJ = new JSONObject(providerBlocking);
+			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String UpdateOrder)
+			throws UnknownHostException, IOException {
 		OutputResponse response = new OutputResponse();
 		Socket socket = null;
 
-		try
-		{
+		try {
 
 			CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(UpdateOrder, CreateOrderData.class);
 
-			// public static void main(String[] args) {
-
 			String firstName = benificiaryDetails.getFirstName();
-			String middleName = benificiaryDetails.getMiddleName();
 			String lastName = benificiaryDetails.getLastName();
 			String patientID = benificiaryDetails.getPatientID();
 			String dob = benificiaryDetails.getDob();
@@ -181,7 +143,6 @@ public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"
 			String acc = benificiaryDetails.getAcc();
 
 			socket = new Socket("192.168.1.101", 1235);
-//			System.out.println("Connected to Server");
 
 			StringBuffer testHL7MassageToTransmit = new StringBuffer();
 			testHL7MassageToTransmit.append(START_OF_BLOCK)
@@ -202,60 +163,47 @@ public String updateOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"
 			out.write(testHL7MassageToTransmit.toString().getBytes());
 
 			byte[] byteBuffer = new byte[200];
-			if(in.read(byteBuffer)>0) {
-			//in.read(byteBuffer);
-			// System.out.println("Receiver from server: "+ new
-			// String(byteBuffer));
+			if (in.read(byteBuffer) > 0) {
 
-			response.setResponse("Receiver from server: " + new String(byteBuffer));
-			// Close the socket and its streams
+				response.setResponse("Receiver from server: " + new String(byteBuffer));
+				// Close the socket and its streams
 
-			socket.close();
+				socket.close();
 			}
 
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 			response.setError(e);
 
-		}finally {
-			if(socket!=null)
-			socket.close();
+		} finally {
+			if (socket != null)
+				socket.close();
 		}
 
-		/**
-		 * sending the response...
-		 */
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST },
-			produces =
-	{ "application/json" })
+	@ApiOperation(value = "Delete order")
+	@RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
+			"application/json" })
 	public String deleteOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"String\",\"LastName\":\"String\","
-			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String deleteOrder) throws UnknownHostException, IOException
-	{
-		// JSONObject requestOBJ = new JSONObject(providerBlocking);
+			+ "\"gender\":\"String\",\"dob\":\"String\",\"patientID\":\"String\",\"acc\":\"String\"}") @RequestBody String deleteOrder)
+			throws UnknownHostException, IOException {
 		OutputResponse response = new OutputResponse();
 		Socket socket = null;
-		try
-		{
+		try {
 
 			CreateOrderData benificiaryDetails = InputMapper.gson().fromJson(deleteOrder, CreateOrderData.class);
 
-			// public static void main(String[] args) {
-
 			String firstName = benificiaryDetails.getFirstName();
-			String middleName = benificiaryDetails.getMiddleName();
 			String lastName = benificiaryDetails.getLastName();
 			String patientID = benificiaryDetails.getPatientID();
 			String dob = benificiaryDetails.getDob();
 			String gender = benificiaryDetails.getGender();
 			String acc = benificiaryDetails.getAcc();
 
-		    socket = new Socket("192.168.1.101", 1235);
-//			System.out.println("Connected to Server");
+			socket = new Socket("192.168.1.101", 1235);
 
 			StringBuffer testHL7MassageToTransmit = new StringBuffer();
 			testHL7MassageToTransmit.append(START_OF_BLOCK)
@@ -276,30 +224,21 @@ public String deleteOrder(@ApiParam("{\"firstName\":\"String\",\"middleName\":\"
 			out.write(testHL7MassageToTransmit.toString().getBytes());
 
 			byte[] byteBuffer = new byte[200];
-			if(in.read(byteBuffer)>0) {
-			//in.read(byteBuffer);
-			// System.out.println("Receiver from server: "+ new
-			// String(byteBuffer));
+			if (in.read(byteBuffer) > 0) {
 
-			response.setResponse("Receiver from server: " + new String(byteBuffer));
-			// Close the socket and its streams
+				response.setResponse("Receiver from server: " + new String(byteBuffer));
 
-			//socket.close();
 			}
 
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 			response.setError(e);
 
-		}finally {
-			if(socket!=null)
-			socket.close();
+		} finally {
+			if (socket != null)
+				socket.close();
 		}
 
-		/**
-		 * sending the response...
-		 */
 		return response.toString();
 	}
 
diff --git a/src/main/java/com/iemr/common/controller/carestream/package-info.java b/src/main/java/com/iemr/common/controller/carestream/package-info.java
deleted file mode 100644
index 63e29c03..00000000
--- a/src/main/java/com/iemr/common/controller/carestream/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 
- */
-/**
- * @author NE298657
- * @date 19-03-2018
- *
- */
-package com.iemr.common.controller.carestream;
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/controller/cti/CTIController.java b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
similarity index 54%
rename from src/main/java/com/iemr/common/controller/cti/CTIController.java
rename to src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
index 280044a9..1fd62153 100644
--- a/src/main/java/com/iemr/common/controller/cti/CTIController.java
+++ b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.cti;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,91 +38,37 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RestController
 @RequestMapping(value = "/cti")
-public class CTIController
-{
+public class ComputerTelephonyIntegrationController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	CTIService ctiService;
 
 	@Autowired
-	public void setCtiService(CTIService ctiService)
-	{
+	public void setCtiService(CTIService ctiService) {
 		this.ctiService = ctiService;
 	}
 
-	/*
-	 * API for agent skill add and update:
-	 */
-	/*
-	 * Input: http://10.208.122.99/apps/cust_appsHandler.php?transaction_id=
-	 * CTI_AGENT_SKILL_ADDUPDATE&agent_id=2003&skill= English&weight=20&type=add&resFormat=3
-	 */
-	/* Output: */
-	@Deprecated
 	@CrossOrigin()
-	@RequestMapping(value = "/addUpdateAgentSkills", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String addUpdateAgentSkills(
-			@ApiParam("{\"agent_id\":\"Integer\", \"skill\":\"String skill name\", "
-					+ "\"weight\":\"Integer agent proficiency/weight\", "
-					+ "\"type\":\"String: Operation Type add/update\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
-		OutputResponse response = new OutputResponse();
-		logger.info("addUpdateAgentSkills received a request " + request);
-		try
-		{
-
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			response = ctiService.addUpdateAgentSkills(request, remoteAddress);
-		} catch (Exception e)
-		{
-			logger.error("addUpdateAgentSkills failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("addUpdateAgentSkills sending response " + response);
-		return response.toString();
-	}
-
-	/*
-	 * API for get campaign wise skill details:
-	 */
-	/*
-	 * Input: http://10.208.122.99/apps/cust_appsHandler.php?transaction_id=
-	 * CTI_GET_CAMPAIGN_SKILLS&campaign_name=[value]& resFormat=3
-	 */
-	/*
-	 * Output: { "response": { "transaction_id": "CTI_GET_CAMPAIGN_SKILLS" , "response_code": "1", "status": "SUCCESS",
-	 * "campaign" : UAT_1097_CO, "skills" : {"English":"1","Hindi":"3","Kannada":"2"}, "reason": ""} }
-	 */
-	@CrossOrigin()
-	@RequestMapping(value = "/getCampaignSkills", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get campaign skills")
+	@RequestMapping(value = "/getCampaignSkills", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getCampaignSkills(
 			@ApiParam("{\"campaign_name\":\"String: Name of the campaign\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getCampaignSkills received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getCampaignSkills(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getCampaignSkills failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -109,28 +76,20 @@ public String getCampaignSkills(
 		return response.toString();
 	}
 
-	/*
-	 * API for get agent status: http://10.208.122.99/apps/appsHandler.php?transaction_id=
-	 * CTI_CHECK_AGENT_STATE&agent_id=AGENT_ID&ip=&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getAgentState", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get agent state")
+	@RequestMapping(value = "/getAgentState", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAgentState(@ApiParam("{\"agent_id\":\"String: agent id\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAgentState received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getAgentState(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAgentState failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -138,28 +97,20 @@ public String getAgentState(@ApiParam("{\"agent_id\":\"String: agent id\"}") @Re
 		return response.toString();
 	}
 
-	/*
-	 * API for get agent call statistics: http://10.208.122.99/apps/appsHandler.php?transaction_id=
-	 * CTI_AGENT_CALL_RECORD&agent_id=AGENT_ID&ip=&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getAgentCallStats", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get agent call stats")
+	@RequestMapping(value = "/getAgentCallStats", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAgentCallStats(@ApiParam("{\"agent_id\":\"String: agent id\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAgentCallStats received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getAgentCallStats(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAgentCallStats failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -167,41 +118,22 @@ public String getAgentCallStats(@ApiParam("{\"agent_id\":\"String: agent id\"}")
 		return response.toString();
 	}
 
-	/*
-	 * API for get campaign names/*
-	 */
-	/*
-	 * http://10.208.122.99/apps/cust_appsHandler.php?transaction_id= CTI_GET_CAMPAIGNS&campaign_type=&searchkey=104&
-	 * resFormat=3
-	 */
-	/*
-	 * Output:{ "response": { "transaction_id": "CTI_GET_CAMPAIGNS" , "response_code": "1", "status": "SUCCESS",
-	 * "campaign" : [{"campaign_id":"7","campaign_name":"UAT_104_CO"},{"campaign_id":"5",
-	 * "campaign_name":"UAT_104_HAO"},{ "campaign_id":"3","campaign_name":"UAT_104_MO"},{"campaign_id":"10",
-	 * "campaign_name":"UAT_104_PD"},{"campaign_id":
-	 * "2","campaign_name":"UAT_104_RO"},{"campaign_id":"6","campaign_name": "UAT_104_SIO"},{"campaign_id":"11",
-	 * "campaign_name":"UAT_104_Surveyor"}], "reason": ""} }
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getCampaignNames", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get campaign names")
+	@RequestMapping(value = "/getCampaignNames", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getCampaignNames(
 			@ApiParam("{\"serviceName\":\"String: service name\", "
 					+ "\"type\":\"String - inbound, outbound\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getCampaignNames received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getCampaignNames(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getCampaignNames failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -209,72 +141,21 @@ public String getCampaignNames(
 		return response.toString();
 	}
 
-	/*
-	 * API set agent status as ready
-	 */
-	/*
-	 * http://10.208.122.99/apps/appsHandler.php?transaction_id=CTI_LOGIN& agent_id=2003&resFormat=3
-	 */
-	/*
-	 * Output: { "response": { "transaction_id": "CTI_LOGIN", "agentid": "2003", "requestparam": "login", "status":
-	 * "SUCCESS", "response_code": "1" } }
-	 */
-	@Deprecated
 	@CrossOrigin()
-	@RequestMapping(value = "/doAgentLogin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String doAgentLogin(@ApiParam("{\"agent_id\":\"String: agent_id\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
-		OutputResponse response = new OutputResponse();
-		logger.info("doAgentLogin received a request " + request);
-		try
-		{
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			response = ctiService.doAgentLogin(request, remoteAddress);
-		} catch (Exception e)
-		{
-			logger.error("doAgentLogin failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("doAgentLogin sending response " + response);
-		return response.toString();
-	}
-
-	/*
-	 * API for get user key:
-	 */
-	/*
-	 * http://10.208.122.99/apps/cust_appsHandler.php?transaction_id= CTI_LOGIN_KEY&username=vinays&password=123456&
-	 * resFormat=3
-	 */
-	/*
-	 * output: { "response": { "transaction_id": "CTI_LOGIN_KEY" , "response_code": "1", "status": "SUCCESS", "username"
-	 * : "adminrw", "login_key" : "83977518258616", "reason": ""} }
-	 */
-	@CrossOrigin()
-	@RequestMapping(value = "/getLoginKey", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get login key")
+	@RequestMapping(value = "/getLoginKey", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getLoginKey(
 			@ApiParam("{\"username\":\"String: user name\", \"password\":\"String: password\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getLoginKey received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getLoginKey(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getLoginKey failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -282,33 +163,20 @@ public String getLoginKey(
 		return response.toString();
 	}
 
-	/*
-	 * API for agent logout
-	 */
-	/*
-	 * http://10.208.122.99/apps/appsHandler.php?transaction_id=CTI_LOGOUT& agent_id=2003&ip=10.208.24.185&resFormat= 3
-	 */
-	/*
-	 * Output: { "response": { "transaction_id": "CTI_LOGOUT", "agentid": "2003", "requestparam": "logoff", "status":
-	 * "FAIL", "response_code": "-1" } }
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Do agent logout")
 	@RequestMapping(value = "/doAgentLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String doAgentLogout(@ApiParam("{\"agent_id\":\"String: agent id\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("agentLogout received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.agentLogout(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("agentLogout failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -316,32 +184,20 @@ public String doAgentLogout(@ApiParam("{\"agent_id\":\"String: agent id\"}") @Re
 		return response.toString();
 	}
 
-	/*
-	 * API for get online agent names
-	 */
-	/*
-	 * http://10.208.122.99/apps/appsHandler.php?transaction_id=CTI_ONLINE_AGENTS &agent_id=2003&ip=10.208.24.185&
-	 * resFormat=3
-	 */
-	/* Output: */
 	@CrossOrigin()
-	@RequestMapping(value = "/getOnlineAgents", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get online agents")
+	@RequestMapping(value = "/getOnlineAgents", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getOnlineAgents(@ApiParam("{\"agent_id\":\"String: agent id\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getOnlineAgents received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getOnlineAgents(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getOnlineAgents failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -349,36 +205,21 @@ public String getOnlineAgents(@ApiParam("{\"agent_id\":\"String: agent id\"}") @
 		return response.toString();
 	}
 
-	/*
-	 * API for get campaign names:
-	 */
-	/*
-	 * http://10.208.122.99/apps/appsHandler.php?transaction_id=CTI_DIAL&agent_id =2003&ip=10.208.24.185&phone_num=
-	 * 1234567899&resFormat=3
-	 */
-	/*
-	 * Output: { "response": { "transaction_id": "CTI_DIAL", "agentid": "2003", "requestparam": "1234567899", "status":
-	 * "SUCCESS", "response_code": "1" } }
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/callBeneficiary", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Call beneficiary")
+	@RequestMapping(value = "/callBeneficiary", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String callBeneficiary(
 			@ApiParam("{\"agent_id\":\"String: agent_id\", \"phone_num\":\"String - phone number\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("callBeneficiary received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.callBeneficiary(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("callBeneficiary failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -386,40 +227,24 @@ public String callBeneficiary(
 		return response.toString();
 	}
 
-	/*
-	 * API for add/update user data in CTI
-	 */
-	/*
-	 * http://10.208.122.99/apps/cust_appsHandler.php?transaction_id= CTI_SYSTEM_USER&username=vinays1097&password=
-	 * vinays123&firstname=vinay&lastname=sompur&phone=1234567899&email= vinays@wipro.com&role=supervisor_104&
-	 * sessiontimeout=60000&designation=supervisor&resFormat=3
-	 */
-	/*
-	 * Output: { "response": { "transaction_id": "CTI_SYSTEM_USER" , "user_name": "vinays1097" , "response_code": "1",
-	 * "status": "SUCCESS", "reason": ""} }
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/addUpdateUserData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Add update user data")
+	@RequestMapping(value = "/addUpdateUserData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String addUpdateUserData(
 			@ApiParam("{\"username\":\"String: username\", \"password\":\"String - password\", "
 					+ "\"firstname\":\"String - firstname\", \"lastname\":\"String - lastname\", "
 					+ "\"phone\":\"String - phone\", \"email\":\"String - email\", \"role\":\"String - role\""
 					+ ", \"designation\":\"String - designation\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateUserData received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.addUpdateUserData(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("updateUserData failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -427,35 +252,20 @@ public String addUpdateUserData(
 		return response.toString();
 	}
 
-	/*
-	 * API to get transferable campaigns
-	 */
-	/*
-	 * http://10.208.122.99/apps/appsHandler.php?transaction_id=
-	 * CTI_TRANSFERABLE_CAMPAIGNS&agent_id=2003&ip=10.208.18.85& resFormat=3
-	 */
-	/*
-	 * { "response": { "transaction_id": "CTI_TRANSFERABLE_CAMPAIGNS", "agentid": "2003", "campaign":
-	 * [{"campaign_id":"1","campaign_name":"UAT_1097_CO"},{"campaign_id":"4", "campaign_name":"UAT_1097_MO"}] } }
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getTransferCampaigns", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get transfer campaigns")
+	@RequestMapping(value = "/getTransferCampaigns", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getTransferCampaigns(@ApiParam("{\"agent_id\":\"String: agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getTransferCampaigns received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getTransferCampaigns(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getTransferCampaigns failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -463,34 +273,20 @@ public String getTransferCampaigns(@ApiParam("{\"agent_id\":\"String: agentID\"}
 		return response.toString();
 	}
 
-	/*
-	 * API to get campaign roles
-	 */
-	/*
-	 * http://10.208.122.99/apps/cust_appsHandler.php?transaction_id= CTI_GET_CAMP_ROLE&campaign=UAT_1097_CO&resFormat=3
-	 */
-	/*
-	 * { "response": { "transaction_id": "CTI_GET_CAMP_ROLE" , "campaign": "UAT_1097_CO" , "roles": "Supervisor_1097" ,
-	 * "response_code": "1", "status": "SUCCESS", "reason": ""} }
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getCampaignRoles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get campaign roles")
+	@RequestMapping(value = "/getCampaignRoles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getCampaignRoles(@ApiParam("{\"campaign\":\"String: campaign name\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getCampaignRoles received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getCampaignRoles(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getCampaignRoles failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -498,29 +294,22 @@ public String getCampaignRoles(@ApiParam("{\"campaign\":\"String: campaign name\
 		return response.toString();
 	}
 
-	/*
-	 * API to set Call Disposition
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/setCallDisposition", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Set call disposition")
+	@RequestMapping(value = "/setCallDisposition", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String setCallDisposition(
 			@ApiParam("{\"agent_id\":\"String: agentID\", \"cust_disp\":\"String - call subtype\", "
 					+ "\"category\":\"String: call type\", \"session_id\":\"String: unique call id from c-zentrix\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("setCallDisposition received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.setCallDisposition(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("setCallDisposition failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -528,30 +317,22 @@ public String setCallDisposition(
 		return response.toString();
 	}
 
-	/*
-	 * API to create voice recordings http://CTI_SERVER/apps/appsHandler.php?transaction_id=CTI_MIX_VOICE_FILE&
-	 * agent_id=AGENT_ID&session_id=SESSION_ID&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/createVoiceFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Create voice file")
+	@RequestMapping(value = "/createVoiceFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String createVoiceFile(
 			@ApiParam("{\"agent_id\":\"String: agentID\", "
 					+ "\"session_id\":\"String: unique call id from c-zentrix\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("createVoiceFile received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.createVoiceFile(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("createVoiceFile failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -559,30 +340,22 @@ public String createVoiceFile(
 		return response.toString();
 	}
 
-	/*
-	 * API to create voice recordings http://CTI_SERVER/apps/appsHandler.php?transaction_id=GET_VOICE_FILENAME&
-	 * agent_id=AGENT_ID&session_id=SESSION_ID&ip=IP_ADDRESS&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/getVoiceFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get voice file")
+	@RequestMapping(value = "/getVoiceFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getVoiceFile(
 			@ApiParam("{\"agent_id\":\"String: agentID\", "
 					+ "\"session_id\":\"String: unique call id from c-zentrix\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getVoiceFile received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getVoiceFile(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getVoiceFile failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -590,28 +363,20 @@ public String getVoiceFile(
 		return response.toString();
 	}
 
-	/*
-	 * API to create voice recordings http://CTI_SERVER/apps/appsHandler.php?transaction_id=GET_VOICE_FILENAME&
-	 * agent_id=AGENT_ID&session_id=SESSION_ID&ip=IP_ADDRESS&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/disconnectCall", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Disconnect call")
+	@RequestMapping(value = "/disconnectCall", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String disconnectCall(@ApiParam("{\"agent_id\":\"String: agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("disconnectCall received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.disconnectCall(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("disconnectCall failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -619,28 +384,20 @@ public String disconnectCall(@ApiParam("{\"agent_id\":\"String: agentID\"}") @Re
 		return response.toString();
 	}
 
-	/*
-	 * API to create voice recordings http://CTI_SERVER/apps/appsHandler.php?transaction_id=GET_VOICE_FILENAME&
-	 * agent_id=AGENT_ID&session_id=SESSION_ID&ip=IP_ADDRESS&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/switchToInbound", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Switch to inbound")
+	@RequestMapping(value = "/switchToInbound", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String switchToInbound(@ApiParam("{\"agent_id\":\"String: agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("disconnectCall received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.switchToInbound(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("disconnectCall failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -648,28 +405,20 @@ public String switchToInbound(@ApiParam("{\"agent_id\":\"String: agentID\"}") @R
 		return response.toString();
 	}
 
-	/*
-	 * API to create voice recordings http://CTI_SERVER/apps/appsHandler.php?transaction_id=GET_VOICE_FILENAME&
-	 * agent_id=AGENT_ID&session_id=SESSION_ID&ip=IP_ADDRESS&resFormat=3
-	 */
 	@CrossOrigin()
-	@RequestMapping(value = "/switchToOutbound", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Switch to outbound")
+	@RequestMapping(value = "/switchToOutbound", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String switchToOutbound(@ApiParam("{\"agent_id\":\"String: agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("disconnectCall received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.switchToOutbound(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("disconnectCall failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -678,23 +427,19 @@ public String switchToOutbound(@ApiParam("{\"agent_id\":\"String: agentID\"}") @
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getAgentIPAddress", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get agent IP address")
+	@RequestMapping(value = "/getAgentIPAddress", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAgentIPAddress(@ApiParam("{\"agent_id\":\"String: agentID\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAgentIPAddress received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getAgentIPAddress(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAgentIPAddress failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -702,76 +447,22 @@ public String getAgentIPAddress(@ApiParam("{\"agent_id\":\"String: agentID\"}")
 		return response.toString();
 	}
 
-	/*
-	 * Below block and unblock functionality is not allowed to be called directly. It is internally called from
-	 * beneficiary call API
-	 */
-	// @CrossOrigin()
-	// @RequestMapping(value = "/blockNumber", method = RequestMethod.POST,
-	// produces = MediaType.APPLICATION_JSON)
-	// public String blockNumber(@ApiParam("{\"phoneNo\":\"String: phone
-	// number\", campaignName:\"Name of campaign\"}")
-	// @RequestBody String request,
-	// HttpServletRequest serverRequest)
-	// {
-	// OutputResponse response = new OutputResponse();
-	// logger.info("blockNumber received a request " + request);
-	// try
-	// {
-	// response = ctiService.blockNumber(request,
-	// serverRequest.getRemoteAddr());
-	// } catch (Exception e)
-	// {
-	// logger.error("blockNumber failed with error " + e.getMessage(), e);
-	// response.setError(e);
-	// }
-	// logger.info("blockNumber sending response " + response);
-	// return response.toString();
-	// }
-	//
-	// @CrossOrigin()
-	// @RequestMapping(value = "/unblockNumber", method = RequestMethod.POST,
-	// produces = MediaType.APPLICATION_JSON)
-	// public String unblockNumber(@ApiParam("{\"phoneNo\":\"String: phone
-	// number\", campaignName:\"Name of
-	// campaign\"}") @RequestBody String request,
-	// HttpServletRequest serverRequest)
-	// {
-	// OutputResponse response = new OutputResponse();
-	// logger.info("unblockNumber received a request " + request);
-	// try
-	// {
-	// response = ctiService.unblockNumber(request,
-	// serverRequest.getRemoteAddr());
-	// } catch (Exception e)
-	// {
-	// logger.error("unblockNumber failed with error " + e.getMessage(), e);
-	// response.setError(e);
-	// }
-	// logger.info("unblockNumber sending response " + response);
-	// return response.toString();
-	// }
-
 	@CrossOrigin()
-	@RequestMapping(value = "/getAvailableAgentSkills", method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Get available agent skills")
+	@RequestMapping(value = "/getAvailableAgentSkills", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAvailableAgentSkills(
 			@ApiParam("{\"campaignName\":\"String: campaign name\", "
 					+ "\"skill\":\"String: skill name\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAvailableAgentSkills received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getAvailableAgentSkills(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAvailableAgentSkills failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -780,29 +471,24 @@ public String getAvailableAgentSkills(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/transferCall", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String
-			transferCall(@ApiParam("{\"transfer_from\":\"String - agent id who is transferring call\", "
-					+ "\"transfer_to\":\"String - agent ID who would be receiving call\", "
-					+ "\"transfer_campaign_info\": \"String - name of the campaign to which call will be transferred\", "
-					+ "\"skill_transfer_flag\":\"Integer - 0 for no skill or 1 for skill based\", "
-					+ "\"skill\":\"String - skill name\",\"benCallID\":\"Integer - callID as in CRM\", \"agentIPAddress\":\"Optional String - agent IP address\","
-					+ "\"callTypeID\" : \"Integer\"}. transfer_to will be having higher precedence to all "
-					+ "3 remaining inputs") @RequestBody String request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Transfer call")
+	@RequestMapping(value = "/transferCall", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String transferCall(@ApiParam("{\"transfer_from\":\"String - agent id who is transferring call\", "
+			+ "\"transfer_to\":\"String - agent ID who would be receiving call\", "
+			+ "\"transfer_campaign_info\": \"String - name of the campaign to which call will be transferred\", "
+			+ "\"skill_transfer_flag\":\"Integer - 0 for no skill or 1 for skill based\", "
+			+ "\"skill\":\"String - skill name\",\"benCallID\":\"Integer - callID as in CRM\", \"agentIPAddress\":\"Optional String - agent IP address\","
+			+ "\"callTypeID\" : \"Integer\"}. transfer_to will be having higher precedence to all "
+			+ "3 remaining inputs") @RequestBody String request, HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("transferCall received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.transferCall(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("transferCall failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -811,28 +497,24 @@ public String getAvailableAgentSkills(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/customerPreferredLanguage", method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Customer preferred language")
+	@RequestMapping(value = "/customerPreferredLanguage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String customerPreferredLanguage(
 			@ApiParam("{\"cust_ph_no\":\"phone number of customer\", "
 					+ "\"campaign_name\":\"campaign name for provider from provider service mapping\", "
 					+ "\"language\": \"String - language name selected by user\", "
 					+ "\"action\":\"String - select or update\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("customerPreferredLanguage received a request " + request);
-		try
-		{
+		try {
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			CustomerLanguage custLang = InputMapper.gson().fromJson(request, CustomerLanguage.class);
 			response = ctiService.customerPreferredLanguage(custLang, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("customerPreferredLanguage failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -840,89 +522,21 @@ public String customerPreferredLanguage(
 		return response.toString();
 	}
 
-	/*
-	 * API to add Numbers for auto dailing
-	 */
-	/*
-	 * http://helplines.piramalswasthya.org/apps/addlead.php?mobile=88548585&camp_name=H_MCTS_MO&Agent_id=200001&
-	 * paramter1=123
-	 */
-	/* Output: */
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/addAutoDialNumbers", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String addAutoDialNumbers(
-			@ApiParam("{\"agent_id\":\"Integer\", \"mobile\":\"String mobile number\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
-		OutputResponse response = new OutputResponse();
-		logger.info("addAutoDialNumbers received a request " + request);
-		try
-		{
-
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			response = ctiService.addAutoDialNumbers(request, remoteAddress);
-		} catch (Exception e)
-		{
-			logger.error("addAutoDialNumbers failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("addAutoDialNumbers sending response " + response);
-		return response.toString();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/setAutoDialNumbers", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String setAutoDialNumbers(
-			@ApiParam("{\"agent_id\":\"Integer\", \"mobile\":\"String mobile number\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
-		OutputResponse response = new OutputResponse();
-		logger.info("setAutoDialNumbers received a request " + request);
-		try
-		{
-
-			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
-				remoteAddress = serverRequest.getRemoteAddr();
-			}
-			response = ctiService.setAutoDialNumbers(request, remoteAddress);
-		} catch (Exception e)
-		{
-			logger.error("setAutoDialNumbers failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("setAutoDialNumbers sending response " + response);
-		return response.toString();
-	}
-
 	@CrossOrigin()
-	@RequestMapping(value = "/getIVRSPathDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get IVRS path details")
+	@RequestMapping(value = "/getIVRSPathDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getIVRSPathDetails(@ApiParam("{\"agent_id\":\"Integer\"}") @RequestBody String request,
-			HttpServletRequest serverRequest)
-	{
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getIVRSPathDetails received a request " + request);
-		try
-		{
+		try {
 
 			String remoteAddress = serverRequest.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0)
-			{
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
 				remoteAddress = serverRequest.getRemoteAddr();
 			}
 			response = ctiService.getIVRSPathDetails(request, remoteAddress);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getIVRSPathDetails failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/directory/DirectoryController.java b/src/main/java/com/iemr/common/controller/directory/DirectoryController.java
index 28a365a1..a6ba0563 100644
--- a/src/main/java/com/iemr/common/controller/directory/DirectoryController.java
+++ b/src/main/java/com/iemr/common/controller/directory/DirectoryController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.directory;
 
 import java.util.List;
@@ -58,16 +79,14 @@ public void setDirectoryMappingService(DirectoryMappingService directoryMappingS
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get directory")
 	@RequestMapping(value = "/getDirectory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
 			headers = "Authorization")
 	public String getDirectory()
 	{
 		OutputResponse response = new OutputResponse();
-		// logger.info("getDirectory request " + directoryRequest);
 		try
 		{
-			// Directory directory =
-			// inputMapper.gson().fromJson(directoryRequest, Directory.class);
 			JSONObject responseObj = new JSONObject();
 			responseObj.put("directory", directoryService.getDirectories());
 			response.setResponse(responseObj.toString());
@@ -81,6 +100,7 @@ public String getDirectory()
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get directory V1")
 	@RequestMapping(value = "/getDirectoryV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
 			headers = "Authorization")
 	public String getDirectoryV1(
@@ -92,8 +112,6 @@ public String getDirectoryV1(
 		{
 			Directory directory = inputMapper.gson().fromJson(directoryRequest, Directory.class);
 			JSONObject responseObj = new JSONObject();
-			// responseObj.put("directory",
-			// directoryService.getDirectories(directory.getProviderServiceMapID()));
 			response.setResponse("{\"directory\":"
 					+ directoryService.getDirectories(directory.getProviderServiceMapID()).toString() + "}");
 		} catch (Exception e)
@@ -117,8 +135,6 @@ public String getSubDirectory(@ApiParam("{\"instituteDirectoryID\":\"Integer\"}"
 		{
 			JSONObject responseObj = new JSONObject();
 			SubDirectory subDirectoryQuery = inputMapper.gson().fromJson(subDirectoryRequest, SubDirectory.class);
-			// responseObj.put("subDirectory",
-			// subDirectoryService.getSubDirectories(subDirectoryQuery.getInstituteDirectoryID()).toString());
 			response.setResponse("{subDirectory:"
 					+ subDirectoryService.getSubDirectories(subDirectoryQuery.getInstituteDirectoryID()) + "}");
 		} catch (Exception e)
diff --git a/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java b/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java
index dd6cc1fc..c37254a3 100644
--- a/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java
+++ b/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.door_to_door_app;
 
 import org.slf4j.Logger;
@@ -27,7 +48,7 @@ public class DoorToDoorAppController {
 	private DoorToDoorService doorToDoorService;
 
 	@CrossOrigin
-	@ApiOperation(value = "getUserDetails", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Get user details", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/getUserDetails" }, method = { RequestMethod.POST })
 	public String getUserDetails(@RequestBody String requestObj) {
 		OutputResponse response = new OutputResponse();
@@ -40,7 +61,6 @@ public String getUserDetails(@RequestBody String requestObj) {
 			else
 				response.setError(5000, "user details not found");
 		} catch (Exception e) {
-			// TODO: handle exception
 			logger.error(e.toString());
 			response.setError(5000, "Unable to get user data, exception occured. " + e.toString());
 		}
@@ -49,7 +69,7 @@ public String getUserDetails(@RequestBody String requestObj) {
 	}
 
 	@CrossOrigin
-	@ApiOperation(value = "get NCD TB HRP suspected status", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Get NCD TB HRP suspected status", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = { "/getSuspectedData_HRP_TB_NCD" }, method = { RequestMethod.POST })
 	public String getSuspectedData_HRP_TB_NCD(@RequestBody String requestObj) {
 		OutputResponse response = new OutputResponse();
@@ -62,7 +82,6 @@ public String getSuspectedData_HRP_TB_NCD(@RequestBody String requestObj) {
 			else
 				response.setError(5000, "Error in getting suspected information");
 		} catch (Exception e) {
-			// TODO: handle exception
 			logger.error(e.toString());
 			response.setError(5000, "Error in getting suspected information, exception occured. " + e.toString());
 		}
diff --git a/src/main/java/com/iemr/common/controller/email/EmailController.java b/src/main/java/com/iemr/common/controller/email/EmailController.java
index aee98e60..e52c149f 100644
--- a/src/main/java/com/iemr/common/controller/email/EmailController.java
+++ b/src/main/java/com/iemr/common/controller/email/EmailController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.email;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,6 +37,7 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RequestMapping(value = "/emailController")
@@ -24,28 +46,25 @@ public class EmailController {
 
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-	
+
 	private EmailService emailService;
 
-	/**
-	 * @param emailService the emailService to set
-	 */
 	@Autowired
 	public void setEmailService(EmailService emailService) {
 		this.emailService = emailService;
 	}
-	
+
 	@CrossOrigin
+	@ApiOperation(value = "Send email")
 	@RequestMapping(value = "/SendEmail", method = RequestMethod.POST, headers = "Authorization")
-	public String SendEmail(@ApiParam("{\"FeedbackID\":\"Long\",\"emailID\":\"String\",\"is1097\":\"Boolean\"}") @RequestBody String request, HttpServletRequest serverRequest)
-	{
+	public String SendEmail(
+			@ApiParam("{\"FeedbackID\":\"Long\",\"emailID\":\"String\",\"is1097\":\"Boolean\"}") @RequestBody String request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("SendEmail request " + request);
-		try
-		{
+		try {
 			response.setResponse(emailService.SendEmail(request, serverRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("SendEmail failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -55,33 +74,30 @@ public String SendEmail(@ApiParam("{\"FeedbackID\":\"Long\",\"emailID\":\"String
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getAuthorityEmailID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getAuthorityEmailID(@ApiParam(value = "{districtID : Integer}") @RequestBody String severityRequest)
-	{
+	@ApiOperation(value = "Get authority email id")
+	@RequestMapping(value = "/getAuthorityEmailID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getAuthorityEmailID(@ApiParam(value = "{districtID : Integer}") @RequestBody String severityRequest) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(emailService.getAuthorityEmailID(severityRequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
-	
+
 	@CrossOrigin
+	@ApiOperation(value = "Send email general")
 	@RequestMapping(value = "/sendEmailGeneral", method = RequestMethod.POST, headers = "Authorization")
-	public String sendEmailGeneral(@ApiParam("{\"requestID\":\"String\",\"emailType\":\"String\",\"emailID\":\"String\"}") @RequestBody String requestID, HttpServletRequest serverRequest)
-	{
+	public String sendEmailGeneral(
+			@ApiParam("{\"requestID\":\"String\",\"emailType\":\"String\",\"emailID\":\"String\"}") @RequestBody String requestID,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
-			response.setResponse(emailService.sendEmailGeneral(requestID,serverRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		try {
+			response.setResponse(emailService.sendEmailGeneral(requestID, serverRequest.getHeader("Authorization")));
+		} catch (Exception e) {
 			logger.error("SendEmail failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java b/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java
new file mode 100644
index 00000000..9d00c314
--- /dev/null
+++ b/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java
@@ -0,0 +1,48 @@
+package com.iemr.common.controller.esanjeevani;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iemr.common.service.esanjeevani.ESanjeevaniService;
+import com.iemr.common.utils.response.OutputResponse;
+
+import io.swagger.annotations.ApiOperation;
+
+@CrossOrigin
+@RestController
+@RequestMapping(value = "/esanjeevani", headers = "Authorization")
+public class ESanjeevaniController {
+
+	@Autowired
+	private ESanjeevaniService eSanjeevaniService;
+
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@CrossOrigin
+	@ApiOperation(value = "Register patient in E-Sanjeevani and send portal url to route", consumes = "application/json", produces = "application/json")
+	@RequestMapping(value = { "/getESanjeevaniUrl/{beneficiaryReqId}" }, method = { RequestMethod.GET })
+	public String registerESanjeevaniPatient(@PathVariable Long beneficiaryReqId) {
+		OutputResponse response = new OutputResponse();
+		try {
+			logger.info("E-Sangeevani register for benRegId - " + beneficiaryReqId);
+			String res = eSanjeevaniService.registerPatient(beneficiaryReqId);
+			if (res != null)
+				response.setResponse(res);
+			else 
+				response.setError(5000, "Error while fetching E-sanjeevani route URL");
+		} catch (Exception e) {
+			response.setError(5000, "Error while fetching E-sanjeevani route URL" + e.toString());
+		}
+
+		return response.toString();
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java b/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java
index 02f2929a..52251066 100644
--- a/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java
+++ b/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java
@@ -1,7 +1,26 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.everwell.callhandle;
 
-
-
 import javax.ws.rs.core.MediaType;
 
 import org.slf4j.Logger;
@@ -13,13 +32,13 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-
-
 import com.iemr.common.service.everwell.EverwellCallHandlingService;
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
 @RequestMapping(value = "/everwellCall")
 @RestController
 public class EverwellCallController {
@@ -27,23 +46,26 @@ public class EverwellCallController {
 	private EverwellCallHandlingService beneficiaryCallService;
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call count")
 	@RequestMapping(value = "/outboundCallCount", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String outboundCallCount(@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\", " 
+	public String outboundCallCount(@ApiParam(value = "{\"providerServiceMapID\":\"called service ID integer\", "
 			+ "\"assignedUserID\":\"Optional - Integer user id to whom calls are assigned\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
 			logger.info("outboundCallCount request " + request);
-//			System.out.println("req="+request);
 			response.setResponse(beneficiaryCallService.outboundCallCount(request));
 		} catch (Exception e) {
 			logger.error("outboundCallList failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-        
+
 		return response.toString();
 	}
+
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound allocation")
 	@RequestMapping(value = "/outboundAllocation", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundAllocation(@ApiParam(value = "{\"AgentID\":[Integer Array list of Agent IDs], "
 			+ "\"allocateNo\":\"Integer - number of calls to be allocated for user\", "
@@ -58,12 +80,14 @@ public String outboundAllocation(@ApiParam(value = "{\"AgentID\":[Integer Array
 
 		return response.toString();
 	}
+
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call list")
 	@RequestMapping(value = "/outboundCallList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" called service ID integer\", "
 			+ "\"AgentID\":\"Optional - Integer ID of agent that is assigned to\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		//String auth = httpRequest.getHeader("authorization");
+		// String auth = httpRequest.getHeader("authorization");
 		try {
 			response.setResponse(beneficiaryCallService.outboundCallList(request));
 		} catch (Exception e) {
@@ -73,7 +97,9 @@ public String outboundCallList(@ApiParam(value = "{\"providerServiceMapID\":\" c
 
 		return response.toString();
 	}
+
 	@CrossOrigin()
+	@ApiOperation(value = "Reset outbound call")
 	@RequestMapping(value = "/resetOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String resetOutboundCall(
 			@ApiParam(value = "{\"EAPIIDs\":\"[Integer - Array of Outbound call ids]\"}") @RequestBody String request) {
@@ -87,7 +113,9 @@ public String resetOutboundCall(
 
 		return response.toString();
 	}
+
 	@CrossOrigin()
+	@ApiOperation(value = "Save feedback")
 	@RequestMapping(value = "/saveFeedback", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String saveCallDetails(
 			@ApiParam(value = "{\"EAPIIDs\":\"[Integer - Array of Outbound call ids]\"}") @RequestBody String request) {
@@ -101,53 +129,38 @@ public String saveCallDetails(
 
 		return response.toString();
 	}
+
 	@CrossOrigin()
+	@ApiOperation(value = "Complete outbound call")
 	@RequestMapping(value = "/completeOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String completeOutboundCall(@ApiParam(value = "{\"EAPIID\":\"Integer - Outbound call id\", "
 			+ "\"isCompleted\":\"Boolean - Value indicating call is completed/pending\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
-			String s=beneficiaryCallService.completeOutboundCall(request);
-			if(s.equalsIgnoreCase("success"))
-			response.setResponse(s);
-			else
-				response.setError(5000,"error in updating data");
-		} catch (Exception e) {
-			logger.error("outboundAllocation failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toString();
-	}
-	
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/updateIncompleteCallStatus", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String updateIncompleteCallStatus(@ApiParam(value = "") @RequestBody String request) {	
-		
-		OutputResponse response = new OutputResponse();
-		try {
-			String s=beneficiaryCallService.updateIncompleteCallStatus(request);
-			if(s.equalsIgnoreCase("success"))
-				response.setResponse("Data saved successfully");
+			String s = beneficiaryCallService.completeOutboundCall(request);
+			if (s.equalsIgnoreCase("success"))
+				response.setResponse(s);
 			else
-				response.setError(5000,"error in updating data");
+				response.setError(5000, "error in updating data");
 		} catch (Exception e) {
 			logger.error("outboundAllocation failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Get everwell feedback details")
 	@RequestMapping(value = "/getEverwellfeedbackDetails", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getEverwellfeedbackDetails(@ApiParam(value = "{\"EverwellID\":\"Integer - Everwell id\"}") @RequestBody String request) {
+	public String getEverwellfeedbackDetails(
+			@ApiParam(value = "{\"EverwellID\":\"Integer - Everwell id\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
-			String s=beneficiaryCallService.getEverwellFeedback(request);
-			if(s!=null)
+			String s = beneficiaryCallService.getEverwellFeedback(request);
+			if (s != null)
 				response.setResponse(s);
 			else
-				response.setError(5000,"error in fetching data");
+				response.setError(5000, "error in fetching data");
 		} catch (Exception e) {
 			logger.error("outboundAllocation failed with error " + e.getMessage(), e);
 			response.setError(e);
@@ -156,8 +169,10 @@ public String getEverwellfeedbackDetails(@ApiParam(value = "{\"EverwellID\":\"In
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Outbound call list with mobile number")
 	@RequestMapping(value = "/outboundCallListWithMobileNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String outboundCallListWithMobileNumber(@ApiParam(value = "{\"PrimaryNumber\":\"PrimaryNumber\", \"providerServiceMapID\":\"called service ID integer\"}") @RequestBody String request) {
+	public String outboundCallListWithMobileNumber(
+			@ApiParam(value = "{\"PrimaryNumber\":\"PrimaryNumber\", \"providerServiceMapID\":\"called service ID integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
 			response.setResponse(beneficiaryCallService.outboundCallListWithMobileNumber(request));
@@ -168,11 +183,8 @@ public String outboundCallListWithMobileNumber(@ApiParam(value = "{\"PrimaryNumb
 		return response.toString();
 	}
 
-	/***
-	 * @author SH20094090
-	 * @purpose check if call already completed
-	 ***/
 	@CrossOrigin()
+	@ApiOperation(value = "Check if already called")
 	@RequestMapping(value = "/checkIfAlreadyCalled", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String checkIfCalledOrNot(@ApiParam(value = "{\"providerServiceMapID\":\" called service ID integer\", "
 			+ "\"eapiId\":\" Integer\"}") @RequestBody String request) {
diff --git a/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java b/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java
index 649b17e6..978ad481 100644
--- a/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java
+++ b/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.everwellTest;
 
 import javax.ws.rs.core.MediaType;
@@ -15,6 +36,8 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 @RequestMapping(value = "/everwell")
 public class EverwellController {
@@ -22,16 +45,11 @@ public class EverwellController {
 	Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get data")
 	@RequestMapping(value = "/getjson", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getdata() {
 		OutputResponse response = new OutputResponse();
 		try {
-			// BenCallServicesMappingHistory service1097HistoryDetails =
-			// inputMapper.gson().fromJson(beneficiaryRequest,
-			// BenCallServicesMappingHistory.class);
-			// List<BenCallServicesMappingHistory> serviceHistoryList =
-			// servicesHistoryService
-			// .getServiceHistory(service1097HistoryDetails.getBeneficiaryRegID());
 			String str = null;
 			str = "{   \"Success\": true,\"TotalRecords\": 3,\"currentPage\": 1,\"Data\": [{ \r\n"
 					+ "					        \"Id\": 1232, \r\n"
@@ -46,560 +64,6 @@ public String getdata() {
 					+ "					        \"AdherencePercentage\": 50 \r\n" + "					      }]\r\n"
 					+ "						  }";
 
-//			if(Authorization.equals("Bearer XwvQ8FWJgL1r1coDA9hI9Zfn0BnzSe0MsI5ECb6UhhSFz96ASoh")) {
-//					   str = "{   \"Success\": true,\"TotalRecords\": 3,\"currentPage\": 1,\"Data\": [{ \r\n" + 
-//					   		"					        \"Id\": 1232, \r\n" + 
-//					   		"							\"FirstName\": \"Test\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Female\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1233, \r\n" + 
-//					   		"							\"FirstName\": \"TestA\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1234, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1235, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1236, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1237, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1238, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1239, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1240, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1241, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1242, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1243, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1244, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1245, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1246, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1247, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1248, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1249, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1250, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1251, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1252, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1253, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1254, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1255, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1256, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1257, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1258, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1259, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1260, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1261, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1262, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1263, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1264, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1265, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1266, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1267, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1268, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1269, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1270, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1271, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1272, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1273, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1274, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1275, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1276, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1277, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1278, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1279, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1280, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      },{ \r\n" + 
-//					   		"					        \"Id\": 1281, \r\n" + 
-//					   		"							\"FirstName\": \"TestB\", \r\n" + 
-//					   		"					        \"LastName\": \"tester\", \r\n" + 
-//					   		"							\"Gender\":\"Male\",\r\n" + 
-//					   		"					        \"PrimaryNumber\": \"1111111111\", \r\n" + 
-//					   		"					        \"MissedDoses\":2, \r\n" + 
-//					   		"					        \"FacilityName\": \"Facility X\", \r\n" + 
-//					   		"					        \"State\": \"Uttar Pradesh\", \r\n" + 
-//					   		"							\"District\": \"Varanasi\", \r\n" + 
-//					   		"					        \"AdherencePercentage\": 50 \r\n" + 
-//					   		"					      }] }";
-//			}
-
 			String str1 = "\"Success\":true";
 			response.setResponse(str);
 		} catch (Exception e) {
@@ -610,17 +74,12 @@ public String getdata() {
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Add support action")
 	@RequestMapping(value = {
 			"/addSupportAction/{id}" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String addSupportAction(@PathVariable("id") Long id, @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
-			// BenCallServicesMappingHistory service1097HistoryDetails =
-			// inputMapper.gson().fromJson(beneficiaryRequest,
-			// BenCallServicesMappingHistory.class);
-			// List<BenCallServicesMappingHistory> serviceHistoryList =
-			// servicesHistoryService
-			// .getServiceHistory(service1097HistoryDetails.getBeneficiaryRegID());
 
 			String str = "{   \"Id\": 123456789," + "\"UserId\": 123," + "\"UserDescription\": \"Demo Login\",\r\n"
 					+ "\"ActionTaken\": \"Call\",\r\n" + " \"Comments\": \"Well, This is a Sample Comment\",\r\n"
@@ -636,17 +95,12 @@ public String addSupportAction(@PathVariable("id") Long id, @RequestBody String
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Edit manual doses")
 	@RequestMapping(value = {
 			"/editManualDoses/{id}" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String editManualDoses(@PathVariable("id") Long id, @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
-			// BenCallServicesMappingHistory service1097HistoryDetails =
-			// inputMapper.gson().fromJson(beneficiaryRequest,
-			// BenCallServicesMappingHistory.class);
-			// List<BenCallServicesMappingHistory> serviceHistoryList =
-			// servicesHistoryService
-			// .getServiceHistory(service1097HistoryDetails.getBeneficiaryRegID());
 
 			String str = "{     \"PatientId\": 123456789,     \"Note\": {         \"Id\": 0,         \"UserId\": 123,         \"UserDescription\": \"Demo Login\",         \"ActionTaken\": \"Manual doses marked for 2/3/2020, 3/3/2020, 7/3/2020\",         \"Comments\": null,         \"Category\": null,         \"SubCategory\": null,         \"Timestamp\": \"2020-03-20T04:13:17.6245221\",         \"DateOfAction\": null     },     \"AdherenceString\": \"8999999999966666666666666666666\" } \r\n";
 			response.setResponse(str);
@@ -658,15 +112,14 @@ public String editManualDoses(@PathVariable("id") Long id, @RequestBody String r
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Everwell login")
 	@RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String everwellLogin(@RequestBody LoginRequestModelEverwell login) {
 
 		OutputResponse response = new OutputResponse();
 		logger.info("It reaches here ");
-//		System.out.println("It reaches here");
 		try {
 			String responseData = null;
-//			String remoteAddress = request.getHeader("X-FORWARDED-FOR");
 			if (login.getEverwellUserName().equalsIgnoreCase("everwellUser")
 					&& login.getEverwellPassword().equals("everwellpass")) {
 
diff --git a/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java b/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java
index bfa2df16..17c79018 100644
--- a/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java
+++ b/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.feedback;
 
 import java.util.ArrayList;
@@ -33,23 +54,19 @@
 import com.iemr.common.utils.mapper.OutputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RequestMapping(value = "/feedback")
 @RestController
-public class FeedbackController
-{
+public class FeedbackController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
-	/**
-	 * feedback service
-	 */
 	private FeedbackService feedbackService;
 
 	@Autowired
-	public void setFeedbackService(FeedbackService feedbackService)
-	{
+	public void setFeedbackService(FeedbackService feedbackService) {
 
 		this.feedbackService = feedbackService;
 	}
@@ -57,8 +74,7 @@ public void setFeedbackService(FeedbackService feedbackService)
 	private FeedbackTypeService feedbackTypeService;
 
 	@Autowired
-	public void setfeedbackTypeService(FeedbackTypeService feedbackTypeService)
-	{
+	public void setfeedbackTypeService(FeedbackTypeService feedbackTypeService) {
 
 		this.feedbackTypeService = feedbackTypeService;
 	}
@@ -66,33 +82,28 @@ public void setfeedbackTypeService(FeedbackTypeService feedbackTypeService)
 	private FeedbackResponseService feedbackResponseService;
 
 	@Autowired
-	public void setFeedbackResponseService(FeedbackResponseService feedbackResponseService)
-	{
+	public void setFeedbackResponseService(FeedbackResponseService feedbackResponseService) {
 		this.feedbackResponseService = feedbackResponseService;
 	}
 
 	private FeedbackRequestService feedbackRequestService;
 
 	@Autowired
-	public void setFeedbackRequestService(FeedbackRequestService feedbackRequestService)
-	{
+	public void setFeedbackRequestService(FeedbackRequestService feedbackRequestService) {
 		this.feedbackRequestService = feedbackRequestService;
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/beneficiaryRequests", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String feedbackRequest(@RequestBody String request)
-	{
+	@ApiOperation(value = "Beneficiary request")
+	@RequestMapping(value = "/beneficiaryRequests", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String feedbackRequest(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			FeedbackDetails feedbackDetails = inputMapper.gson().fromJson(request, FeedbackDetails.class);
-			List<FeedbackDetails> feedbackList =
-					feedbackService.getFeedbackRequests(feedbackDetails.getBeneficiaryRegID());
+			List<FeedbackDetails> feedbackList = feedbackService
+					.getFeedbackRequests(feedbackDetails.getBeneficiaryRegID());
 			response.setResponse(feedbackList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getfeedbacklist failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -100,18 +111,15 @@ public String feedbackRequest(@RequestBody String request)
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getfeedback/{feedbackID}", method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getFeedbackByPost(@PathVariable("feedbackID") Long feedbackID)
-	{
+	@ApiOperation(value = "Get feedback from feedback id")
+	@RequestMapping(value = "/getfeedback/{feedbackID}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getFeedbackByPost(@PathVariable("feedbackID") Long feedbackID) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			logger.info("" + feedbackID);
 			List<FeedbackDetails> savedDetails = feedbackService.getFeedbackRequests(feedbackID);
 			response.setResponse(savedDetails.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getfeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -119,18 +127,15 @@ public String getFeedbackByPost(@PathVariable("feedbackID") Long feedbackID)
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/createFeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String createFeedback(@RequestBody String feedbackDetails)
-	{
+	@ApiOperation(value = "Create feedback")
+	@RequestMapping(value = "/createFeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String createFeedback(@RequestBody String feedbackDetails) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			String feedbackResponse = feedbackService.saveFeedback(feedbackDetails);
 			response.setResponse(feedbackResponse);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("createFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -138,20 +143,17 @@ public String createFeedback(@RequestBody String feedbackDetails)
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/feedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String feedbacksList(@RequestBody String request)
-	{
+	@ApiOperation(value = "Feedback list")
+	@RequestMapping(value = "/feedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String feedbacksList(@RequestBody String request) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			FeedbackDetails feedbackDetails = inputMapper.gson().fromJson(request, FeedbackDetails.class);
-			List<FeedbackDetails> feedbackList =
-					feedbackService.getFeedbackRequests(feedbackDetails.getBeneficiaryRegID());
+			List<FeedbackDetails> feedbackList = feedbackService
+					.getFeedbackRequests(feedbackDetails.getBeneficiaryRegID());
 			response.setResponse(feedbackList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("createFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -159,15 +161,13 @@ public String feedbacksList(@RequestBody String request)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get feedback")
 	@RequestMapping(value = "/getFeedback", method = RequestMethod.POST, headers = "Authorization")
-	public String getFeedback(@RequestBody String feedbackRequest)
-	{
+	public String getFeedback(@RequestBody String feedbackRequest) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(feedbackService.getAllData(feedbackRequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("createFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 
@@ -176,71 +176,28 @@ public String getFeedback(@RequestBody String feedbackRequest)
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/updatefeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String updateFeedback(@RequestBody String feedbackDetails)
-	{
+	@ApiOperation(value = "Update feedback")
+	@RequestMapping(value = "/updatefeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String updateFeedback(@RequestBody String feedbackDetails) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(feedbackService.updateFeedback(feedbackDetails).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("updatefeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
-	// @CrossOrigin
-	// @RequestMapping(value = "/updateFeedback", method = RequestMethod.POST)
-	// public int updateFeedback(@RequestBody FeedbackDetails feedbackto) {
-	// FeedbackRequest feedbackrequest1 = new FeedbackRequest();
-	// feedbackrequest1.setEmailStatusID(2);
-	// feedbackrequest1.setFeedbackID(feedbackto.getFeedbackID());
-	// feedbackrequest1.setFeedbackSupSummary(feedbackto.getFeedback());
-	// feedbackrequest1.setSupUserID(feedbackto.getSupUserID());
-	// feedbackrequest1.setComments(feedbackto.getComments());
-	// feedbackrequest1.setCreatedBy(feedbackto.getCreatedBy());
-	// feedbackrequest1.setCreatedDate(feedbackto.getCreatedDate());
-	// feedbackrequest1.setModifiedBy(feedbackto.getModifiedBy());
-	// feedbackrequest1.setLastModDate(feedbackto.getLastModDate());
-	//
-	// int res = feedbackrequest.update(feedbackrequest1);
-	// System.out.println("hello" + this.res);
-	// T_Feedback dataz = (T_Feedback)
-	// service1.getDataByID1(feedbackto.getFeedbackID());// this
-	// // think
-	// System.out.println(dataz.getFeedbackID());
-	// // data.setFeedback(feedbackto.getFeedback());
-	// System.out.println(feedbackto.getFeedbackID());
-	// if (feedbackto.getSelectStatus() > 0) {
-	// dataz.setFeedbackStatusID(feedbackto.getSelectStatus());
-	// System.out.println(feedbackto.getSelectStatus());
-	// } else {
-	// dataz.setEmailStatusID(dataz.getEmailStatusID());
-	// }
-	//
-	// if (feedbackto.getEmailStatusID() > 0) {
-	// dataz.setEmailStatusID(feedbackto.getEmailStatusID());
-	// } else {
-	// dataz.setEmailStatusID(dataz.getEmailStatusID());
-	// }
-	// // service1.updataData(dataz);
-	// return res;
-	// }
-
 	@CrossOrigin
+	@ApiOperation(value = "Create a new beneficiary")
 	@RequestMapping(value = "/updateFeedbackStatus", method = RequestMethod.POST, headers = "Authorization")
-	public String updateFeedbackStatus(@RequestBody String feedbackDetails)
-	{
+	public String updateFeedbackStatus(@RequestBody String feedbackDetails) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateFeedbackStatus request " + feedbackDetails);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.updateFeedbackStatus(feedbackDetails).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("updateFeedbackStatus failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -249,16 +206,14 @@ public String updateFeedbackStatus(@RequestBody String feedbackDetails)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Search feedback")
 	@RequestMapping(value = "/searchFeedback", method = RequestMethod.POST, headers = "Authorization")
-	public String searchFeedback(@RequestBody String feedbackDetails)
-	{
+	public String searchFeedback(@RequestBody String feedbackDetails) {
 		OutputResponse response = new OutputResponse();
 		logger.info("searchFeedback request " + feedbackDetails);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.searchFeedback(feedbackDetails));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("searchFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -267,16 +222,14 @@ public String searchFeedback(@RequestBody String feedbackDetails)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Search feedback1")
 	@RequestMapping(value = "/searchFeedback1", method = RequestMethod.POST, headers = "Authorization")
-	public String searchFeedback1(@RequestBody String feedbackDetails)
-	{
+	public String searchFeedback1(@RequestBody String feedbackDetails) {
 		OutputResponse response = new OutputResponse();
 		logger.info("searchFeedback1 request " + feedbackDetails);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.searchFeedback1(feedbackDetails));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("searchFeedback1 failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -285,16 +238,14 @@ public String searchFeedback1(@RequestBody String feedbackDetails)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get all feedback")
 	@RequestMapping(value = "/getAllFeedbackById", method = RequestMethod.POST, headers = "Authorization")
-	public String getAllFeedbackById(@RequestBody String feedbackrequest)
-	{
+	public String getAllFeedbackById(@RequestBody String feedbackrequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAllFeedbackById request " + feedbackrequest);
-		try
-		{
+		try {
 			response.setResponse(feedbackRequestService.getAllFeedback(feedbackrequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAllFeedbackById failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -303,17 +254,15 @@ public String getAllFeedbackById(@RequestBody String feedbackrequest)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get all feedback by id")
 	@RequestMapping(value = "/getAllFeedbackById1", method = RequestMethod.POST, headers = "Authorization")
-	public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce)
-	{
+	public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce) {
 		Map<String, Object> resMap = null;
 		List<Map<String, Object>> resList = new ArrayList<>();
 		ArrayList<Object[]> data2 = feedbackResponseService.getdataById(tfeedbackresponce.getFeedbackID());
 
-		if (data2 != null && data2.size() > 0)
-		{
-			for (Object[] objList : data2)
-			{
+		if (data2 != null && data2.size() > 0) {
+			for (Object[] objList : data2) {
 				resMap = new HashMap<>();
 				resMap.put("ResponseSummary", objList[0]);
 				resMap.put("FeedbackRequestID", objList[1]);
@@ -322,8 +271,6 @@ public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce)
 				resMap.put("AuthDesignation", objList[4]);
 				resMap.put("FeedbackID", objList[5]);
 				resMap.put("FeedbackSupSummary", objList[6]);
-//				commenting the below line because of sonar cube issue - 26/6/2021, checked also this api is not in use
-//				resMap.put("Comments", objList[7]); 
 				resMap.put("Feedback", objList[8]);
 				resList.add(resMap);
 
@@ -334,46 +281,40 @@ public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get feedback status")
 	@RequestMapping(value = "/getFeedbackStatus", method = RequestMethod.POST, headers = "Authorization")
-	public String getFeedbackStatusTypes(@RequestBody String request)
-	{
+	public String getFeedbackStatusTypes(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(feedbackService.getFeedbackStatus(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get email status")
 	@RequestMapping(value = "/getEmailStatus", method = RequestMethod.POST, headers = "Authorization")
-	public String getEmailStatus(@RequestBody String request)
-	{
+	public String getEmailStatus(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(feedbackService.getEmailStatus(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get feedback request by id")
 	@RequestMapping(value = "/getFeedbackRequestById", method = RequestMethod.POST, headers = "Authorization")
-	public String getFeedbackRequestById(@RequestBody String feedbackrequest)
-	{
+	public String getFeedbackRequestById(@RequestBody String feedbackrequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAllFeedbackById request " + feedbackrequest);
-		try
-		{
+		try {
 			response.setResponse(feedbackRequestService.getAllFeedback(feedbackrequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAllFeedbackById failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -382,16 +323,14 @@ public String getFeedbackRequestById(@RequestBody String feedbackrequest)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get feedback response by id")
 	@RequestMapping(value = "/getFeedbackResponseById", method = RequestMethod.POST, headers = "Authorization")
-	public String getFeedbackResponseById(@RequestBody String feedbackrequest)
-	{
+	public String getFeedbackResponseById(@RequestBody String feedbackrequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getAllFeedbackById request " + feedbackrequest);
-		try
-		{
+		try {
 			response.setResponse(feedbackRequestService.getAllFeedback(feedbackrequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getAllFeedbackById failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -400,23 +339,16 @@ public String getFeedbackResponseById(@RequestBody String feedbackrequest)
 	}
 
 	@CrossOrigin
-	@RequestMapping(value = "/getFeedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getFeedbacksList(
-			// @ApiParam(value = "{\"serviceID\":\"Mandatory: Integer value of the service ID Service provider ID\", "
-			// // + "\"beneficiaryRegID\":\"Optional: beneficiary ID of the beneficiary in call\"}") @RequestBody
-			// // String feedbackDetails)
-			// + "\"beneficiaryRegID\":\"Optional: beneficiary ID of the beneficiary in call\"}")
-			@RequestBody FeedbackListRequestModel feedbackDetails, HttpServletRequest httpRequest)
-	{
+	@ApiOperation(value = "Get feedback list")
+	@RequestMapping(value = "/getFeedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getFeedbacksList(@RequestBody FeedbackListRequestModel feedbackDetails,
+			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getFeedbacksList request " + feedbackDetails);
-		try
-		{
+		try {
 			response.setResponse(
 					feedbackService.getFeedbacksList(feedbackDetails, httpRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getFeedbacksList failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -425,17 +357,16 @@ public String getFeedbacksList(
 		return response.toString();
 
 	}
+
 	@CrossOrigin
+	@ApiOperation(value = "Update response")
 	@RequestMapping(value = "/updateResponse", method = RequestMethod.POST, headers = "Authorization")
-	public String updateResponse(@RequestBody String feedbackresponce)
-	{
+	public String updateResponse(@RequestBody String feedbackresponce) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateResponse request " + feedbackresponce);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.updateResponse(feedbackresponce));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("responceFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -445,16 +376,14 @@ public String updateResponse(@RequestBody String feedbackresponce)
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Request feedback")
 	@RequestMapping(value = "/requestFeedback", method = RequestMethod.POST, headers = "Authorization")
-	public String requestFeedback(@RequestBody String feedbackRequest)
-	{
+	public String requestFeedback(@RequestBody String feedbackRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("requestFeedback request " + feedbackRequest);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.createFeedbackRequest(feedbackRequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("requestFeedback failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -466,26 +395,22 @@ public String requestFeedback(@RequestBody String feedbackRequest)
 	FeedbackSeverityServiceImpl feedbackSeverityService;
 
 	@Autowired
-	public void setFeedbackSeverityService(FeedbackSeverityServiceImpl feedbackSeverityService)
-	{
+	public void setFeedbackSeverityService(FeedbackSeverityServiceImpl feedbackSeverityService) {
 		this.feedbackSeverityService = feedbackSeverityService;
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getSeverity", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get severity")
+	@RequestMapping(value = "/getSeverity", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getFeedbackSeverity(
-			@ApiParam(value = "{providerServiceMapID : Integer}") @RequestBody String severityRequest)
-	{
+			@ApiParam(value = "{providerServiceMapID : Integer}") @RequestBody String severityRequest) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			FeedbackSeverity severity = inputMapper.gson().fromJson(severityRequest, FeedbackSeverity.class);
 			response.setResponse(
 					feedbackSeverityService.getActiveFeedbackSeverity(severity.getProviderServiceMapID()).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
@@ -493,20 +418,17 @@ public String getFeedbackSeverity(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getFeedbackType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String
-			getFeedbackType(@ApiParam(value = "{providerServiceMapID : Integer}") @RequestBody String severityRequest)
-	{
+	@ApiOperation(value = "Get feedback type")
+	@RequestMapping(value = "/getFeedbackType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getFeedbackType(
+			@ApiParam(value = "{providerServiceMapID : Integer}") @RequestBody String severityRequest) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			FeedbackType feedbackType = inputMapper.gson().fromJson(severityRequest, FeedbackType.class);
 			response.setResponse(
 					feedbackTypeService.getActiveFeedbackTypes(feedbackType.getProviderServiceMapID()).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
@@ -514,88 +436,67 @@ public String getFeedbackSeverity(
 	}
 
 	@CrossOrigin
-	@RequestMapping(value = "/getGrievancesByCreatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getGrievancesByCreatedDate(
-			@RequestBody FeedbackListRequestModel feedbackDetails, HttpServletRequest httpRequest)
-	{
+	@ApiOperation(value = "Get grievances by created date")
+	@RequestMapping(value = "/getGrievancesByCreatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getGrievancesByCreatedDate(@RequestBody FeedbackListRequestModel feedbackDetails,
+			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getGrievancesByCreatedDate request " + feedbackDetails);
-		try
-		{
-			response.setResponse(
-					feedbackService.getGrievancesByCreatedDate(feedbackDetails, httpRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		try {
+			response.setResponse(feedbackService.getGrievancesByCreatedDate(feedbackDetails,
+					httpRequest.getHeader("Authorization")));
+		} catch (Exception e) {
 			logger.error("getGrievancesByCreatedDate failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		//logger.debug("getGrievancesByCreatedDate response " + response.toString());
-		//logger.info("getGrievancesByCreatedDate response code " + response.getStatusCode());
 		return response.toString();
 	}
 
 	@CrossOrigin
-	@RequestMapping(value = "/getGrievancesByUpdatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getGrievancesByUpdatedDate(
-			@RequestBody FeedbackListRequestModel feedbackDetails, HttpServletRequest httpRequest)
-	{
+	@ApiOperation(value = "Get grievances by updated date")
+	@RequestMapping(value = "/getGrievancesByUpdatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getGrievancesByUpdatedDate(@RequestBody FeedbackListRequestModel feedbackDetails,
+			HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getGrievancesByUpdatedDate request " + feedbackDetails);
-		try
-		{
-			response.setResponse(
-					feedbackService.getGrievancesByUpdatedDate(feedbackDetails, httpRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		try {
+			response.setResponse(feedbackService.getGrievancesByUpdatedDate(feedbackDetails,
+					httpRequest.getHeader("Authorization")));
+		} catch (Exception e) {
 			logger.error("getGrievancesByUpdatedDate failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		//logger.debug("getGrievancesByUpdatedDate response " + response.toString());
-		//logger.info("getGrievancesByUpdatedDate response code " + response.getStatusCode());
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Save feedback request")
 	@RequestMapping(value = "/saveFeedbackRequest", method = RequestMethod.POST, headers = "Authorization")
-	public String createFeedbackRequest(@RequestBody String feedbackRequest)
-	{
+	public String createFeedbackRequest(@RequestBody String feedbackRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("saveFeedbackRequest request " + feedbackRequest);
-		try
-		{
+		try {
 			response.setResponse(feedbackService.saveFeedbackRequest(feedbackRequest));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("saveFeedbackRequest failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		//logger.debug("saveFeedbackRequest response " + response.toString());
-		//logger.info("saveFeedbackRequest response " + response.getStatusCode());
 		return response.toString();
 	}
 
 	@CrossOrigin
-	@RequestMapping(value = "/getFeedbackLogs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getFeedbackLogs(
-			@RequestBody String request)
-	{
+	@ApiOperation(value = "Get feedback logs")
+	@RequestMapping(value = "/getFeedbackLogs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getFeedbackLogs(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getFeedbackLogs request " + request);
-		try
-		{
+		try {
 			FeedbackLog feedbackLogs = inputMapper.gson().fromJson(request, FeedbackLog.class);
-			response.setResponse(
-					feedbackService.getFeedbackLogs(feedbackLogs));
-		} catch (Exception e)
-		{
+			response.setResponse(feedbackService.getFeedbackLogs(feedbackLogs));
+		} catch (Exception e) {
 			logger.error("getFeedbackLogs failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		//logger.debug("getFeedbackLogs response " + response.toString());
-		//logger.info("getFeedbackLogs response code " + response.getStatusCode());
 		return response.toString();
 	}
 }
diff --git a/src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
similarity index 65%
rename from src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java
rename to src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
index 9fbfc1c2..7cd15a0c 100644
--- a/src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java
+++ b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.helpline104history;
 
 
@@ -23,16 +44,16 @@
 
 @RequestMapping(value = "/beneficiary")
 @RestController
-public class H104BenHistoryController {
+public class Helpline104BeneficiaryHistoryController {
 	InputMapper inputMapper = new InputMapper();
-	private Logger logger = LoggerFactory.getLogger(H104BenHistoryController.class);
+	private Logger logger = LoggerFactory.getLogger(Helpline104BeneficiaryHistoryController.class);
 	
 	@Autowired
 	private H104BenHistoryServiceImpl smpleBenHistoryServiceImpl;
 	
 	@CrossOrigin
 	@ApiOperation(
-			value = "retrives cashesheet history",
+			value = "Retrieve beneficiary case record",
 			consumes = "application/json",
 			produces = "application/json")
 	@RequestMapping(value = "/get104BenMedHistory", method = RequestMethod.POST, headers = "Authorization")
diff --git a/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java b/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java
index 50624818..b3cf31cc 100644
--- a/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java
+++ b/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.honeywell;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,6 +36,9 @@
 import com.iemr.common.service.honeywell.HoneywellService;
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
+
+import io.swagger.annotations.ApiOperation;
+
 @CrossOrigin
 @RequestMapping({ "/honeywell" })
 @RestController
@@ -23,58 +47,49 @@ public class HoneywellController {
 	InputMapper inputMapper = new InputMapper();
 	@Autowired
 	private HoneywellService honeywellService;
+
 	@CrossOrigin
+	@ApiOperation(value = "Get real time district wise call report")
 	@RequestMapping(value = "/realtimeDistrictDistribution", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getRealtimeDistrictWiseCallReport()
-	{
+	public String getRealtimeDistrictWiseCallReport() {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(honeywellService.getRealtimeDistrictWiseCallReport());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getDistrictWiseCallReport failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
+
 	@CrossOrigin
-	@RequestMapping(value = "/districtWiseCallDistribution", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getDistrictWiseCallReport(
-			@RequestBody String request, HttpServletRequest httpRequest)
-	{
+	@ApiOperation(value = "District wise call distribution")
+	@RequestMapping(value = "/districtWiseCallDistribution", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getDistrictWiseCallReport(@RequestBody String request, HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		logger.info("getDistrictWiseCallReport request "+request);
-		try
-		{
+		logger.info("getDistrictWiseCallReport request " + request);
+		try {
 			response.setResponse(honeywellService.getDistrictWiseCallReport(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getDistrictWiseCallReport failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
-	
 	@CrossOrigin
-	@RequestMapping(value = "/urban_rural_calls", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getUrbanRuralCallReport(
-			@RequestBody String request, HttpServletRequest httpRequest)
-	{
+	@ApiOperation(value = "Urban and rural calls")
+	@RequestMapping(value = "/urban_rural_calls", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getUrbanRuralCallReport(@RequestBody String request, HttpServletRequest httpRequest) {
 		OutputResponse response = new OutputResponse();
-		logger.info("getUrbanRuralCallReport request "+request);
-		try
-		{
+		logger.info("getUrbanRuralCallReport request " + request);
+		try {
 			response.setResponse(honeywellService.getUrbanRuralCallReport(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getUrbanRuralCallReport failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
-	
+
 }
diff --git a/src/main/java/com/iemr/common/controller/institute/InstituteController.java b/src/main/java/com/iemr/common/controller/institute/InstituteController.java
index 29e3f28d..ef158322 100644
--- a/src/main/java/com/iemr/common/controller/institute/InstituteController.java
+++ b/src/main/java/com/iemr/common/controller/institute/InstituteController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.institute;
 
 import javax.ws.rs.core.MediaType;
@@ -13,130 +34,114 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.google.gson.GsonBuilder;
 import com.iemr.common.data.institute.Institute;
 import com.iemr.common.service.institute.DesignationService;
 import com.iemr.common.service.institute.InstituteService;
 import com.iemr.common.service.institute.InstituteTypeService;
 import com.iemr.common.utils.mapper.InputMapper;
-import com.iemr.common.utils.mapper.OutputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RequestMapping({ "/institute" })
 @RestController
-public class InstituteController
-{
+public class InstituteController {
 	private OutputResponse response;
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	private InstituteService instituteService;
-	
+
 	private InputMapper inputMapper = new InputMapper();
 
 	@Autowired
-	public void setInstituteService(InstituteService instituteService)
-	{
+	public void setInstituteService(InstituteService instituteService) {
 		this.instituteService = instituteService;
 	}
 
 	private InstituteTypeService instituteTypeService;
 
 	@Autowired
-	public void setInstituteTypeService(InstituteTypeService instituteTypeService)
-	{
+	public void setInstituteTypeService(InstituteTypeService instituteTypeService) {
 		this.instituteTypeService = instituteTypeService;
 	}
 
 	private DesignationService designationService;
 
 	@Autowired
-	public void setDesignationService(DesignationService designationService)
-	{
+	public void setDesignationService(DesignationService designationService) {
 		this.designationService = designationService;
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getInstitutesByLocation", method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getInstitutesByLocation(@RequestBody String instituteRequest)
-	{
+	@ApiOperation(value = "Get institutes by location")
+	@RequestMapping(value = "/getInstitutesByLocation", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getInstitutesByLocation(@RequestBody String instituteRequest) {
 		JSONObject responseObj = new JSONObject();
 		OutputResponse response = new OutputResponse();
 		logger.info("getInstitutesByLocation request " + instituteRequest);
-		try
-		{
+		try {
 			Institute instituteQuery = inputMapper.gson().fromJson(instituteRequest, Institute.class);
 			responseObj.put("institute",
 					instituteService.getInstitutesByStateDistrictBranch(instituteQuery.getStateID(),
 							instituteQuery.getDistrictID(), instituteQuery.getDistrictBranchMappingID()));
 			response.setResponse(responseObj.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getInstitutesByLocation failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		
+
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = { "/getInstituteByBranch" }, method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getInstituteByBranch(@RequestBody String instituteRequest)
-	{
+	@ApiOperation(value = "Get institute by branch")
+	@RequestMapping(value = {
+			"/getInstituteByBranch" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getInstituteByBranch(@RequestBody String instituteRequest) {
 		JSONObject responseObj = new JSONObject();
 		OutputResponse response = new OutputResponse();
 		logger.info("getInstituteByBranch request " + instituteRequest);
-		try
-		{
+		try {
 			Institute instituteQuery = inputMapper.gson().fromJson(instituteRequest, Institute.class);
 			responseObj.put("institute",
 					instituteService.getInstitutesByBranch(instituteQuery.getDistrictBranchMappingID()));
 			response.setResponse(responseObj.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			response.setError(e);
 			logger.error("getInstituteByBranch failed with error " + e.getMessage(), e);
 		}
-		
+
 		return responseObj.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getInstituteTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getInstituteTypes(@ApiParam(
-			value = "{\"providerServiceMapID\": \"Optional Integer\"}") @RequestBody String instituteTypeRequest)
-	{
+	@ApiOperation(value = "Get institute type")
+	@RequestMapping(value = "/getInstituteTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getInstituteTypes(
+			@ApiParam(value = "{\"providerServiceMapID\": \"Optional Integer\"}") @RequestBody String instituteTypeRequest) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			logger.info("getInstituteTypes request " + instituteTypeRequest);
 
 			response.setResponse(instituteTypeService.getInstitutionTypes(instituteTypeRequest).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getInstituteTypes failed with error " + e.getMessage(), e);
 		}
 		logger.info("getInstituteTypes response " + response.toString());
 		return response.toString();
 	}
-	
+
 	@CrossOrigin()
-	@RequestMapping(value = "/getInstituteName/{institutionTypeID}",  method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getInstituteName(@PathVariable("institutionTypeID") Integer institutionTypeID)
-	{
+	@ApiOperation(value = "Get institute name")
+	@RequestMapping(value = "/getInstituteName/{institutionTypeID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getInstituteName(@PathVariable("institutionTypeID") Integer institutionTypeID) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			logger.info("getInstituteTypes request " + institutionTypeID);
 
 			response.setResponse(instituteTypeService.getInstitutionName(institutionTypeID).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getInstituteTypes failed with error " + e.getMessage(), e);
 		}
 		logger.info("getInstituteTypes response " + response.toString());
@@ -144,38 +149,34 @@ public String getInstituteName(@PathVariable("institutionTypeID") Integer instit
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = { "/getDesignations" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getDesignations()
-	{
+	@ApiOperation(value = "Get designation")
+	@RequestMapping(value = {
+			"/getDesignations" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getDesignations() {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(designationService.getDesignations().toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getDesignations failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		return response.toString();
 
 	}
-	
+
 	@CrossOrigin()
-	@RequestMapping(value = "/getInstituteNameByTypeAndDistrict/{institutionTypeID}/{districtID}",  method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get institute name by type and district")
+	@RequestMapping(value = "/getInstituteNameByTypeAndDistrict/{institutionTypeID}/{districtID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getInstituteNameByTypeAndDistrict(@PathVariable("institutionTypeID") Integer institutionTypeID,
-			@PathVariable("districtID") Integer districtID)
-	{
+			@PathVariable("districtID") Integer districtID) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
-			logger.info("getInstituteTypes request " + institutionTypeID +"," + districtID);
+		try {
+			logger.info("getInstituteTypes request " + institutionTypeID + "," + districtID);
 
-			response.setResponse(instituteTypeService.getInstitutionNameByTypeAndDistrict(institutionTypeID,districtID).toString());
-		} catch (Exception e)
-		{
+			response.setResponse(
+					instituteTypeService.getInstitutionNameByTypeAndDistrict(institutionTypeID, districtID).toString());
+		} catch (Exception e) {
 			logger.error("getInstituteTypes failed with error " + e.getMessage(), e);
 		}
 		logger.info("getInstituteTypes response " + response.toString());
diff --git a/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java b/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java
index 0a98a6ce..152c9fb7 100644
--- a/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java
+++ b/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.kmfilemanager;
 
 import javax.ws.rs.core.MediaType;
@@ -35,9 +56,8 @@ public void setKmFileManagerService(KMFileManagerService kmFileManagerService) {
 	private SchemeServiceImpl schemeServiceImpl;
 
 	@CrossOrigin
-	@ApiOperation(value = "API will add file sent as string in KM.")
+	@ApiOperation(value = "Add file")
 	@RequestMapping(value = "/addFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	// @Transactional
 	public String addFile(
 			@ApiParam(value = "{\"fileName\":\"String: name of file\", \"fileExtension:\"String: file extension\", "
 					+ "\"providerServiceMapID\":\"Integer: service provider map ID\", "
@@ -62,7 +82,7 @@ public String addFile(
 	}
 
 	@CrossOrigin
-	@ApiOperation(value = "API will add file sent as string in KM.")
+	@ApiOperation(value = "Get KM file download URL")
 	@RequestMapping(value = "/getKMFileDownloadURL", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getKMFileDownloadURL(@ApiParam(value = "{}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
diff --git a/src/main/java/com/iemr/common/controller/language/LanguageController.java b/src/main/java/com/iemr/common/controller/language/LanguageController.java
index 5bd8b7c4..c0621076 100644
--- a/src/main/java/com/iemr/common/controller/language/LanguageController.java
+++ b/src/main/java/com/iemr/common/controller/language/LanguageController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.language;
 
 import javax.ws.rs.core.MediaType;
diff --git a/src/main/java/com/iemr/common/controller/location/LocationController.java b/src/main/java/com/iemr/common/controller/location/LocationController.java
index 5e3e658d..6ea03c8c 100644
--- a/src/main/java/com/iemr/common/controller/location/LocationController.java
+++ b/src/main/java/com/iemr/common/controller/location/LocationController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.location;
 
 import java.util.List;
@@ -13,7 +34,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iemr.common.controller.kmfilemanager.KMFileManagerController;
 import com.iemr.common.data.location.Country;
 import com.iemr.common.data.location.DistrictBlock;
 import com.iemr.common.data.location.DistrictBranchMapping;
@@ -22,162 +42,130 @@
 import com.iemr.common.service.location.LocationService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RequestMapping({ "/location" })
 @RestController
-public class LocationController
-{
+public class LocationController {
 	private LocationService locationService;
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin
+	@ApiOperation(value = "Get states")
 	@RequestMapping(value = "/states/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getStates(@PathVariable("id") Integer id)
-	{
+	public String getStates(@PathVariable("id") Integer id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getStates request " + id);
-		try
-		{
+		try {
 			List<States> stateList = this.locationService.getStates(id);
 			response.setResponse(stateList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getStates failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return stateList.toString();
-		
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get districts")
 	@RequestMapping(value = "/districts/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getDistricts(@PathVariable("id") int id)
-	{
+	public String getDistricts(@PathVariable("id") int id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getDistricts request " + id);
-		try
-		{
+		try {
 			List<Districts> districtsList = this.locationService.getDistricts(id);
 			response.setResponse(districtsList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getDistricts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return districtsList.toString();
-   	
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Fetch state and district by id")
 	@RequestMapping(value = "/statesDistricts/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getStatetDistricts(@PathVariable("id") int id)
-	{
+	public String getStatetDistricts(@PathVariable("id") int id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getStatetDistricts request " + id);
-		try
-		{
+		try {
 			List<Districts> districtsList = this.locationService.findStateDistrictBy(id);
 			response.setResponse(districtsList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getStatetDistricts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return districtsList.toString();
 		logger.info("getStatetDistricts response " + response.toString());
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get district blocks")
 	@RequestMapping(value = "/taluks/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getDistrictBlocks(@PathVariable("id") int id)
-	{
+	public String getDistrictBlocks(@PathVariable("id") int id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getDistrictBlocks request " + id);
-		try
-		{
+		try {
 			List<DistrictBlock> districtBlockList = this.locationService.getDistrictBlocks(id);
 			response.setResponse(districtBlockList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getDistrictBlocks failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return districtBlockList.toString();
-		
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get city")
 	@RequestMapping(value = "/city/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getCity(@PathVariable("id") int id)
-	{
+	public String getCity(@PathVariable("id") int id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getCity request " + id);
-		try
-		{
+		try {
 			List<DistrictBlock> districtBlockList = this.locationService.getDistrictBlocks(id);
 			response.setResponse(districtBlockList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getCity failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return districtBlockList.toString();
 		logger.info("getCity response " + response.toString());
 		return response.toString();
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Get villages")
 	@RequestMapping(value = "/village/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getVillages(@PathVariable("id") int id)
-	{
+	public String getVillages(@PathVariable("id") int id) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getVillages request " + id);
-		try
-		{
+		try {
 			List<DistrictBranchMapping> districtBlockList = this.locationService.getDistrilctBranchs(id);
 			response.setResponse(districtBlockList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getVillages failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return districtBlockList.toString();
-		
 		return response.toString();
 	}
 
-	/*
-	 * @CrossOrigin
-	 * 
-	 * @RequestMapping(value = { "/directories/{id}" }, method = RequestMethod.GET, produces =
-	 * MediaType.APPLICATION_JSON) public String getDirectories(@PathVariable("id") int id) { List<DistrictBlock>
-	 * districtBlockList = this.locationService.getDistrictBlocks(id); return districtBlockList.toString(); }
-	 */
 	@Autowired
-	public void setLocationService(LocationService locationService)
-	{
+	public void setLocationService(LocationService locationService) {
 		this.locationService = locationService;
 	}
-	
+
 	@CrossOrigin
+	@ApiOperation(value = "Get countries")
 	@RequestMapping(value = "/getCountries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getCountries()
-	{
+	public String getCountries() {
 		OutputResponse response = new OutputResponse();
 		logger.info("getCountries request ");
-		try
-		{
+		try {
 			List<Country> stateList = this.locationService.getCountries();
 			response.setResponse(stateList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getCountries failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
-		// return stateList.toString();
 		logger.info("getStates response " + response.toString());
 		return response.toString();
 	}
diff --git a/src/main/java/com/iemr/common/controller/lonic/LonicController.java b/src/main/java/com/iemr/common/controller/lonic/LonicController.java
index e10688bb..1f9b156f 100644
--- a/src/main/java/com/iemr/common/controller/lonic/LonicController.java
+++ b/src/main/java/com/iemr/common/controller/lonic/LonicController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.lonic;
 
 import org.slf4j.Logger;
@@ -8,31 +29,33 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
 import com.iemr.common.data.lonic.LonicDescription;
 import com.iemr.common.service.lonic.LonicService;
-import com.iemr.common.utils.response.OutputResponse;
 import com.iemr.common.utils.mapper.InputMapper;
+import com.iemr.common.utils.response.OutputResponse;
+
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-
 @RequestMapping(value = "/lonic")
 @RestController
 
 public class LonicController {
 	private Logger logger = LoggerFactory.getLogger(LonicController.class);
-	
+
 	private LonicService lonicService;
-	
+
 	@Autowired
 	public void setLonicService(LonicService lonicService) {
 		this.lonicService = lonicService;
 	}
-	
+
 	@CrossOrigin
-	@ApiOperation(value = "retrives lonic Record list", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Get lonic record list", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = "/getlonicRecordList", method = RequestMethod.POST, headers = "Authorization")
-	public String getLonicRecordList(@ApiParam("{\"term\":\"String\",\"pageNo\":\"Integer\"}") @RequestBody String request) {
+	public String getLonicRecordList(
+			@ApiParam("{\"term\":\"String\",\"pageNo\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse output = new OutputResponse();
 		try {
 
@@ -40,7 +63,6 @@ public String getLonicRecordList(@ApiParam("{\"term\":\"String\",\"pageNo\":\"In
 
 			logger.info("getLonicRecord request " + lonicDescription.toString());
 
-			
 			String lonicList = lonicService.findLonicRecordList(lonicDescription);
 
 			if (lonicList != null)
diff --git a/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java b/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java
similarity index 56%
rename from src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java
rename to src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java
index 579bd23b..4817ced2 100644
--- a/src/main/java/com/iemr/common/controller/swaasa/SwaasaController.java
+++ b/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java
@@ -1,9 +1,29 @@
-package com.iemr.common.controller.swaasa;
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.controller.lungassessment;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,80 +32,64 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.iemr.common.service.swaasa.SwaasaService;
+import com.iemr.common.service.lungassessment.LungAssessmentService;
 import com.iemr.common.utils.response.OutputResponse;
 
-@RequestMapping(value = "/swaasa")
+import io.swagger.annotations.ApiOperation;
+
+@RequestMapping(value = "/lungAssessment")
 @RestController
-public class SwaasaController {
+public class LungAssessmentController {
 
 	@Autowired
-	private SwaasaService swaasaService;
+	private LungAssessmentService lungAssessmentService;
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/validateCough", method = RequestMethod.POST, headers = "Authorization")
-	public String getAdminLogin(@RequestParam("file") MultipartFile file) {
-		OutputResponse output = new OutputResponse();
-		try {
-
-			Boolean res = swaasaService.verifyCough(file, null, null);
-			if (res)
-				output.setResponse("pass");
-			else
-				output.setResponse("fail");
-
-			logger.info("get verify cough response: " + output);
-		} catch (Exception e) {
-			logger.error("sawassa failed with error " + e.getMessage(), e);
-			output.setError(e);
-		}
-		return output.toString();
-	}
-
 	@CrossOrigin()
+	@ApiOperation(value = "Start assesment")
 	@RequestMapping(value = "/startAssesment", method = RequestMethod.POST, headers = "Authorization")
 	public String startAssesment(@RequestParam("file") MultipartFile file, @RequestParam("request") String request) {
 		OutputResponse output = new OutputResponse();
 		try {
 
-			String res = swaasaService.initiateAssesment(request, file);
+			String res = lungAssessmentService.initiateAssesment(request, file);
 			output.setResponse(res);
 
 			logger.info("start assessment cough response: " + output);
 		} catch (Exception e) {
-			logger.error("sawassa failed with error " + e.getMessage(), e);
+			logger.error("Lung assessment failed with error " + e.getMessage(), e);
 			output.setError(e);
 		}
 		return output.toString();
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get assesment")
 	@RequestMapping(value = "/getAssesment/{assessmentId}", method = RequestMethod.GET, headers = "Authorization")
 	public String getAssessment(@PathVariable("assessmentId") String assessmentId) {
 		OutputResponse output = new OutputResponse();
 		try {
 
-			String res = swaasaService.getAssesment(assessmentId);
+			String res = lungAssessmentService.getAssesment(assessmentId);
 			output.setResponse(res);
 
 			logger.info("get assessment cough response: " + output);
 		} catch (Exception e) {
-			logger.error("sawassa failed with error " + e.getMessage());
+			logger.error("Lung assessment failed with error " + e.getMessage());
 			output.setError(e);
 		}
 		return output.toString();
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get assesment details")
 	@RequestMapping(value = "/getAssesmentDetails/{patientId}", method = RequestMethod.GET, headers = "Authorization")
 	public String getAssessmentDetails(@PathVariable("patientId") Long patientId) {
 		OutputResponse output = new OutputResponse();
 		try {
 
-			String res = swaasaService.getAssessmentDetails(patientId);
+			String res = lungAssessmentService.getAssessmentDetails(patientId);
 			output.setResponse(res);
 
 			logger.info("get assessment details response: " + output);
diff --git a/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java b/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java
index f704e75f..c346fa55 100644
--- a/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java
+++ b/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.mctshistory;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,49 +31,38 @@
 import com.iemr.common.service.mctshistory.OutboundHistoryService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RestController
-@RequestMapping(value="/mctsOutboundHistoryController")
+@RequestMapping(value = "/mctsOutboundHistoryController")
 public class OutboundHistoryController {
 
-	
 	private OutboundHistoryService outboundHistoryService;
-	
-	/**
-	 * @param outboundHistoryService the outboundHistoryService to set
-	 */
+
 	@Autowired
 	public void setOutboundHistoryService(OutboundHistoryService outboundHistoryService) {
 		this.outboundHistoryService = outboundHistoryService;
 	}
 
-	/**
-	 * api for reading call history
-	 * @param request
-	 * @return String count of allocated calls
-	 */
 	@CrossOrigin()
-	@RequestMapping(value="/getMctsCallHistory", method = RequestMethod.POST, headers = "Authorization")
-	public String getCallHistory(@ApiParam("{\"beneficiaryRegID\":\"Long\"}") @RequestBody String request){
-	
-		OutputResponse response  = new OutputResponse();
-		try{
-			
+	@ApiOperation(value = "Get MCTS call history")
+	@RequestMapping(value = "/getMctsCallHistory", method = RequestMethod.POST, headers = "Authorization")
+	public String getCallHistory(@ApiParam("{\"beneficiaryRegID\":\"Long\"}") @RequestBody String request) {
+
+		OutputResponse response = new OutputResponse();
+		try {
+
 			response.setResponse(outboundHistoryService.getCallHistory(request));
-		}catch (Exception e) {
-			
+		} catch (Exception e) {
+
 			response.setError(e);
 		}
-		return response.toStringWithSerialization(); 
+		return response.toStringWithSerialization();
 	}
-	
-	/**
-	 * api for reading call response
-	 * @param request
-	 * @return String count of allocated calls
-	 */
+
 	@CrossOrigin()
+	@ApiOperation(value = "Get MCTS call response")
 	@RequestMapping(value = "/getMctsCallResponse", method = RequestMethod.POST, headers = "Authorization")
 	public String getMctsCallResponse(@ApiParam("{\"callDetailID\":\"Long\"}") @RequestBody String request) {
 
@@ -67,5 +77,4 @@ public String getMctsCallResponse(@ApiParam("{\"callDetailID\":\"Long\"}") @Requ
 		return response.toString();
 	}
 
-
 }
diff --git a/src/main/java/com/iemr/common/controller/nhm_dashboard/NHM_DashboardController.java b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
similarity index 63%
rename from src/main/java/com/iemr/common/controller/nhm_dashboard/NHM_DashboardController.java
rename to src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
index d19a6892..7d6fd74e 100644
--- a/src/main/java/com/iemr/common/controller/nhm_dashboard/NHM_DashboardController.java
+++ b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
@@ -1,4 +1,25 @@
-package com.iemr.common.controller.nhm_dashboard;
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.controller.nhmdashboard;
 
 import java.util.Arrays;
 
@@ -22,13 +43,14 @@
 
 @RequestMapping(value = "/nhm_dashboard")
 @RestController
-public class NHM_DashboardController {
+public class NationalHealthMissionDashboardController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
 	private NHM_DashboardService nHM_DashboardService;
 
 	@CrossOrigin()
+	@ApiOperation(value = "Push abandoned calls from call centre")
 	@RequestMapping(value = "/push/abandon_calls", method = RequestMethod.POST, headers = "Authorization")
 	public String pushAbandonCallsFromC_Zentrix(@RequestBody AbandonCallSummary abandonCallSummary) {
 		OutputResponse output = new OutputResponse();
@@ -43,7 +65,7 @@ public String pushAbandonCallsFromC_Zentrix(@RequestBody AbandonCallSummary aban
 		return output.toString();
 	}
 
-	@ApiOperation(value = "Abandoned call information")
+	@ApiOperation(value = "Get abandoned call information")
 	@CrossOrigin()
 	@RequestMapping(value = "/get/abandon_calls", method = RequestMethod.GET, headers = "Authorization")
 	public String getAbandonCalls() {
@@ -59,7 +81,7 @@ public String getAbandonCalls() {
 		return output.toString();
 	}
 
-	@ApiOperation(value = "Agent wise staff time & Agent wise Idle time")
+	@ApiOperation(value = "Get agent wise staff & idle time")
 	@CrossOrigin()
 	@RequestMapping(value = "/get/agentsummaryreport", method = RequestMethod.GET, headers = "Authorization")
 	public String getAgentSummaryReport() {
@@ -75,7 +97,7 @@ public String getAgentSummaryReport() {
 		return output.toString();
 	}
 
-	@ApiOperation(value = "Call queue information")
+	@ApiOperation(value = "Get detailed call report")
 	@CrossOrigin()
 	@RequestMapping(value = "/get/detailedCallReport", method = RequestMethod.GET, headers = "Authorization")
 	public String getDetailedCallReport() {
@@ -90,49 +112,4 @@ public String getDetailedCallReport() {
 		}
 		return output.toString();
 	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/saveAgentSummaryReport", method = RequestMethod.POST, headers = "Authorization")
-	public String saveAgentSummaryReport(@RequestBody String request) {
-		OutputResponse output = new OutputResponse();
-		try {
-			AgentSummaryReport[] arr = InputMapper.gson().fromJson(request, AgentSummaryReport[].class);
-			output.setResponse(nHM_DashboardService.saveAgentSummaryReport(Arrays.asList(arr)));
-		} catch (Exception e) {
-			output.setError(5000, e.getLocalizedMessage());
-		}
-
-		return output.toString();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/saveDetailedCallReport", method = RequestMethod.POST, headers = "Authorization")
-	public String saveDetailedCallReport(@RequestBody String request) {
-		OutputResponse output = new OutputResponse();
-		try {
-			DetailedCallReport[] arr = InputMapper.gson().fromJson(request, DetailedCallReport[].class);
-			output.setResponse(nHM_DashboardService.saveDetailedCallReport(Arrays.asList(arr)));
-		} catch (Exception e) {
-			output.setError(5000, e.getLocalizedMessage());
-		}
-
-		return output.toString();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/check_Job", method = RequestMethod.GET, headers = "Authorization")
-	public String checkJob() {
-		OutputResponse output = new OutputResponse();
-		try {
-			output.setResponse(nHM_DashboardService.pull_NHM_Data_CTI());
-		} catch (Exception e) {
-			output.setError(5000, e.getLocalizedMessage());
-		}
-
-		return output.toString();
-	}
-
 }
diff --git a/src/main/java/com/iemr/common/controller/notification/NotificationController.java b/src/main/java/com/iemr/common/controller/notification/NotificationController.java
index 584295eb..bdbb414b 100644
--- a/src/main/java/com/iemr/common/controller/notification/NotificationController.java
+++ b/src/main/java/com/iemr/common/controller/notification/NotificationController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.notification;
 
 import javax.ws.rs.core.MediaType;
@@ -19,38 +40,29 @@
 
 @RequestMapping({ "/notification" })
 @RestController
-public class NotificationController
-{
+public class NotificationController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	private NotificationService notificationService;
 
 	@Autowired
-	public void setNotificationService(NotificationService notificationService)
-	{
+	public void setNotificationService(NotificationService notificationService) {
 		this.notificationService = notificationService;
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "This will get the list of notifications ")
-	@RequestMapping(
-			value = "/getNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getNotification(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"notificationTypeID\": \"integer-notification type id\", \"userIDs\": \"[integer-user id]\", "
-							+ "\"workingLocationIDs\": \"[integer-working Location id]\", \"languageIDs\": \"[integer-language ids]\", "
-							+ "\"roleIDs\":\"[ integer array- multiple roles available for the selected service]\", "
-							+ "\"validFrom\": \"EPOC date\", validTill:\"EPOC date\"}") @RequestBody String request)
-	{
+	@ApiOperation(value = "Get notification")
+	@RequestMapping(value = "/getNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getNotification(@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
+			+ "\"notificationTypeID\": \"integer-notification type id\", \"userIDs\": \"[integer-user id]\", "
+			+ "\"workingLocationIDs\": \"[integer-working Location id]\", \"languageIDs\": \"[integer-language ids]\", "
+			+ "\"roleIDs\":\"[ integer array- multiple roles available for the selected service]\", "
+			+ "\"validFrom\": \"EPOC date\", validTill:\"EPOC date\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getNotification request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.getNotification(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getNotification failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -59,24 +71,18 @@ public String getNotification(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "This will get the list of notifications ")
-	@RequestMapping(
-			value = "/getSupervisorNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Get supervisor notification")
+	@RequestMapping(value = "/getSupervisorNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getSupervisorNotification(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", \"notificationTypeID\":\"Integer\", "
-							+ "\"userIDs\": \"Optional - [integer-user id]\", \"workingLocationIDs\": \"Optional - [integer-working Location id]\", "
-							+ "\"languageIDs\": \"Optional - [integer-language ids]\", \"validStartDate\":\"Optional - timestamp\", "
-							+ "\"validEndDate\":\"Optional - timestamp\", \"roleIDs\":\"Optional - [Array of role ids]\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", \"notificationTypeID\":\"Integer\", "
+					+ "\"userIDs\": \"Optional - [integer-user id]\", \"workingLocationIDs\": \"Optional - [integer-working Location id]\", "
+					+ "\"languageIDs\": \"Optional - [integer-language ids]\", \"validStartDate\":\"Optional - timestamp\", "
+					+ "\"validEndDate\":\"Optional - timestamp\", \"roleIDs\":\"Optional - [Array of role ids]\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getSupervisorNotification request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.getSupervisorNotification(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getSupervisorNotification failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -85,31 +91,26 @@ public String getSupervisorNotification(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/createNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Create notification")
+	@RequestMapping(value = "/createNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String createNotification(
-			@ApiParam(
-					value = "[{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"notificationTypeID\": \"integer-notification type id\", \"roleID\": \"integer-role id of the user role\", "
-							+ "\"userID\":\"Integer: user ID of the user to whom notification will be sent\", "
-							+ "\"workingLocationID\":\"Integer: office location to which notification will be sent\", "
-							+ "\"languageID\":\"Integer: language to which notification will be sent\", "
-							+ "\"createdBy\": \"User name of the supervisor creating notification\", \"notification\":\"String - notification subject\", "
-							+ "\"notificationDesc\":\"String- notificationDesc\", \"validFrom\": \"EPOC date\", \"validTill\":\"EPOC date\", "
-							+ "\"kmFileManager\":{\"fileName\":\"String: name of file\", \"fileExtension\":\"String: file extension\", "
-							+ "\"providerServiceMapID\":\"Integer: service provider map ID\", \"validFrom\":\"Epoch date time: Document validity start time\", "
-							+ "\"validUpto\":\"Epoch date time: Document validity end time\", \"fileContent\":\"String: base64encoded binary file content\", "
-							+ "\"createdBy\":\"String: username of supervisor\", \"categoryID\":\"Optional: Integer: category ID selected\", "
-							+ "\"subCategoryID\":\"Optional: Integer: sub-category ID selected\"}}...]") @RequestBody String request)
-	{
+			@ApiParam(value = "[{\"providerServiceMapID\": \"integer-provider service map id\", "
+					+ "\"notificationTypeID\": \"integer-notification type id\", \"roleID\": \"integer-role id of the user role\", "
+					+ "\"userID\":\"Integer: user ID of the user to whom notification will be sent\", "
+					+ "\"workingLocationID\":\"Integer: office location to which notification will be sent\", "
+					+ "\"languageID\":\"Integer: language to which notification will be sent\", "
+					+ "\"createdBy\": \"User name of the supervisor creating notification\", \"notification\":\"String - notification subject\", "
+					+ "\"notificationDesc\":\"String- notificationDesc\", \"validFrom\": \"EPOC date\", \"validTill\":\"EPOC date\", "
+					+ "\"kmFileManager\":{\"fileName\":\"String: name of file\", \"fileExtension\":\"String: file extension\", "
+					+ "\"providerServiceMapID\":\"Integer: service provider map ID\", \"validFrom\":\"Epoch date time: Document validity start time\", "
+					+ "\"validUpto\":\"Epoch date time: Document validity end time\", \"fileContent\":\"String: base64encoded binary file content\", "
+					+ "\"createdBy\":\"String: username of supervisor\", \"categoryID\":\"Optional: Integer: category ID selected\", "
+					+ "\"subCategoryID\":\"Optional: Integer: sub-category ID selected\"}}...]") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("createNotification request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.createNotification(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("createNotification failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -118,29 +119,24 @@ public String createNotification(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/updateNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Update notification")
+	@RequestMapping(value = "/updateNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateNotification(
-			@ApiParam(
-					value = "{\"notificationID\" : \"Integer - Notification ID of the notification that needs to be updated\", "
-							+ "\"notification\":\"String - notification name\", \"notificationDesc\":\"String - notificationDesc\", "
-							+ "\"notificationTypeID\":\"Integer - notificationTypeID\", \"roleID\":\"Integer - roleID\", "
-							+ "\"validFrom\":\"Epoch date - validFrom\", \"validTill\":\"Epoch date - validTill\", \"deleted\":\"Boolean - deleted\", "
-							+ "\"modifiedBy\":\"String - username of the modifying supervisor\", \"kmFileManager\":{\"fileName\":\"String: name of file\", "
-							+ "\"fileExtension\":\"String: file extension\", \"providerServiceMapID\":\"Integer: service provider map ID\", "
-							+ "\"userID\":\"Integer: user ID of the supervisor\", \"validFrom\":\"Epoch date time: Document validity start time\", "
-							+ "\"validUpto\":\"Epoch date time: Document validity end time\", \"fileContent\":\"String: base64encoded binary file content\", "
-							+ "\"createdBy\":\"String: username of supervisor\", \"categoryID\":\"Optional: Integer: category ID selected\", "
-							+ "\"subCategoryID\":\"Optional: Integer: sub-category ID selected\"}}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"notificationID\" : \"Integer - Notification ID of the notification that needs to be updated\", "
+					+ "\"notification\":\"String - notification name\", \"notificationDesc\":\"String - notificationDesc\", "
+					+ "\"notificationTypeID\":\"Integer - notificationTypeID\", \"roleID\":\"Integer - roleID\", "
+					+ "\"validFrom\":\"Epoch date - validFrom\", \"validTill\":\"Epoch date - validTill\", \"deleted\":\"Boolean - deleted\", "
+					+ "\"modifiedBy\":\"String - username of the modifying supervisor\", \"kmFileManager\":{\"fileName\":\"String: name of file\", "
+					+ "\"fileExtension\":\"String: file extension\", \"providerServiceMapID\":\"Integer: service provider map ID\", "
+					+ "\"userID\":\"Integer: user ID of the supervisor\", \"validFrom\":\"Epoch date time: Document validity start time\", "
+					+ "\"validUpto\":\"Epoch date time: Document validity end time\", \"fileContent\":\"String: base64encoded binary file content\", "
+					+ "\"createdBy\":\"String: username of supervisor\", \"categoryID\":\"Optional: Integer: category ID selected\", "
+					+ "\"subCategoryID\":\"Optional: Integer: sub-category ID selected\"}}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateNotification request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.updateNotification(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("updateNotification failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -149,19 +145,15 @@ public String updateNotification(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/getNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get notification type")
+	@RequestMapping(value = "/getNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getNotificationType(
-			@ApiParam(value = "{\"providerServiceMapID\" : \"Integer - providerServiceMapID\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\" : \"Integer - providerServiceMapID\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getNotificationType request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.getNotificationType(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getNotificationType failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -170,22 +162,17 @@ public String getNotificationType(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/createNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Create notification type")
+	@RequestMapping(value = "/createNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String createNotificationType(
-			@ApiParam(
-					value = "{\"providerServiceMapID\" : \"Integer - providerServiceMapID\", "
-							+ "\"notificationType\":\"String - notificationType name\", \"notificationTypeDesc\":\"String - notificationTypeDesc\", "
-							+ "\"createdBy\":\"String - username of the supervisor\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\" : \"Integer - providerServiceMapID\", "
+					+ "\"notificationType\":\"String - notificationType name\", \"notificationTypeDesc\":\"String - notificationTypeDesc\", "
+					+ "\"createdBy\":\"String - username of the supervisor\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("createNotificationType request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.createNotificationType(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("createNotificationType failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -194,22 +181,17 @@ public String createNotificationType(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/updateNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Update notification type")
+	@RequestMapping(value = "/updateNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateNotificationType(
-			@ApiParam(
-					value = "{\"notificationTypeID\" : \"Integer - notificationTypeID\", \"notificationType\":\"String - notificationType name\", "
-							+ "\"notificationTypeDesc\":\"String - notificationTypeDesc\", \"deleted\":\"Boolean\""
-							+ "\"modifiedBy\":\"String - username of the supervisor\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"notificationTypeID\" : \"Integer - notificationTypeID\", \"notificationType\":\"String - notificationType name\", "
+					+ "\"notificationTypeDesc\":\"String - notificationTypeDesc\", \"deleted\":\"Boolean\""
+					+ "\"modifiedBy\":\"String - username of the supervisor\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateNotificationType request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.updateNotificationType(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("updateNotificationType failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -218,22 +200,16 @@ public String updateNotificationType(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "This will get the list of Emergency Contacts ")
-	@RequestMapping(
-			value = "/getEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Get emergency contacts")
+	@RequestMapping(value = "/getEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getEmergencyContacts(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"notificationTypeID\": \"integer-notification type id\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
+					+ "\"notificationTypeID\": \"integer-notification type id\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getEmergencyContacts request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.getEmergencyContacts(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getEmergencyContacts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -242,21 +218,15 @@ public String getEmergencyContacts(
 	}
 
 	@CrossOrigin()
-	@ApiOperation(value = "This will get the list of notifications ")
-	@RequestMapping(
-			value = "/getSupervisorEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Get supervisor emergency contacts")
+	@RequestMapping(value = "/getSupervisorEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getSupervisorEmergencyContacts(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", \"notificationTypeID\":\"Integer\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", \"notificationTypeID\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getSupervisorEmergencyContacts request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.getSupervisorEmergencyContacts(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("getSupervisorEmergencyContacts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -265,25 +235,20 @@ public String getSupervisorEmergencyContacts(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/createEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Create emergency contact")
+	@RequestMapping(value = "/createEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String createEmergencyContacts(
-			@ApiParam(
-					value = "[{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"notificationTypeID\": \"integer-notification type id\", \"createdBy\": \"User name of the supervisor creating notification\", "
-							+ "\"designationID\":\"Integer - designation ID\", \"emergContactName\":\"String - emergency Contact name\", "
-							+ "\"location\":\"String - emergency Contact location\", \"emergContactNo\":\"String - emergency Contact No\", "
-							+ "\"emergContactDesc\": \"String - emergency Contact Desc\", \"notificationTypeID\":\"Integer: notification Type ID\", "
-							+ "\"createdBy\":\"String: username of supervisor\"}...]") @RequestBody String request)
-	{
+			@ApiParam(value = "[{\"providerServiceMapID\": \"integer-provider service map id\", "
+					+ "\"notificationTypeID\": \"integer-notification type id\", \"createdBy\": \"User name of the supervisor creating notification\", "
+					+ "\"designationID\":\"Integer - designation ID\", \"emergContactName\":\"String - emergency Contact name\", "
+					+ "\"location\":\"String - emergency Contact location\", \"emergContactNo\":\"String - emergency Contact No\", "
+					+ "\"emergContactDesc\": \"String - emergency Contact Desc\", \"notificationTypeID\":\"Integer: notification Type ID\", "
+					+ "\"createdBy\":\"String: username of supervisor\"}...]") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("createEmergencyContacts request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.createEmergencyContacts(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("createEmergencyContacts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -292,25 +257,20 @@ public String createEmergencyContacts(
 	}
 
 	@CrossOrigin()
-	@RequestMapping(
-			value = "/updateEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
+	@ApiOperation(value = "Update emergency contacts")
+	@RequestMapping(value = "/updateEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String updateEmergencyContacts(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"notificationTypeID\": \"integer-notification type id\", \"createdBy\": \"User name of the supervisor creating notification\", "
-							+ "\"designationID\":\"Integer - designation ID\", \"emergContactName\":\"String - emergency Contact name\", "
-							+ "\"location\":\"String - emergency Contact location\", \"emergContactNo\":\"String - emergency Contact No\", "
-							+ "\"emergContactDesc\": \"String - emergency Contact Desc\", \"notificationTypeID\":\"Integer: notification Type ID\", "
-							+ "\"createdBy\":\"String: username of supervisor\"}") @RequestBody String request)
-	{
+			@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
+					+ "\"notificationTypeID\": \"integer-notification type id\", \"createdBy\": \"User name of the supervisor creating notification\", "
+					+ "\"designationID\":\"Integer - designation ID\", \"emergContactName\":\"String - emergency Contact name\", "
+					+ "\"location\":\"String - emergency Contact location\", \"emergContactNo\":\"String - emergency Contact No\", "
+					+ "\"emergContactDesc\": \"String - emergency Contact Desc\", \"notificationTypeID\":\"Integer: notification Type ID\", "
+					+ "\"createdBy\":\"String: username of supervisor\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateEmergencyContacts request " + request);
-		try
-		{
+		try {
 			response.setResponse(notificationService.updateEmergencyContacts(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.info("updateEmergencyContacts failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/otp/OTPGateway.java b/src/main/java/com/iemr/common/controller/otp/OTPGateway.java
index 84cebcbc..1501f1d6 100644
--- a/src/main/java/com/iemr/common/controller/otp/OTPGateway.java
+++ b/src/main/java/com/iemr/common/controller/otp/OTPGateway.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.otp;
 
 import javax.ws.rs.core.MediaType;
@@ -17,16 +38,9 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-/***
- * 
- * @author NE298657
- * @date DD/MM/YYYY - 10/08/2020
- * 
- * @implSpec handle OTP flow request and response
- */
-
 @RestController
 @RequestMapping(value = "/otp")
 public class OTPGateway {
@@ -35,16 +49,10 @@ public class OTPGateway {
 	@Autowired
 	private OTPHandler otpHandler;
 
-	/***
-	 * 
-	 * @param requestOBJ
-	 * @apiNote send OTP for authentication
-	 * @return
-	 * 
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Send OTP")
 	@RequestMapping(value = "/sendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String sendOTP(@ApiParam(value="{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+	public String sendOTP(@ApiParam(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
 
 		OutputResponse response = new OutputResponse();
 
@@ -64,15 +72,11 @@ public String sendOTP(@ApiParam(value="{\"mobNo\":\"String\"}") @RequestBody Str
 		return response.toString();
 	}
 
-	/***
-	 * 
-	 * @param requestOBJ
-	 * @apiNote validate OTP for authorization, and on success generate AuthKey
-	 * @return
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Validate OTP")
 	@RequestMapping(value = "/validateOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String validateOTP(@ApiParam(value="{\"mobNo\":\"String\",\"otp\":\"Integer\"}") @RequestBody String requestOBJ) {
+	public String validateOTP(
+			@ApiParam(value = "{\"mobNo\":\"String\",\"otp\":\"Integer\"}") @RequestBody String requestOBJ) {
 
 		OutputResponse response = new OutputResponse();
 
@@ -93,8 +97,9 @@ public String validateOTP(@ApiParam(value="{\"mobNo\":\"String\",\"otp\":\"Integ
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Resend OTP")
 	@RequestMapping(value = "/resendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String resendOTP(@ApiParam(value="{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+	public String resendOTP(@ApiParam(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
 
 		OutputResponse response = new OutputResponse();
 
diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java
index e70269d2..f25451f9 100644
--- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java
+++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.questionconfig;
 
 import javax.ws.rs.core.MediaType;
@@ -14,6 +35,7 @@
 import com.iemr.common.service.questionconfig.QuestionTypeService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RestController
@@ -36,14 +58,11 @@ public void setQuestionTypeService(QuestionTypeService questionTypeService) {
 		this.questionTypeService = questionTypeService;
 	}
 
-	/**
-	 * 
-	 * @param request
-	 * @return
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Create question type")
 	@RequestMapping(value = "/put/questionType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String createQuestionType(@ApiParam(value="{\\\"questionType\\\":\\\"String\\\",\\\"questionTypeDesc\\\":\\\"String\\\"}\"")@RequestBody String request) {
+	public String createQuestionType(
+			@ApiParam(value = "{\\\"questionType\\\":\\\"String\\\",\\\"questionTypeDesc\\\":\\\"String\\\"}\"") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
 			response.setResponse(questionTypeService.createQuestionType(request));
@@ -55,12 +74,8 @@ public String createQuestionType(@ApiParam(value="{\\\"questionType\\\":\\\"Stri
 		return response.toString();
 	}
 
-	/**
-	 * 
-	 * @param request
-	 * @return
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Get question type list")
 	@RequestMapping(value = "/get/questionTypeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String questionTypeList() {
 		OutputResponse response = new OutputResponse();
diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java
index 66a14171..0060e840 100644
--- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java
+++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.questionconfig;
 
 import javax.ws.rs.core.MediaType;
@@ -13,10 +34,11 @@
 import com.iemr.common.service.questionconfig.QuestionnaireService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 @RequestMapping("/questionnaireController")
-public class QuestionnaireController
-{
+public class QuestionnaireController {
 
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
@@ -28,27 +50,19 @@ public class QuestionnaireController
 	/**
 	 * Inject Question Type Repository
 	 */
-	public void setQuestionnaireService(QuestionnaireService questionnaireService)
-	{
+	public void setQuestionnaireService(QuestionnaireService questionnaireService) {
 
 		this.questionnaireService = questionnaireService;
 	}
 
-	/**
-	 * 
-	 * @param request
-	 * @return
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Create questionnaire")
 	@RequestMapping(value = "/put/questionnaire", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String createQuestionnaire(@RequestBody String request)
-	{
+	public String createQuestionnaire(@RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(questionnaireService.createQuestionnaire(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("put-questionnaire failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -56,21 +70,14 @@ public String createQuestionnaire(@RequestBody String request)
 		return response.toString();
 	}
 
-	/**
-	 * 
-	 * @param request
-	 * @return
-	 */
 	@CrossOrigin()
+	@ApiOperation(value = "Get questionnaire list")
 	@RequestMapping(value = "/get/questionnaireList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String questionTypeList()
-	{
+	public String questionTypeList() {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(questionnaireService.getQuestionnaireList());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("get-questionnaire failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/report/CRMReports.java b/src/main/java/com/iemr/common/controller/report/CRMReports.java
deleted file mode 100644
index 420c89db..00000000
--- a/src/main/java/com/iemr/common/controller/report/CRMReports.java
+++ /dev/null
@@ -1,447 +0,0 @@
-package com.iemr.common.controller.report;
-
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.iemr.common.data.report.CallDetailsReport;
-import com.iemr.common.mapper.Report1097Mapper;
-import com.iemr.common.model.reports.Report1097RequestModel;
-import com.iemr.common.model.reports.Report1097ResponseModel;
-import com.iemr.common.service.reports.CallReportsService;
-import com.iemr.common.utils.mapper.InputMapper;
-import com.iemr.common.utils.response.OutputResponse;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@CrossOrigin
-@RequestMapping({ "/crmReports" })
-@RestController
-public class CRMReports {
-
-	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-	InputMapper inputMapper = new InputMapper();
-
-	private CallReportsService callReportsService;
-
-	@Autowired
-	public void setCallReportsService(CallReportsService callReportsService) {
-		this.callReportsService = callReportsService;
-	}
-
-	@Autowired
-	Report1097Mapper mapper;
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllReportsByDateDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getAllReportsByDate(@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\","
-			+ "\\\"beneficiaryCallType\\\":\\\"String\\\",\\\"beneficiaryCallSubType\\\":\\\"String\\\","
-			+ "\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-			+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\",\\\"gender\\\":\\\"String\\\","
-			+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"beneficiarySexualOrientation\\\":\\\"String\\\"}\"") @RequestBody Report1097RequestModel jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			List<CallDetailsReport> callDetailsReports = callReportsService
-					.getAllReportsByDate(mapper.requestToCRMReports(jsonRequest));
-			
-			java.util.Date startDate = jsonRequest.getStartTimestamp();
-			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-			String str1 = sdf1.format(startDate.getTime());
-			startDate = sdf1.parse(str1);
-			String startDateTime = sdf1.format(startDate);
-			Timestamp startOfDate = Timestamp.valueOf(startDateTime);
-			jsonRequest.setStartTimestamp(startOfDate);
-
-			java.util.Date endDate = jsonRequest.getEndTimestamp();
-			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-			String str2 = sdf2.format(endDate.getTime());
-			endDate = sdf2.parse(str2);
-			String endDateTime = sdf2.format(endDate);
-			Timestamp endOfDate = Timestamp.valueOf(endDateTime);
-			jsonRequest.setEndTimestamp(endOfDate);
-			
-			List<Report1097ResponseModel> reportList = new ArrayList<Report1097ResponseModel>();
-			Long slNo = 1l;
-			for (CallDetailsReport callDetailsReport : callDetailsReports) {
-				Report1097ResponseModel report = mapper.crmReportsToResponse(callDetailsReport);
-				report.setSlNo(slNo++);
-				reportList.add(report);
-			}
-			response.setResponse(reportList.toString());
-		} catch (Exception e) {
-			response.setError(e);
-		}
-		logger.info("response is " + response.toStringWithSerialization());
-		return response.toStringWithSerialization();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllReportsByDateV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getAllReportsByDateV1(@RequestBody Report1097RequestModel jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		// try
-		// {
-		// List<CallDetailsReport> callDetailsReports =
-		// callReportsService.getAllReportsByDate(mapper.requestToCRMReports(jsonRequest));
-		// JSONArray reportList = new JSONArray();
-		// Long slNo = 1l;
-		// HashMap<Long, JSONObject> reportMap = new HashMap<Long, JSONObject>();
-		// int information = 0;
-		// int counselling = 0;
-		// int referral = 0;
-		// int feedback = 0;
-		// for (CallDetailsReport callDetailsReport : callDetailsReports)
-		// {
-		// Report1097ResponseModel report =
-		// mapper.crmReportsToResponse(callDetailsReport);
-		// JSONObject reportObj = null;
-		// if (!reportMap.containsKey(report.getBenCallID()))
-		// {
-		// report.setSlNo(slNo++);
-		// reportObj = new JSONObject(report.toString());
-		// reportObj.remove("categoryName");
-		// reportObj.remove("subCategoryName");
-		// reportObj.remove("documentName");
-		// reportObj.remove("counselingSubCategoryName");
-		// reportObj.remove("counselingCategoryName");
-		// reportObj.remove("counselingDocumentName");
-		// reportObj.remove("feedbackID");
-		// reportObj.remove("feedback");
-		// information = counselling = referral = feedback = 0;
-		// } else
-		// {
-		// reportObj = reportMap.get(report.getBenCallID());
-		// }
-		// if (report.getSubCategoryName() != null)
-		// {
-		// information++;
-		// reportObj.put("categoryName" + information, report.getCategoryName());
-		// reportObj.put("subCategoryName" + information, report.getSubCategoryName());
-		// reportObj.put("documentName" + information, report.getDocumentName());
-		// }
-		// if (report.getCounselingSubCategoryName() != null)
-		// {
-		// counselling++;
-		// reportObj.put("counselingCategoryName" + counselling,
-		// report.getCategoryName());
-		// reportObj.put("counselingSubCategoryName" + counselling,
-		// report.getSubCategoryName());
-		// reportObj.put("counselingSubCategoryName" + counselling,
-		// report.getCounsellingDocumentName());
-		// }
-		// if (callDetailsReport.getFeedbackID() != null)
-		// {
-		// feedback++;
-		// reportObj.put("feedbackID" + feedback, report.getFeedbackID());
-		// reportObj.put("feedback" + feedback, report.getFeedback());
-		// }
-		// reportMap.put(report.getBenCallID(), reportObj);
-		// }
-		// Set<Long> bencallIDs = reportMap.keySet();
-		// for (Long long1 : bencallIDs)
-		// {
-		// reportList.put(reportMap.get(long1));
-		// }
-		// response.setResponse(reportList.toString());
-		// } catch (Exception e)
-		// {
-		// response.setError(e);
-		// }
-		// logger.info("response is " + response.toStringWithSerialization());
-		return response.toStringWithSerialization();
-	}
-
-	@CrossOrigin()
-	@Deprecated
-	@RequestMapping(value = "/getAllByAgeGroupDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getAllByAgeGroup(
-			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"maxAge\\\":\\\"Integer\\\",\\\"minAge\\\":\\\"Integer\\\",\\\"startTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"endTimestamp\\\":\\\"Timestamp\\\",\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody Report1097RequestModel[] jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			ArrayList<Report1097RequestModel> requests = new ArrayList<Report1097RequestModel>();
-			for (Report1097RequestModel request : jsonRequest) {
-				
-				java.util.Date startDate = request.getStartTimestamp();
-				SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-				String str1 = sdf1.format(startDate.getTime());
-				startDate = sdf1.parse(str1);
-				String startDateTime = sdf1.format(startDate);
-				Timestamp startOfDate = Timestamp.valueOf(startDateTime);
-				request.setStartTimestamp(startOfDate);
-
-				java.util.Date endDate = request.getEndTimestamp();
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-				String str2 = sdf2.format(endDate.getTime());
-				endDate = sdf2.parse(str2);
-				String endDateTime = sdf2.format(endDate);
-				Timestamp endOfDate = Timestamp.valueOf(endDateTime);
-				request.setEndTimestamp(endOfDate);
-				
-				requests.add(request);
-			}
-			String callDetailsReportsByAge = callReportsService.getAllByAgeGroup(mapper.requestToCRMReports(requests));
-			response.setResponse(callDetailsReportsByAge);
-		} catch (Exception e) {
-			response.setError(e);
-		}
-		return response.toString();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllByGenderDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getAllByGender(
-			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"gender\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
-					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody Report1097RequestModel[] jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			ArrayList<Report1097RequestModel> requests = new ArrayList<Report1097RequestModel>();
-			for (Report1097RequestModel request : jsonRequest) {
-				
-				java.util.Date startDate = request.getStartTimestamp();
-				SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-				String str1 = sdf1.format(startDate.getTime());
-				startDate = sdf1.parse(str1);
-				String startDateTime = sdf1.format(startDate);
-				Timestamp startOfDate = Timestamp.valueOf(startDateTime);
-				request.setStartTimestamp(startOfDate);
-
-				java.util.Date endDate = request.getEndTimestamp();
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-				String str2 = sdf2.format(endDate.getTime());
-				endDate = sdf2.parse(str2);
-				String endDateTime = sdf2.format(endDate);
-				Timestamp endOfDate = Timestamp.valueOf(endDateTime);
-				request.setEndTimestamp(endOfDate);
-				
-				requests.add(request);
-			}
-			String callDetailsReportsByGender = callReportsService.getAllByGender(mapper.requestToCRMReports(requests));
-			response.setResponse(callDetailsReportsByGender);
-		} catch (Exception e) {
-			response.setError(e);
-		}
-		return response.toString();
-	}
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllBySexualOrientationDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getAllBySexualOrientation(
-			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"beneficiarySexualOrientation\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
-					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody Report1097RequestModel[] jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			ArrayList<Report1097RequestModel> requests = new ArrayList<Report1097RequestModel>();
-			for (Report1097RequestModel request : jsonRequest) {
-				
-				java.util.Date startDate = request.getStartTimestamp();
-				SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-				String str1 = sdf1.format(startDate.getTime());
-				startDate = sdf1.parse(str1);
-				String startDateTime = sdf1.format(startDate);
-				Timestamp startOfDate = Timestamp.valueOf(startDateTime);
-				request.setStartTimestamp(startOfDate);
-
-				java.util.Date endDate = request.getEndTimestamp();
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-				String str2 = sdf2.format(endDate.getTime());
-				endDate = sdf2.parse(str2);
-				String endDateTime = sdf2.format(endDate);
-				Timestamp endOfDate = Timestamp.valueOf(endDateTime);
-				request.setEndTimestamp(endOfDate);
-				
-				requests.add(request);
-			}
-			String callDetailsReportsBySexualOrientation = callReportsService
-					.getAllBySexualOrientation(mapper.requestToCRMReports(requests));
-			response.setResponse(callDetailsReportsBySexualOrientation);
-		} catch (Exception e) {
-			response.setError(e);
-		}
-		return response.toString();
-	}
-
-	@Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getCountsByPreferredLanguageDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getCountsByPreferredLanguage(
-			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
-					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody Report1097RequestModel[] jsonRequest) {
-		OutputResponse response = new OutputResponse();
-		try {
-			ArrayList<Report1097RequestModel> requests = new ArrayList<Report1097RequestModel>();
-			for (Report1097RequestModel request : jsonRequest) {
-				
-				java.util.Date startDate = request.getStartTimestamp();
-				SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
-				String str1 = sdf1.format(startDate.getTime());
-				startDate = sdf1.parse(str1);
-				String startDateTime = sdf1.format(startDate);
-				Timestamp startOfDate = Timestamp.valueOf(startDateTime);
-				request.setStartTimestamp(startOfDate);
-
-				java.util.Date endDate = request.getEndTimestamp();
-				SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-				String str2 = sdf2.format(endDate.getTime());
-				endDate = sdf2.parse(str2);
-				String endDateTime = sdf2.format(endDate);
-				Timestamp endOfDate = Timestamp.valueOf(endDateTime);
-				request.setEndTimestamp(endOfDate);
-				
-				requests.add(request);
-			}
-			String countsByPreferredLanguage = callReportsService
-					.getCountsByPreferredLanguage(mapper.requestToCRMReports(requests));
-			response.setResponse(countsByPreferredLanguage);
-		} catch (Exception e) {
-			response.setError(e);
-		}
-		return response.toString();
-	}
-    @Deprecated
-	@CrossOrigin
-	@RequestMapping(value = "/getComplaintDetailReports", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getComplaintDetailReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\","
-					+ "\\\"feedbackTypeID\\\":\\\"Integer\\\",\\\"feedbackNatureID\\\":\\\"Integer\\\",\\\"feedbackTypeName\\\":\\\"String\\\"}\"") @RequestBody String request,
-			HttpServletRequest httpRequest) {
-		OutputResponse response = new OutputResponse();
-		logger.info("getComplaintDetailReport request " + request);
-		try {
-			response.setResponse(callReportsService.getComplaintDetailReport(request));
-		} catch (Exception e) {
-			logger.error("getComplaintDetailReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-
-    @Deprecated
-	@CrossOrigin
-	@RequestMapping(value = "/getUnblockedUserReportDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getUnblockedUserReport(
-			@ApiParam(value = "\"{\\\"blockStartDate\\\":\\\"Timestamp\\\",\\\"blockEndDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody String request,
-			HttpServletRequest httpRequest) {
-		OutputResponse response = new OutputResponse();
-		logger.info("getUnblockedUserReport request " + request);
-		try {
-			response.setResponse(callReportsService.getUnblockedUserReport(request));
-		} catch (Exception e) {
-			logger.error("getUnblockedUserReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-
-	@Deprecated
-	@CrossOrigin
-	@RequestMapping(value = "/getDistrictWiseCallReportDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getDistrictWiseCallReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"districtID\\\":\\\"Integer\\\",\\\"district\\\":\\\"String\\\",\\\"subdistrictID\\\":\\\"Integer\\\",\\\"villageID\\\":\\\"Integer\\\","
-					+ "\\\"locationID\\\":\\\"Integer\\\",\\\"roleID\\\":\\\"Integer\\\"}\"") @RequestBody String request,
-			HttpServletRequest httpRequest) {
-		OutputResponse response = new OutputResponse();
-		logger.info("getDistrictWiseCallReport request " + request);
-		try {
-			response.setResponse(callReportsService.getDistrictWiseCallReport(request));
-		} catch (Exception e) {
-			logger.error("getDistrictWiseCallReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-
-	@Deprecated
-	@CrossOrigin
-	@RequestMapping(value = "/getCallQualityReportDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getCallQualityReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"searchCriteria\\\":\\\"String\\\",\\\"workingLocationID\\\":\\\"Integer\\\"}\"") @RequestBody String request,
-			HttpServletRequest httpRequest) {
-		OutputResponse response = new OutputResponse();
-		logger.info("getCallQualityReport request " + request);
-		try {
-			response.setResponse(callReportsService.getCallQualityReport(request));
-		} catch (Exception e) {
-			logger.error("getCallQualityReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-    @Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getQualityReports", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getQualityReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\","
-					+ "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
-
-	{
-		OutputResponse response = new OutputResponse();
-		try {
-			String requestReports = callReportsService.getQualityReport(jsonRequest);
-			response.setResponse(requestReports.toString());
-		} catch (Exception e) {
-			logger.error("getDistrictWiseCallReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-    @Deprecated
-	@CrossOrigin()
-	@RequestMapping(value = "/getCallSummaryReportDeprecated", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getCallSummaryReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\",\\\"roleName\\\":\\\"String\\\","
-					+ "\\\"callTypeID\\\":\\\"Integer\\\","
-					+ "\\\"callTypeName\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
-
-	{
-		OutputResponse response = new OutputResponse();
-		try {
-			String requestReports = callReportsService.getCallSummaryReport(jsonRequest);
-			response.setResponse(requestReports.toString());
-		} catch (Exception e) {
-			logger.error("getCallSummaryReport failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		return response.toStringWithSerialization();
-	}
-
-	@CrossOrigin()
-	@ApiOperation(value = "QA report type master Data", consumes = "application/json", produces = "application/json")
-	@RequestMapping(value = "/getReportTypes/{providerServiceMapID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON)
-	public String patientAppChiefComplaintsMasterData(
-			@PathVariable("providerServiceMapID") Integer providerServiceMapID) throws Exception {
-		logger.info("QA report type master Data for " + " providerServiceMapID:" + providerServiceMapID);
-		;
-		OutputResponse response = new OutputResponse();
-		response.setResponse(callReportsService.getReportTypes(providerServiceMapID));
-		logger.info("Nurse master Data for categoryID:" + response.toString());
-		return response.toString();
-	}
-}
diff --git a/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java
new file mode 100644
index 00000000..e74abb99
--- /dev/null
+++ b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java
@@ -0,0 +1,72 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.controller.report;
+
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iemr.common.mapper.Report1097Mapper;
+import com.iemr.common.service.reports.CallReportsService;
+import com.iemr.common.utils.mapper.InputMapper;
+import com.iemr.common.utils.response.OutputResponse;
+
+import io.swagger.annotations.ApiOperation;
+
+@CrossOrigin
+@RequestMapping({ "/crmReports" })
+@RestController
+public class CustomerRelationshipReports {
+
+	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+	InputMapper inputMapper = new InputMapper();
+
+	private CallReportsService callReportsService;
+
+	@Autowired
+	public void setCallReportsService(CallReportsService callReportsService) {
+		this.callReportsService = callReportsService;
+	}
+
+	@Autowired
+	Report1097Mapper mapper;
+
+	@CrossOrigin()
+	@ApiOperation(value = "QA report type master data", consumes = "application/json", produces = "application/json")
+	@RequestMapping(value = "/getReportTypes/{providerServiceMapID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON)
+	public String patientAppChiefComplaintsMasterData(
+			@PathVariable("providerServiceMapID") Integer providerServiceMapID) throws Exception {
+		logger.info("QA report type master Data for " + " providerServiceMapID:" + providerServiceMapID);
+		;
+		OutputResponse response = new OutputResponse();
+		response.setResponse(callReportsService.getReportTypes(providerServiceMapID));
+		logger.info("Nurse master Data for categoryID:" + response.toString());
+		return response.toString();
+	}
+}
diff --git a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java
index 9d7a6cd4..cbdfc1f0 100644
--- a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java
+++ b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.scheme;
 
 import java.util.List;
@@ -22,8 +43,7 @@
 
 @RequestMapping(value = "/beneficiary")
 @RestController
-public class SchemeController
-{
+public class SchemeController {
 	InputMapper inputMapper = new InputMapper();
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
@@ -33,32 +53,24 @@ public class SchemeController
 	InputMapper mapper = new InputMapper();
 
 	@CrossOrigin
-	@ApiOperation(value = "stores scheme data", consumes = "application/json", produces = "application/json")
-	@RequestMapping(
-			value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE,
-			consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
-	public String saveSchemeDetails(
-			@ApiParam(
-					value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
-							+ "\"schemeName\": \"Name of Scheme\", " + "\"schemeDesc\": \"Description of Scheme\", "
-							+ "\"createdBy\": \"User name of the supervisor creating scheme\", "
-							+ "\"kmFileManager\":{\"fileName\":\"String: name of file\", " + "\"fileExtension\":\"String: file extension\", "
-							+ "\"providerServiceMapID\":\"Integer: service provider map ID\", "
-							+ "\"userID\":\"Integer: user ID of the supervisor\", "
-							+ "\"fileContent\":\"String: base64encoded binary file content\", "
-							+ "\"createdBy\":\"String: username of supervisor\"}}") @RequestBody String request)
-	{
-
-		// logger.info("saveSchemeDetails request " + request);
+	@ApiOperation(value = "Save scheme details", consumes = "application/json", produces = "application/json")
+	@RequestMapping(value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
+	public String saveSchemeDetails(@ApiParam(value = "{\"providerServiceMapID\": \"integer-provider service map id\", "
+			+ "\"schemeName\": \"Name of Scheme\", " + "\"schemeDesc\": \"Description of Scheme\", "
+			+ "\"createdBy\": \"User name of the supervisor creating scheme\", "
+			+ "\"kmFileManager\":{\"fileName\":\"String: name of file\", "
+			+ "\"fileExtension\":\"String: file extension\", "
+			+ "\"providerServiceMapID\":\"Integer: service provider map ID\", "
+			+ "\"userID\":\"Integer: user ID of the supervisor\", "
+			+ "\"fileContent\":\"String: base64encoded binary file content\", "
+			+ "\"createdBy\":\"String: username of supervisor\"}}") @RequestBody String request) {
 		OutputResponse output = new OutputResponse();
-		try
-		{
+		try {
 			Scheme scheme = inputMapper.gson().fromJson(request, Scheme.class);
 			Scheme schemeNew;
 			schemeNew = schemeServiceImpl.save(scheme);
 			output.setResponse(schemeNew.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("saveSchemeDetails failed with error " + e.getMessage(), e);
 			output.setError(e);
 		}
@@ -67,28 +79,23 @@ public String saveSchemeDetails(
 	}
 
 	@CrossOrigin
-	@RequestMapping(
-			value = "/get/schemeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE,
-			consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
-	public String getSchemeList(@ApiParam(value = "{\"providerServiceMapID\":\"Integer\"}") @RequestBody String createRequest)
-	{
+	@ApiOperation(value = "Get scheme list")
+	@RequestMapping(value = "/get/schemeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
+	public String getSchemeList(
+			@ApiParam(value = "{\"providerServiceMapID\":\"Integer\"}") @RequestBody String createRequest) {
 		logger.info("getSchemeList request " + createRequest);
 		OutputResponse output = new OutputResponse();
-		try
-		{
+		try {
 			Scheme m_scheme = mapper.gson().fromJson(createRequest, Scheme.class);
 			List<Scheme> schemes = null;
 			schemes = schemeServiceImpl.getSchemeList(m_scheme.getProviderServiceMapID());
-			if (schemes != null)
-			{
+			if (schemes != null) {
 				output.setResponse(schemes.toString());
-			} else
-			{
+			} else {
 				output.setError(5000, "No schemes available");
 			}
 
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getSchemeList failed with error " + e.getMessage(), e);
 			output.setError(e);
 		}
@@ -97,27 +104,24 @@ public String getSchemeList(@ApiParam(value = "{\"providerServiceMapID\":\"Integ
 	}
 
 	@CrossOrigin
-	@RequestMapping(value = "/scheme/deleteScheme", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes=MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
-	public String deleteScheme(@ApiParam(value = "{\"schemeID\":\"Integer\",\"deleted\":\"Boolean\"}") @RequestBody String createRequest)
-	{
+	@ApiOperation(value = "Delete scheme")
+	@RequestMapping(value = "/scheme/deleteScheme", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization")
+	public String deleteScheme(
+			@ApiParam(value = "{\"schemeID\":\"Integer\",\"deleted\":\"Boolean\"}") @RequestBody String createRequest) {
 		logger.info("delete scheme request " + createRequest);
 		OutputResponse output = new OutputResponse();
-		try
-		{
+		try {
 			Scheme m_scheme = mapper.gson().fromJson(createRequest, Scheme.class);
 			Scheme scheme = null;
 			scheme = schemeServiceImpl.getSchemeByID(m_scheme.getSchemeID());
-			if (scheme != null)
-			{
+			if (scheme != null) {
 				scheme.setDeleted(m_scheme.getDeleted());
 				output.setResponse(schemeServiceImpl.deletedata(scheme));
-			} else
-			{
+			} else {
 				output.setError(5000, "No schemes available");
 			}
 
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getSchemeList failed with error " + e.getMessage(), e);
 			output.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java
deleted file mode 100644
index d6c79793..00000000
--- a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java
+++ /dev/null
@@ -1,364 +0,0 @@
-package com.iemr.common.controller.secondaryReport;
-
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.ApiParam;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.iemr.common.data.report.CallDetailsReport;
-import com.iemr.common.data.report.CallQualityReport;
-import com.iemr.common.model.reports.Report1097RequestModel;
-import com.iemr.common.service.reportSecondary.SecondaryReportService;
-import com.iemr.common.utils.mapper.InputMapper;
-import com.iemr.common.utils.response.OutputResponse;
-@CrossOrigin
-@RequestMapping({ "/crmReports" })
-@RestController
-public class CRMSecondaryReports {
-	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-	@Autowired
-	private SecondaryReportService secondaryReportService;
-	@CrossOrigin()
-	@RequestMapping(value = "/getQualityReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getQualityReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\","
-					+ "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
-
-	{
-		String filename = getFileName(jsonRequest,"104QAReport");
-		    InputStreamResource file=null;
-		    try
-		    {
-		      file = new InputStreamResource(secondaryReportService.getQualityReport(jsonRequest,filename));
-		      return ResponseEntity.ok()
-				        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))
-				        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-				        .body(file);
-		    }
-		    catch(Exception e)
-		    {
-		    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-		    	if(e.getMessage().equalsIgnoreCase("No data found"))
-		    	return ResponseEntity.status(500).body(e.getMessage());
-		    	else
-		    		return ResponseEntity.status(5000).body(e.getMessage());
-		    }
-	}
-	@CrossOrigin()
-	@RequestMapping(value = "/getComplaintDetailReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getComplaintDetailReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\","
-					+ "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
-
-	{
-		String filename ="Grievance_Details.xlsx";
-
-		    InputStreamResource file=null;
-		    try
-		    {
-		    	file = new InputStreamResource(secondaryReportService.getComplaintDetailReport(jsonRequest,"Grievance_Details"));
-		      return ResponseEntity.ok()
-				        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename)
-				        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-				        .body(file);
-		    }
-		    catch(Exception e)
-		    {
-		    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-		    	if(e.getMessage().equalsIgnoreCase("No data found"))
-		    	return ResponseEntity.status(500).body(e.getMessage());
-		    	else
-		    	return ResponseEntity.status(5000).body(e.getMessage());
-		    }
-	}@CrossOrigin()
-	@RequestMapping(value = "/getCallSummaryReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getCallSummaryReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\",\\\"roleName\\\":\\\"String\\\","
-					+ "\\\"callTypeID\\\":\\\"Integer\\\","
-					+ "\\\"callTypeName\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
-
-	{
-		String filename = getFileName(jsonRequest,"Call_Summary_Report");
-	    InputStreamResource file=null;
-	    
-	    try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getCallSummaryReport(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllBySexualOrientation", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object>  getAllBySexualOrientation(
-			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-					+"\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\","
-					+"\\\"beneficiarySexualOrientation\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\" }\"") @RequestBody String jsonRequest) {
-		String filename = getFileName(jsonRequest,"Sexual_Orientation_Report");
-	    InputStreamResource file=null;
-	    try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getAllBySexualOrientationReport(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-		
-		
-	}
-	
-	@CrossOrigin
-	@RequestMapping(value = "/getDistrictWiseCallReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getDistrictWiseCallReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"districtID\\\":\\\"Integer\\\",\\\"district\\\":\\\"String\\\",\\\"subdistrictID\\\":\\\"Integer\\\",\\\"villageID\\\":\\\"Integer\\\","
-					+ "\\\"locationID\\\":\\\"Integer\\\",\\\"roleID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest) 
-	{
-		String filename = getFileName(jsonRequest,"District_Wise_Call_Volume_Report");
-	    InputStreamResource file=null;
-	    
-	    try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getDistrictWiseCallReport(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	@CrossOrigin
-	@RequestMapping(value = "/getUnblockedUserReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getUnblockedUserReport(
-			@ApiParam(value = "\"{\\\"blockStartDate\\\":\\\"Timestamp\\\",\\\"blockEndDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest,
-			HttpServletRequest httpRequest) {
-		String filename = getFileName(jsonRequest,"Unblock_User_Report");
-	    InputStreamResource file=null;
-		try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getUnblockedUserReport(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	@CrossOrigin
-	@RequestMapping(value = "/getCallQualityReport", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getCallQualityReport(
-			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
-					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"searchCriteria\\\":\\\"String\\\","
-					+"\\\"workingLocationID\\\":\\\"Integer\\\",\\\"filename\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,
-			HttpServletRequest httpRequest) {
-		String filename = null;
-	    InputStreamResource file=null;
-		try
-	    {
-			CallQualityReport callQualityReport = InputMapper.gson().fromJson(jsonRequest,
-					CallQualityReport.class);
-		  filename = getFileName(jsonRequest,callQualityReport.getFileName());
-	      file = new InputStreamResource(secondaryReportService.getCallQualityReport(callQualityReport,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	
-	@CrossOrigin()
-	@RequestMapping(value = "/getCountsByPreferredLanguage", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getCountsByPreferredLanguage(
-			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
-					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,HttpServletRequest httpRequest) {
-		String filename = null;
-	    InputStreamResource file=null;
-		try {
-			
-		  filename = getFileName(jsonRequest,"Language_Distribution_Report");
-		  file = new InputStreamResource(secondaryReportService.getCountsByPrefferedLanguage(jsonRequest,filename));
-		  return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-
-	@CrossOrigin
-	@RequestMapping(value = "/getAllByAgeGroup", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getAllByAgeGroup(
-			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"maxAge\\\":\\\"Integer\\\",\\\"minAge\\\":\\\"Integer\\\",\\\"startTimestamp\\\":\\\"Timestamp\\\","
-					+ "\\\"endTimestamp\\\":\\\"Timestamp\\\",\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest, HttpServletRequest httpRequest) {
-
-			String filename = getFileName(jsonRequest,"Caller_Age_Group_Report");
-		    InputStreamResource file=null;
-			try
-		    {
-		      file = new InputStreamResource(secondaryReportService.getAllByAgeGroup(jsonRequest,filename));
-		      return ResponseEntity.ok()
-				        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-				        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-				        .body(file);
-		    }
-		    catch(Exception e)
-		    {
-		    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-		    	if(e.getMessage().equalsIgnoreCase("No data found"))
-		    	return ResponseEntity.status(500).body(e.getMessage());
-		    	else
-		    	return ResponseEntity.status(5000).body(e.getMessage());
-		    }
-		}
-
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllReportsByDate", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getAllReportsByDate(@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\","
-			+ "\\\"beneficiaryCallType\\\":\\\"String\\\",\\\"beneficiaryCallSubType\\\":\\\"String\\\","
-			+ "\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-			+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\",\\\"gender\\\":\\\"String\\\","
-			+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"beneficiarySexualOrientation\\\":\\\"String\\\"}\"") 
-			@RequestBody String jsonRequest) {
-		String filename = getFileName(jsonRequest,"Call_Type_Report");
-	    InputStreamResource file=null;
-	    
-	    try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getAllReportsByDate(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-	    }
-	    catch(Exception e)
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	@CrossOrigin()
-	@RequestMapping(value = "/getAllByGender", method = RequestMethod.POST, headers = "Authorization")
-	public ResponseEntity<Object> getAllByGender(@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
-			+ "\\\"gender\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
-			+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") 
-			@RequestBody String jsonRequest) {
-		String filename = getFileName(jsonRequest,"Gender_Distribution_Report");
-	    InputStreamResource file=null;
-	    
-	    try
-	    {
-	      file = new InputStreamResource(secondaryReportService.getAllByGender(jsonRequest,filename));
-	      return ResponseEntity.ok()
-			        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename+".xlsx"))//add generic function
-			        .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-			        .body(file);
-
-	    }
-	    catch(Exception e)
-
-	    {
-	    	logger.error("Report Name:"+filename+" Timestamp:"+System.currentTimeMillis()+" Error: "+e.getMessage());
-	    	if(e.getMessage().equalsIgnoreCase("No data found"))
-	    	return ResponseEntity.status(500).body(e.getMessage());
-	    	else
-	    	return ResponseEntity.status(5000).body(e.getMessage());
-	    }
-	}
-	
-	public String getFileName(String jsonRequest,String name)
-	{
-		String fileName=null;
-		JsonObject jsnOBJ = new JsonObject();
-		JsonParser jsnParser = new JsonParser();
-		JsonElement jsnElmnt = jsnParser.parse(jsonRequest);
-		jsnOBJ = jsnElmnt.getAsJsonObject();
-		if (jsnOBJ != null && jsnOBJ.has("fileName"))
-		{
-		 fileName=jsnOBJ.get("fileName").getAsString();
-		}
-		if(fileName !=null)
-		return fileName;
-		else
-			return name;
-	}
-}
diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java
new file mode 100644
index 00000000..8d803577
--- /dev/null
+++ b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java
@@ -0,0 +1,370 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.controller.secondaryReport;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.iemr.common.data.report.CallQualityReport;
+import com.iemr.common.service.reportSecondary.SecondaryReportService;
+import com.iemr.common.utils.mapper.InputMapper;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+@CrossOrigin
+@RequestMapping({ "/crmReports" })
+@RestController
+public class CustomerRelationshipSecondaryReports {
+	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+	@Autowired
+	private SecondaryReportService secondaryReportService;
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get quality report")
+	@RequestMapping(value = "/getQualityReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getQualityReport(
+			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\","
+					+ "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
+
+	{
+		String filename = getFileName(jsonRequest, "104QAReport");
+		InputStreamResource file = null;
+		try {
+			file = new InputStreamResource(secondaryReportService.getQualityReport(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get complaint detail report")
+	@RequestMapping(value = "/getComplaintDetailReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getComplaintDetailReport(
+			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\","
+					+ "\\\"roleName\\\":\\\"String\\\",\\\"reportTypeID\\\":\\\"Integer\\\",\\\"reportType\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
+
+	{
+		String filename = "Grievance_Details.xlsx";
+
+		InputStreamResource file = null;
+		try {
+			file = new InputStreamResource(
+					secondaryReportService.getComplaintDetailReport(jsonRequest, "Grievance_Details"));
+			return ResponseEntity.ok().header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename)
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get call summary report")
+	@RequestMapping(value = "/getCallSummaryReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getCallSummaryReport(
+			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"agentID\\\":\\\"Integer\\\",\\\"roleName\\\":\\\"String\\\","
+					+ "\\\"callTypeID\\\":\\\"Integer\\\","
+					+ "\\\"callTypeName\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest)
+
+	{
+		String filename = getFileName(jsonRequest, "Call_Summary_Report");
+		InputStreamResource file = null;
+
+		try {
+			file = new InputStreamResource(secondaryReportService.getCallSummaryReport(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get all by sexual orientation")
+	@RequestMapping(value = "/getAllBySexualOrientation", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getAllBySexualOrientation(
+			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
+					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\","
+					+ "\\\"beneficiarySexualOrientation\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\" }\"") @RequestBody String jsonRequest) {
+		String filename = getFileName(jsonRequest, "Sexual_Orientation_Report");
+		InputStreamResource file = null;
+		try {
+			file = new InputStreamResource(
+					secondaryReportService.getAllBySexualOrientationReport(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+
+	}
+
+	@CrossOrigin
+	@ApiOperation(value = "Get district wise call report")
+	@RequestMapping(value = "/getDistrictWiseCallReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getDistrictWiseCallReport(
+			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"districtID\\\":\\\"Integer\\\",\\\"district\\\":\\\"String\\\",\\\"subdistrictID\\\":\\\"Integer\\\",\\\"villageID\\\":\\\"Integer\\\","
+					+ "\\\"locationID\\\":\\\"Integer\\\",\\\"roleID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest) {
+		String filename = getFileName(jsonRequest, "District_Wise_Call_Volume_Report");
+		InputStreamResource file = null;
+
+		try {
+			file = new InputStreamResource(secondaryReportService.getDistrictWiseCallReport(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin
+	@ApiOperation(value = "Get unblocked user report")
+	@RequestMapping(value = "/getUnblockedUserReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getUnblockedUserReport(
+			@ApiParam(value = "\"{\\\"blockStartDate\\\":\\\"Timestamp\\\",\\\"blockEndDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody String jsonRequest,
+			HttpServletRequest httpRequest) {
+		String filename = getFileName(jsonRequest, "Unblock_User_Report");
+		InputStreamResource file = null;
+		try {
+			file = new InputStreamResource(secondaryReportService.getUnblockedUserReport(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin
+	@ApiOperation(value = "Get call quality report")
+	@RequestMapping(value = "/getCallQualityReport", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getCallQualityReport(
+			@ApiParam(value = "\"{\\\"startDate\\\":\\\"Timestamp\\\",\\\"endDate\\\":\\\"Timestamp\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"searchCriteria\\\":\\\"String\\\","
+					+ "\\\"workingLocationID\\\":\\\"Integer\\\",\\\"filename\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,
+			HttpServletRequest httpRequest) {
+		String filename = null;
+		InputStreamResource file = null;
+		try {
+			CallQualityReport callQualityReport = InputMapper.gson().fromJson(jsonRequest, CallQualityReport.class);
+			filename = getFileName(jsonRequest, callQualityReport.getFileName());
+			file = new InputStreamResource(secondaryReportService.getCallQualityReport(callQualityReport, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get counts by preferred language")
+	@RequestMapping(value = "/getCountsByPreferredLanguage", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getCountsByPreferredLanguage(
+			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
+					+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
+					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,
+			HttpServletRequest httpRequest) {
+		String filename = null;
+		InputStreamResource file = null;
+		try {
+
+			filename = getFileName(jsonRequest, "Language_Distribution_Report");
+			file = new InputStreamResource(secondaryReportService.getCountsByPrefferedLanguage(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin
+	@ApiOperation(value = "Get caller by age group")
+	@RequestMapping(value = "/getAllByAgeGroup", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getAllByAgeGroup(
+			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"maxAge\\\":\\\"Integer\\\",\\\"minAge\\\":\\\"Integer\\\",\\\"startTimestamp\\\":\\\"Timestamp\\\","
+					+ "\\\"endTimestamp\\\":\\\"Timestamp\\\",\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest,
+			HttpServletRequest httpRequest) {
+
+		String filename = getFileName(jsonRequest, "Caller_Age_Group_Report");
+		InputStreamResource file = null;
+		try {
+			file = new InputStreamResource(secondaryReportService.getAllByAgeGroup(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get all reports by date")
+	@RequestMapping(value = "/getAllReportsByDate", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getAllReportsByDate(
+			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\","
+					+ "\\\"beneficiaryCallType\\\":\\\"String\\\",\\\"beneficiaryCallSubType\\\":\\\"String\\\","
+					+ "\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
+					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\",\\\"gender\\\":\\\"String\\\","
+					+ "\\\"beneficiaryPreferredLanguage\\\":\\\"String\\\",\\\"beneficiarySexualOrientation\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) {
+		String filename = getFileName(jsonRequest, "Call_Type_Report");
+		InputStreamResource file = null;
+
+		try {
+			file = new InputStreamResource(secondaryReportService.getAllReportsByDate(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+		} catch (Exception e) {
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Get all by gender")
+	@RequestMapping(value = "/getAllByGender", method = RequestMethod.POST, headers = "Authorization")
+	public ResponseEntity<Object> getAllByGender(
+			@ApiParam(value = "\"{\\\"startTimestamp\\\":\\\"Timestamp\\\",\\\"endTimestamp\\\":\\\"Timestamp\\\","
+					+ "\\\"gender\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"Integer\\\","
+					+ "\\\"state\\\":\\\"String\\\",\\\"district\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) {
+		String filename = getFileName(jsonRequest, "Gender_Distribution_Report");
+		InputStreamResource file = null;
+
+		try {
+			file = new InputStreamResource(secondaryReportService.getAllByGender(jsonRequest, filename));
+			return ResponseEntity.ok()
+					.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + (filename + ".xlsx"))
+
+					.contentType(MediaType.parseMediaType("application/vnd.ms-excel")).body(file);
+
+		} catch (Exception e)
+
+		{
+			logger.error("Report Name:" + filename + " Timestamp:" + System.currentTimeMillis() + " Error: "
+					+ e.getMessage());
+			if (e.getMessage().equalsIgnoreCase("No data found"))
+				return ResponseEntity.status(500).body(e.getMessage());
+			else
+				return ResponseEntity.status(5000).body(e.getMessage());
+		}
+	}
+
+	public String getFileName(String jsonRequest, String name) {
+		String fileName = null;
+		JsonObject jsnOBJ = new JsonObject();
+		JsonParser jsnParser = new JsonParser();
+		JsonElement jsnElmnt = jsnParser.parse(jsonRequest);
+		jsnOBJ = jsnElmnt.getAsJsonObject();
+		if (jsnOBJ != null && jsnOBJ.has("fileName")) {
+			fileName = jsnOBJ.get("fileName").getAsString();
+		}
+		if (fileName != null)
+			return fileName;
+		else
+			return name;
+	}
+}
diff --git a/src/main/java/com/iemr/common/controller/services/CategoryController.java b/src/main/java/com/iemr/common/controller/services/CategoryController.java
index a5859179..4765ca09 100644
--- a/src/main/java/com/iemr/common/controller/services/CategoryController.java
+++ b/src/main/java/com/iemr/common/controller/services/CategoryController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.services;
 
 import java.util.ArrayList;
@@ -20,33 +41,32 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 @RequestMapping(value = "/category")
-public class CategoryController
-{
+public class CategoryController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get all categries")
 	@RequestMapping(value = "/categories", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAllCategries(
-			@Param("{\"providerServiceMapID\":\"Integer\", " + "\"subServiceID\":\"subServiceID\", " + "\"feedbackNatureID\":\"feedbackNatureID\"}") @RequestBody String request)
-	{
+			@Param("{\"providerServiceMapID\":\"Integer\", " + "\"subServiceID\":\"subServiceID\", "
+					+ "\"feedbackNatureID\":\"feedbackNatureID\"}") @RequestBody String request) {
 
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			List<CategoryDetails> categoryList = new ArrayList<CategoryDetails>();
 			categoryList = categoryService.getAllCategories(request);
 			response.setResponse(categoryList.toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
 		return response.toString();
-	}	
-	
+	}
 
 	/**
 	 * Category srvice
@@ -57,8 +77,7 @@ public String getAllCategries(
 	 * Inject category service
 	 */
 	@Autowired
-	public void setCategoryService(CategoryService categoryService)
-	{
+	public void setCategoryService(CategoryService categoryService) {
 		this.categoryService = categoryService;
 	}
 }
diff --git a/src/main/java/com/iemr/common/controller/services/CommonController.java b/src/main/java/com/iemr/common/controller/services/CommonController.java
index 5b6e7c38..0244072f 100644
--- a/src/main/java/com/iemr/common/controller/services/CommonController.java
+++ b/src/main/java/com/iemr/common/controller/services/CommonController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.services;
 
 import javax.ws.rs.core.MediaType;
@@ -12,86 +33,74 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.iemr.common.service.services.CommonService;
+import com.iemr.common.service.services.Services;
+import com.iemr.common.service.services.ServicesImpl;
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RestController
 @RequestMapping(value = "/service")
-public class CommonController
-{
+public class CommonController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin()
-	@RequestMapping(value = "/category", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get category")
+	@RequestMapping(value = "/category", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	// public Iterable<CategoryDetails> getCategories(){
 	public String getCategories(@ApiParam("{\"providerServiceMapID\":\"Integer\", "
-			+ "\"subServiceID\":\"subServiceID\"}") @RequestBody String request)
-	{
+			+ "\"subServiceID\":\"subServiceID\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(commonService.getCategories(request).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/subcategory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getSubcategories(@ApiParam("{\"categoryID\":\"Integer\"}") @RequestBody String request)
-	{
+	@ApiOperation(value = "Get sub categories")
+	@RequestMapping(value = "/subcategory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getSubcategories(@ApiParam("{\"categoryID\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(commonService.getSubCategories(request).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
-	// getSubCategoryFiles
 	@CrossOrigin()
-	@RequestMapping(value = "/getSubCategoryFiles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
+	@ApiOperation(value = "Get sub category files")
+	@RequestMapping(value = "/getSubCategoryFiles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getSubCategoryFiles(@ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", "
-			+ "\"subCategoryID\":\"Integer\"}") @RequestBody String request)
-	{
+			+ "\"subCategoryID\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(commonService.getSubCategoryFiles(request).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
 		return response.toString();
 	}
 
-	// getSubCategoryFiles
 	@CrossOrigin()
-	@RequestMapping(value = "/getSubCategoryFilesWithURL", method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String
-			getSubCategoryFilesWithURL(@ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", "
-					+ "\"subCategoryID\":\"Integer\"}") @RequestBody String request)
-	{
+	@ApiOperation(value = "Get sub category files with URL")
+	@RequestMapping(value = "/getSubCategoryFilesWithURL", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getSubCategoryFilesWithURL(
+			@ApiParam("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", "
+					+ "\"subCategoryID\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(commonService.getSubCategoryFilesWithURL(request).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
@@ -99,20 +108,16 @@ public String getSubCategoryFiles(@ApiParam("{\"categoryID\":\"Integer\", \"prov
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/categoryByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getcategoriesById(@ApiParam(value="\"{\\\"subServiceID\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\"}\"")
-	@RequestBody String request)
-	{
+	@ApiOperation(value = "Category by id")
+	@RequestMapping(value = "/categoryByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getcategoriesById(
+			@ApiParam(value = "\"{\\\"subServiceID\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\"}\"") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
-			// SubService subService = inputMapper.gson().fromJson(request, SubService.class);
+		try {
 			response.setResponse(commonService.getCategories(request).toString());
 		} catch (
 
-		Exception e)
-		{
+		Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
@@ -120,16 +125,13 @@ public String getcategoriesById(@ApiParam(value="\"{\\\"subServiceID\\\":\\\"Str
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/servicetypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request)
-	{
+	@ApiOperation(value = "Service types")
+	@RequestMapping(value = "/servicetypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
-		try
-		{
+		try {
 			response.setResponse(commonService.getActiveServiceTypes(request).toString());
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("", e);
 			response.setError(e);
 		}
@@ -140,10 +142,31 @@ public String getservicetypes(@ApiParam("{\"providerServiceMapID\":\"Integer\"}"
 	 * Designation Service
 	 */
 	private CommonService commonService;
+	private Services services;
 
 	@Autowired
-	public void setCommonService(CommonService commonService)
-	{
+	public void setCommonService(CommonService commonService) {
 		this.commonService = commonService;
 	}
+
+	@Autowired
+	public void setServices(ServicesImpl services) {
+		this.services = services;
+	}
+
+	@CrossOrigin()
+	@ApiOperation(value = "Service list")
+	@RequestMapping(value = "/serviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String serviceList(@RequestBody String request) {
+		OutputResponse response = new OutputResponse();
+		logger.info("serviceList request: " + request);
+		try {
+			response.setResponse(services.servicesList().toString());
+		} catch (Exception e) {
+			logger.error("serviceList failed with error " + e.getMessage(), e);
+			response.setError(e);
+		}
+		logger.info("serviceList response: " + response.toString());
+		return response.toString();
+	}
 }
diff --git a/src/main/java/com/iemr/common/controller/services/ServiceController.java b/src/main/java/com/iemr/common/controller/services/ServiceController.java
deleted file mode 100644
index 505df4e1..00000000
--- a/src/main/java/com/iemr/common/controller/services/ServiceController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iemr.common.controller.services;
-
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.iemr.common.service.services.Services;
-import com.iemr.common.service.services.ServicesImpl;
-import com.iemr.common.utils.response.OutputResponse;
-
-@RequestMapping({ "/service" })
-@RestController
-public class ServiceController
-{
-	final private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-	private Services services;
-
-	@Autowired
-	public void setServices(ServicesImpl services)
-	{
-		this.services = services;
-	}
-
-	@CrossOrigin()
-	@RequestMapping(value = "/serviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String serviceList(@RequestBody String request)
-	{
-		OutputResponse response = new OutputResponse();
-		logger.info("serviceList request: " + request);
-		try
-		{
-			response.setResponse(services.servicesList().toString());
-		} catch (Exception e)
-		{
-			logger.error("serviceList failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("serviceList response: " + response.toString());
-		return response.toString();
-	}
-}
diff --git a/src/main/java/com/iemr/common/controller/sms/SMSController.java b/src/main/java/com/iemr/common/controller/sms/SMSController.java
index 0d4b3ce4..6826cd8a 100644
--- a/src/main/java/com/iemr/common/controller/sms/SMSController.java
+++ b/src/main/java/com/iemr/common/controller/sms/SMSController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.sms;
 
 import java.util.Arrays;
@@ -24,102 +45,93 @@
 import com.iemr.common.utils.mapper.OutputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
 @RestController
 @RequestMapping(value = "/sms")
-public class SMSController
-{
+public class SMSController {
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
 	SMSService smsService;
-	
-	InputMapper inputMapper= new InputMapper();
+
+	InputMapper inputMapper = new InputMapper();
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getSMSTemplates", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getSMSTemplates(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"")@RequestBody SMSRequest request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Get SMS templates")
+	@RequestMapping(value = "/getSMSTemplates", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getSMSTemplates(
+			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\"}\"") @RequestBody SMSRequest request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getSMSTemplates received request");
 		logger.debug("getSMSTemplates received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.getSMSTemplates(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getSMSTemplates failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		logger.debug("getSMSTemplates sending response " + response);
-//		logger.info("getSMSTemplates sending response");
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getFullSMSTemplate", method = { RequestMethod.POST },
-			produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String getFullSMSTemplate(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateID\\\":\\\"Integer\\\"}\"")
-	@RequestBody SMSRequest request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Get full SMS template")
+	@RequestMapping(value = "/getFullSMSTemplate", method = {
+			RequestMethod.POST }, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getFullSMSTemplate(
+			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateID\\\":\\\"Integer\\\"}\"") @RequestBody SMSRequest request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getFullSMSTemplate received request");
 		logger.debug("getFullSMSTemplate received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.getFullSMSTemplate(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getFullSMSTemplate failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		logger.debug("getFullSMSTemplate sending response " + response);
-//		logger.info("getFullSMSTemplate sending response");
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/saveSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String saveSMSTemplate(@ApiParam(value="\"{\\\"createdBy\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\",\\\"smsParameterMaps\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTypeID\\\":\\\"Integer\\\"}\"")
-	@RequestBody CreateSMSRequest request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Save SMS template")
+	@RequestMapping(value = "/saveSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String saveSMSTemplate(
+			@ApiParam(value = "\"{\\\"createdBy\\\":\\\"String\\\",\\\"providerServiceMapID\\\":\\\"String\\\",\\\"smsParameterMaps\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTypeID\\\":\\\"Integer\\\"}\"") @RequestBody CreateSMSRequest request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("saveSMSTemplate received request");
 		logger.debug("saveSMSTemplate received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.saveSMSTemplate(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("saveSMSTemplate failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
 		logger.debug("saveSMSTemplate sending response " + response);
-//		logger.info("saveSMSTemplate sending response");
 		return response.toString();
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/updateSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String updateSMSTemplate(@ApiParam(value="\"{\\\"smsTemplateID\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\","
-			+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsType\\\":{\\\"smsTypeID\\\":\\\"Integer\\\",\\\"smsType\\\":\\\"String\\\","
-			+ "\\\"description\\\":\\\"String\\\",\\\"serviceID\\\":\\\"Integer\\\",\\\"deleted\\\":\\\"Boolean\\\"},"
-			+ "\\\"deleted\\\":\\\"Boolean\\\",\\\"createdBy\\\":\\\"String\\\","
-			+ "\\\"createdDate\\\":\\\"Timestamp\\\",\\\"lastModDate\\\":\\\"Timestamp\\\",\\\"modifiedBy\\\":\\\"String\\\"}\"")
-	@RequestBody UpdateSMSRequest request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Update SMS template")
+	@RequestMapping(value = "/updateSMSTemplate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String updateSMSTemplate(
+			@ApiParam(value = "\"{\\\"smsTemplateID\\\":\\\"String\\\",\\\"smsTemplateName\\\":\\\"String\\\",\\\"smsTemplate\\\":\\\"String\\\","
+					+ "\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsType\\\":{\\\"smsTypeID\\\":\\\"Integer\\\",\\\"smsType\\\":\\\"String\\\","
+					+ "\\\"description\\\":\\\"String\\\",\\\"serviceID\\\":\\\"Integer\\\",\\\"deleted\\\":\\\"Boolean\\\"},"
+					+ "\\\"deleted\\\":\\\"Boolean\\\",\\\"createdBy\\\":\\\"String\\\","
+					+ "\\\"createdDate\\\":\\\"Timestamp\\\",\\\"lastModDate\\\":\\\"Timestamp\\\",\\\"modifiedBy\\\":\\\"String\\\"}\"") @RequestBody UpdateSMSRequest request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("updateSMSTemplate received request");
 		logger.debug("updateSMSTemplate received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.updateSMSTemplate(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("updateSMSTemplate failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -129,19 +141,17 @@ public String updateSMSTemplate(@ApiParam(value="\"{\\\"smsTemplateID\\\":\\\"St
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getSMSTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getSMSTypes(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"}\"")
-	@RequestBody SMSTypeModel request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Get SMS types")
+	@RequestMapping(value = "/getSMSTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getSMSTypes(
+			@ApiParam(value = "\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") @RequestBody SMSTypeModel request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getSMSTypes received request");
 		logger.debug("getSMSTypes received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.getSMSTypes(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getSMSTypes failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -151,19 +161,17 @@ public String getSMSTypes(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"}
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/getSMSParameters", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String getSMSParameters(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer\\\"}\"")
-	@RequestBody SMSParameterModel request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Get SMS parameters")
+	@RequestMapping(value = "/getSMSParameters", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String getSMSParameters(
+			@ApiParam(value = "\"{\\\"serviceID\\\":\\\"Integer\\\"}\"") @RequestBody SMSParameterModel request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("getSMSParameters received request");
 		logger.debug("getSMSParameters received a request " + OutputMapper.gson().toJson(request));
-		try
-		{
+		try {
 			response.setResponse(smsService.getSMSParameters(request));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("getSMSParameters failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
@@ -173,31 +181,29 @@ public String getSMSParameters(@ApiParam(value="\"{\\\"serviceID\\\":\\\"Integer
 	}
 
 	@CrossOrigin()
-	@RequestMapping(value = "/sendSMS", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON,
-			headers = "Authorization")
-	public String sendSMS(@ApiParam(value="\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateTypeID\\\":\\\"Integer\\\","
-			+ "\\\"smsTemplateID\\\":\\\"Integer\\\",\\\"beneficiaryRegID\\\":\\\"Long\\\",\\\"stateID\\\":\\\"Integer\\\","
-			+ "\\\"districtID\\\":\\\"Integer\\\",\\\"blockID\\\":\\\"Integer\\\",\\\"is1097\\\":\\\"Boolean\\\","
-			+ "\\\"userID\\\":\\\"Long\\\",\\\"InstituteID\\\":\\\"Integer\\\",\\\"feedbackID\\\":\\\"Long\\\","
-			+ "\\\"createdBy\\\":\\\"String\\\",\\\"alternateNo\\\":\\\"String\\\",\\\"smsText\\\":\\\"String\\\","
-			+ "\\\"prescribedDrugID\\\":\\\"Long\\\",\\\"bloodReqID\\\":\\\"Long\\\",\\\"directoryServiceID\\\":\\\"Long\\\","
-			+ "\\\"fSComplaintID\\\":\\\"Long\\\",\\\"requestID\\\":\\\"String\\\",\\\"outbreakComplaintID\\\":\\\"Long\\\","
-			+ "\\\"obCallID\\\":\\\"Long\\\",\\\"isBloodBankSMS\\\":\\\"Boolean\\\",\\\"moAdvice\\\":\\\"String\\\","
-			+ "\\\"organDonationID\\\":\\\"Long\\\",\\\"requestedBloodBankID\\\":\\\"Long\\\",\\\"requestedInstitutionID\\\":\\\"Long\\\","
-			+ "\\\"specializationID\\\":\\\"Integer\\\",\\\"smsTypeTM\\\":\\\"String\\\",\\\"tcDate\\\":\\\"String\\\","
-			+ "\\\"tcPreviousDate\\\":\\\"String\\\",\\\"presObj\\\":\\\"String\\\",\\\"diagnosis\\\":\\\"List<Object>\\\",\\\"benHistoryID\\\":\\\"Long\\\",\\\"imrDate\\\":\\\"String\\\","
-			+ "\\\"imrID\\\":\\\"String\\\",\\\"nodalNumber\\\":\\\"String\\\",\\\"informerName\\\":\\\"String\\\"}\"")
-	@RequestBody String request, HttpServletRequest serverRequest)
-	{
+	@ApiOperation(value = "Send SMS")
+	@RequestMapping(value = "/sendSMS", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public String sendSMS(
+			@ApiParam(value = "\"{\\\"providerServiceMapID\\\":\\\"Integer\\\",\\\"smsTemplateTypeID\\\":\\\"Integer\\\","
+					+ "\\\"smsTemplateID\\\":\\\"Integer\\\",\\\"beneficiaryRegID\\\":\\\"Long\\\",\\\"stateID\\\":\\\"Integer\\\","
+					+ "\\\"districtID\\\":\\\"Integer\\\",\\\"blockID\\\":\\\"Integer\\\",\\\"is1097\\\":\\\"Boolean\\\","
+					+ "\\\"userID\\\":\\\"Long\\\",\\\"InstituteID\\\":\\\"Integer\\\",\\\"feedbackID\\\":\\\"Long\\\","
+					+ "\\\"createdBy\\\":\\\"String\\\",\\\"alternateNo\\\":\\\"String\\\",\\\"smsText\\\":\\\"String\\\","
+					+ "\\\"prescribedDrugID\\\":\\\"Long\\\",\\\"bloodReqID\\\":\\\"Long\\\",\\\"directoryServiceID\\\":\\\"Long\\\","
+					+ "\\\"fSComplaintID\\\":\\\"Long\\\",\\\"requestID\\\":\\\"String\\\",\\\"outbreakComplaintID\\\":\\\"Long\\\","
+					+ "\\\"obCallID\\\":\\\"Long\\\",\\\"isBloodBankSMS\\\":\\\"Boolean\\\",\\\"moAdvice\\\":\\\"String\\\","
+					+ "\\\"organDonationID\\\":\\\"Long\\\",\\\"requestedBloodBankID\\\":\\\"Long\\\",\\\"requestedInstitutionID\\\":\\\"Long\\\","
+					+ "\\\"specializationID\\\":\\\"Integer\\\",\\\"smsTypeTM\\\":\\\"String\\\",\\\"tcDate\\\":\\\"String\\\","
+					+ "\\\"tcPreviousDate\\\":\\\"String\\\",\\\"presObj\\\":\\\"String\\\",\\\"diagnosis\\\":\\\"List<Object>\\\",\\\"benHistoryID\\\":\\\"Long\\\",\\\"imrDate\\\":\\\"String\\\","
+					+ "\\\"imrID\\\":\\\"String\\\",\\\"nodalNumber\\\":\\\"String\\\",\\\"informerName\\\":\\\"String\\\"}\"") @RequestBody String request,
+			HttpServletRequest serverRequest) {
 		OutputResponse response = new OutputResponse();
 		logger.info("sendSMS received request");
 		logger.debug("sendSMS received a request " + OutputMapper.gson().toJson(request));
-		SMSRequest[] requests = inputMapper.gson().fromJson(request,SMSRequest[].class);
-		try
-		{
-			response.setResponse(smsService.sendSMS(Arrays.asList(requests) , serverRequest.getHeader("Authorization")));
-		} catch (Exception e)
-		{
+		SMSRequest[] requests = inputMapper.gson().fromJson(request, SMSRequest[].class);
+		try {
+			response.setResponse(smsService.sendSMS(Arrays.asList(requests), serverRequest.getHeader("Authorization")));
+		} catch (Exception e) {
 			logger.error("sendSMS failed with error " + e.getMessage(), e);
 			response.setError(e);
 		}
diff --git a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java
index 158fbe0e..66328800 100644
--- a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java
+++ b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.snomedct;
 
 import org.slf4j.Logger;
@@ -11,7 +32,6 @@
 
 import com.google.gson.Gson;
 import com.iemr.common.data.snomedct.SCTDescription;
-
 import com.iemr.common.service.snomedct.SnomedService;
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
@@ -32,7 +52,7 @@ public void setSnomedService(SnomedService snomedService) {
 	}
 
 	@CrossOrigin
-	@ApiOperation(value = "retrives SnomedCT Record (Entire term case insensitive)", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Retrives snomed CT record", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = "/getSnomedCTRecord", method = RequestMethod.POST, headers = "Authorization")
 	public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) {
 		OutputResponse output = new OutputResponse();
@@ -58,7 +78,7 @@ public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @Requ
 	}
 
 	@CrossOrigin
-	@ApiOperation(value = "retrives SnomedCT Record list (Entire term case insensitive)", consumes = "application/json", produces = "application/json")
+	@ApiOperation(value = "Retrives snomed CT record list", consumes = "application/json", produces = "application/json")
 	@RequestMapping(value = "/getSnomedCTRecordList", method = RequestMethod.POST, headers = "Authorization")
 	public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) {
 		OutputResponse output = new OutputResponse();
@@ -68,7 +88,6 @@ public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @
 
 			logger.info("getSnomedCTRecord request " + sctdescription.toString());
 
-			
 			String sctList = snomedService.findSnomedCTRecordList(sctdescription);
 
 			if (sctList != null)
@@ -85,4 +104,3 @@ public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @
 	}
 
 }
-
diff --git a/src/main/java/com/iemr/common/controller/uptsu/UptsuController.java b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java
similarity index 64%
rename from src/main/java/com/iemr/common/controller/uptsu/UptsuController.java
rename to src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java
index 04d90ef7..d73a34a5 100644
--- a/src/main/java/com/iemr/common/controller/uptsu/UptsuController.java
+++ b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.uptsu;
 
 import javax.ws.rs.core.MediaType;
@@ -16,15 +37,18 @@
 import com.iemr.common.service.uptsu.UptsuService;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RequestMapping({ "/uptsu" })
 @RestController
-public class UptsuController {
+public class UPTechnicalSupportController {
 
 	@Autowired
 	private UptsuService uptsuService;
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@CrossOrigin
+	@ApiOperation(value = "Get facility master")
 	@RequestMapping(value = "/get/facilityMaster/{providerServiceMapID}/{blockName}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getFacility(@PathVariable Integer providerServiceMapID, @PathVariable String blockName) {
 		OutputResponse response = new OutputResponse();
@@ -41,8 +65,10 @@ public String getFacility(@PathVariable Integer providerServiceMapID, @PathVaria
 	}
 
 	@CrossOrigin
+	@ApiOperation(value = "Save appointment details")
 	@RequestMapping(value = "/save/appointment-details", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-	public String saveAppointmentDetails(@RequestBody String request, @RequestHeader(value = "Authorization") String Authorization) {
+	public String saveAppointmentDetails(@RequestBody String request,
+			@RequestHeader(value = "Authorization") String Authorization) {
 		OutputResponse response = new OutputResponse();
 
 		try {
diff --git a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java
index b5ba0129..a1dbc2cf 100644
--- a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java
+++ b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.users;
 
 import org.slf4j.Logger;
@@ -19,6 +40,8 @@
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @PropertySource("classpath:application.properties")
 
 @RestController
@@ -33,6 +56,7 @@ public class EmployeeSignatureController {
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
 	@CrossOrigin()
+	@ApiOperation(value = "Fetch file")
 	@RequestMapping(value = "/{userID}", headers = "Authorization", method = { RequestMethod.GET })
 	public ResponseEntity<byte[]> fetchFile(@PathVariable("userID") Long userID) throws Exception {
 		OutputResponse response = new OutputResponse();
@@ -41,27 +65,20 @@ public ResponseEntity<byte[]> fetchFile(@PathVariable("userID") Long userID) thr
 		try {
 
 			EmployeeSignature userSignID = employeeSignatureServiceImpl.fetchSignature(userID);
-//			logger.debug("response" + Arrays.toString(userSignID.getSignature()));
-//
 			return ResponseEntity.ok().contentType(MediaType.parseMediaType(userSignID.getFileType()))
-					.header(HttpHeaders.CONTENT_DISPOSITION,
-							"inline; filename=\"" + userSignID.getFileName() + "\"")
+					.header(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + userSignID.getFileName() + "\"")
 					.body(userSignID.getSignature());
 
 		} catch (Exception e) {
 			logger.error("File download for userID failed with exception " + e.getMessage(), e);
-//			throw new Exception("Error while downloading file. Please contact administrator..");
-
 		}
 
 		return ResponseEntity.badRequest().body(new byte[] {});
-		/**
-		 * sending the response...
-		 */
 
 	}
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Fetch file from central")
 	@RequestMapping(value = "/getSignClass/{userID}", headers = "Authorization", method = { RequestMethod.GET })
 	public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws Exception {
 		OutputResponse response = new OutputResponse();
@@ -70,24 +87,20 @@ public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws E
 		try {
 
 			EmployeeSignature userSignID = employeeSignatureServiceImpl.fetchSignature(userID);
-//			logger.debug("response" + Arrays.toString(userSignID.getSignature()));
-//
-			if(userSignID != null)			
+			if (userSignID != null)
 				response.setResponse(new Gson().toJson(userSignID));
 			else
-				response.setError(5000,"No record found");
+				response.setError(5000, "No record found");
 
 		} catch (Exception e) {
-			response.setError(5000,e.getMessage());
+			response.setError(5000, e.getMessage());
 			logger.error("File download for userID failed with exception " + e.getMessage(), e);
-//			throw new Exception("Error while downloading file. Please contact administrator..");
-
 		}
 		return response.toString();
 	}
-	
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Download file based on userID")
 	@RequestMapping(value = "/signexist/{userID}", headers = "Authorization", method = { RequestMethod.GET })
 	public String existFile(@PathVariable("userID") Long userID) throws Exception {
 		OutputResponse response = new OutputResponse();
@@ -96,8 +109,6 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception {
 		try {
 
 			Boolean userSignID = employeeSignatureServiceImpl.existSignature(userID);
-//			logger.debug("response" + Arrays.toString(userSignID.getSignature()));
-//
 			response.setResponse(userSignID.toString());
 
 		} catch (Exception e) {
@@ -105,9 +116,6 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception {
 			response.setError(e);
 		}
 
-		/**
-		 * sending the response...
-		 */
 		logger.debug("response" + response);
 		return response.toString();
 	}
diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
index a2869673..373dab1b 100644
--- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
+++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
@@ -1,5 +1,28 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.users;
 
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,6 +38,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -47,7 +71,6 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-// @CrossOrigin()
 @RequestMapping("/user")
 @RestController
 public class IEMRAdminController {
@@ -63,6 +86,7 @@ public void setAesUtil(AESUtil aesUtil) {
 	this.aesUtil = aesUtil;
 	}
 
+
 	@Autowired
 	public void setIemrAdminUserService(IEMRAdminUserService iemrAdminUserService) {
 		this.iemrAdminUserServiceImpl = iemrAdminUserService;
@@ -79,6 +103,7 @@ public void setSessionObject(SessionObject sessionObject) {
 	SecurePassword securePassword;
 
 	@CrossOrigin()
+	@ApiOperation(value = "New user authentication")
 	@RequestMapping(value = "/userAuthenticateNew", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String userAuthenticateNew(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody String jsonRequest) {
@@ -93,6 +118,7 @@ public String userAuthenticateNew(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "User authentication")
 	@RequestMapping(value = "/userAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String userAuthenticate(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel m_User,
@@ -108,18 +134,14 @@ public String userAuthenticate(
 			JSONObject serviceRoleMap = new JSONObject();
 			JSONArray serviceRoleList = new JSONArray();
 			JSONObject previlegeObj = new JSONObject();
-			//condition added to check for concurrent login
-			if(m_User.getUserName() !=null && (m_User.getDoLogout() ==null || m_User.getDoLogout() == false))
-			{
-				String tokenFromRedis=getConcurrentCheckSessionObjectAgainstUser(m_User.getUserName().trim().toLowerCase());
-				if (tokenFromRedis !=null)
-				{
-					//response.setError(5005, "You are already logged in,please confirm to logout from other device and login again");
-					throw new IEMRException("You are already logged in,please confirm to logout from other device and login again");
+			if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) {
+				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
+						m_User.getUserName().trim().toLowerCase());
+				if (tokenFromRedis != null) {
+					throw new IEMRException(
+							"You are already logged in,please confirm to logout from other device and login again");
 				}
-			}
-			else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.getDoLogout() == true)
-			{
+			} else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) {
 				deleteSessionObject(m_User.getUserName().trim().toLowerCase());
 			}
 			if (mUser.size() == 1) {
@@ -150,8 +172,9 @@ else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.get
 		logger.info("userAuthenticate response " + response.toString());
 		return response.toString();
 	}
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Log out user from concurrent session")
 	@RequestMapping(value = "/logOutUserFromConcurrentSession", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String logOutUserFromConcurrentSession(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel m_User,
@@ -159,8 +182,7 @@ public String logOutUserFromConcurrentSession(
 		OutputResponse response = new OutputResponse();
 		logger.info("logOutUserFromConcurrentSession request - " + m_User);
 		try {
-			if(m_User!= null && m_User.getUserName() !=null)
-			{
+			if (m_User != null && m_User.getUserName() != null) {
 				List<User> mUsers = iemrAdminUserServiceImpl.userExitsCheck(m_User.getUserName());
 
 				if (mUsers == null || mUsers.size() <= 0) {
@@ -168,22 +190,19 @@ public String logOutUserFromConcurrentSession(
 				} else if (mUsers.size() > 1)
 					throw new IEMRException("More than 1 user found, please contact administrator");
 				else if (mUsers.size() == 1) {
-				String previousTokenFromRedis = sessionObject
+					String previousTokenFromRedis = sessionObject
 							.getSessionObject((mUsers.get(0).getUserName().toString().trim().toLowerCase()));
-				if (previousTokenFromRedis != null) {
-					deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis);
-					sessionObject.deleteSessionObject(previousTokenFromRedis);
-					response.setResponse("User successfully logged out");
+					if (previousTokenFromRedis != null) {
+						deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis);
+						sessionObject.deleteSessionObject(previousTokenFromRedis);
+						response.setResponse("User successfully logged out");
+					} else
+						throw new IEMRException("Unable to fetch session from redis");
 				}
-				else
-					throw new IEMRException("Unable to fetch session from redis");
-			 }
-			}
-			else
-			{
+			} else {
 				throw new IEMRException("Invalid request object");
 			}
-		
+
 		} catch (Exception e) {
 			logger.error("logOutUserFromConcurrentSession failed with error " + e.getMessage(), e);
 			response.setError(e);
@@ -194,29 +213,24 @@ else if (mUsers.size() == 1) {
 
 	/**
 	 * 
-	 * @param SH20094090,19-04-2022
 	 * function to return session object against userName
 	 */
-	private String getConcurrentCheckSessionObjectAgainstUser(String userName)
-	{
-		String response=null;
-		try
-		{
-			response= sessionObject
-			.getSessionObject(userName);
-		}
-		catch(Exception e)
-		{
+	private String getConcurrentCheckSessionObjectAgainstUser(String userName) {
+		String response = null;
+		try {
+			response = sessionObject.getSessionObject(userName);
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 		}
 		return response;
 	}
+
 	private void createUserMapping(User mUser, JSONObject resMap, JSONObject serviceRoleMultiMap,
 			JSONObject serviceRoleMap, JSONArray serviceRoleList, JSONObject previlegeObj) {
+		System.out.println(mUser);
 		String fName = mUser.getFirstName();
 		String lName = mUser.getLastName();
 		String mName = mUser.getMiddleName();
-//		mName = mName == null ? "" : mName;
 		String uName = (fName == null ? "" : fName) + " " + (mName == null ? "" : mName) + " "
 				+ (lName == null ? "" : lName);
 		resMap.put("userID", mUser.getUserID());
@@ -231,10 +245,6 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service
 		if (mUser.getDesignation() != null) {
 			resMap.put("designation", new JSONObject(mUser.getDesignation().toString()));
 		}
-		// User userData;
-		// for (Iterator localIterator1 = mUser.iterator(); localIterator1.hasNext();)
-		// {
-		// userData = (User) localIterator1.next();
 		for (UserServiceRoleMapping m_UserServiceRoleMapping : mUser.getM_UserServiceRoleMapping()) {
 			serviceRoleMultiMap.put(
 					m_UserServiceRoleMapping.getM_ProviderServiceMapping().getM_ServiceMaster().getServiceName(),
@@ -256,10 +266,12 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service
 				previlegeObj.getJSONObject(serv).put("agentID", m_UserServiceRoleMapping.getAgentID());
 				previlegeObj.getJSONObject(serv).put("agentPassword", m_UserServiceRoleMapping.getAgentPassword());
 			}
-			JSONArray roles = previlegeObj.getJSONObject(serv).getJSONArray("roles");
-			roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString()));
+            JSONArray roles = previlegeObj.getJSONObject(serv).getJSONArray("roles");
+//            roles.put(new JSONObject(m_UserServiceRoleMapping.getM_Role().toString()));
+            JSONObject roleObject = new JSONObject(m_UserServiceRoleMapping.getM_Role().toString());
+            roleObject.put("isSanjeevani", m_UserServiceRoleMapping.getIsSanjeevani());
+            roles.put(roleObject);
 		}
-		// }
 		Iterator<String> keySet = serviceRoleMultiMap.keys();
 		while (keySet.hasNext()) {
 			String s = keySet.next();
@@ -281,7 +293,7 @@ public String superUserAuthenticate(
 		OutputResponse response = new OutputResponse();
 		logger.info("userAuthenticate request ");
 		try {
-			
+
 			if (!m_User.getUserName().equalsIgnoreCase("SuperAdmin")) {
 				throw new IEMRException("Please log with admin credentials");
 			}
@@ -289,27 +301,17 @@ public String superUserAuthenticate(
 			User mUser = iemrAdminUserServiceImpl.superUserAuthenticate(m_User.getUserName(), decryptPassword);
 			JSONObject resMap = new JSONObject();
 			JSONObject previlegeObj = new JSONObject();
-			//condition added to check for concurrent login
-			if(m_User.getUserName() !=null && (m_User.getDoLogout() ==null || m_User.getDoLogout() == false))
-			{
-				String tokenFromRedis=getConcurrentCheckSessionObjectAgainstUser(m_User.getUserName().trim().toLowerCase());
-				if (tokenFromRedis !=null)
-				{
-					//response.setError(5005, "You are already logged in,please confirm to logout from other device and login again");
-					throw new IEMRException("You are already logged in,please confirm to logout from other device and login again");
+			if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) {
+				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
+						m_User.getUserName().trim().toLowerCase());
+				if (tokenFromRedis != null) {
+					throw new IEMRException(
+							"You are already logged in,please confirm to logout from other device and login again");
 				}
-			}
-			else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.getDoLogout() == true)
-			{
+			} else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) {
 				deleteSessionObject(m_User.getUserName().trim().toLowerCase());
 			}
 			if (mUser != null) {
-//				String fName = mUser.getFirstName();
-//				String lName = mUser.getLastName();
-//				String mName = mUser.getMiddleName();
-//				mName = mName == null ? "" : mName;
-//				String uName = (fName == null ? "" : fName) + " " + (mName == null ? "" : mName) + " "
-//						+ (lName == null ? "" : lName);
 				resMap.put("userID", mUser.getUserID());
 				resMap.put("isAuthenticated", /* Boolean.valueOf(true) */true);
 				resMap.put("userName", mUser.getUserName());
@@ -340,36 +342,36 @@ else if(m_User.getUserName() !=null && m_User.getDoLogout() !=null && m_User.get
 		return response.toString();
 	}
 
-	@CrossOrigin()
-	@RequestMapping(value = "/userAuthenticateV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
-	public String userAuthenticateV1(
-			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel loginRequest,
-			HttpServletRequest request) {
-		OutputResponse response = new OutputResponse();
-		logger.info("userAuthenticate request ");
-		try {
-
-			String remoteAddress = request.getHeader("X-FORWARDED-FOR");
-			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
-				remoteAddress = request.getRemoteAddr();
-			}
-			LoginResponseModel resp = iemrAdminUserServiceImpl.userAuthenticateV1(loginRequest, remoteAddress,
-					request.getRemoteHost());
-			// logger.info("Login response is before redis " +
-			// OutputMapper.gsonWithoutExposeRestriction().toJson(resp));
-			JSONObject responseObj = new JSONObject(OutputMapper.gsonWithoutExposeRestriction().toJson(resp));
-			responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress,
-					request.getRemoteHost());
-			response.setResponse(responseObj.toString());
-		} catch (Exception e) {
-			logger.error("userAuthenticate failed with error " + e.getMessage(), e);
-			response.setError(e);
-		}
-		logger.info("userAuthenticate response " + response.toString());
-		return response.toString();
-	}
+//	@CrossOrigin()
+//	@ApiOperation(value = "User authentication V1")
+//	@RequestMapping(value = "/userAuthenticateV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
+//	public String userAuthenticateV1(
+//			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel loginRequest,
+//			HttpServletRequest request) {
+//		OutputResponse response = new OutputResponse();
+//		logger.info("userAuthenticate request ");
+//		try {
+//
+//			String remoteAddress = request.getHeader("X-FORWARDED-FOR");
+//			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
+//				remoteAddress = request.getRemoteAddr();
+//			}
+//			LoginResponseModel resp = iemrAdminUserServiceImpl.userAuthenticateV1(loginRequest, remoteAddress,
+//					request.getRemoteHost());
+//			JSONObject responseObj = new JSONObject(OutputMapper.gsonWithoutExposeRestriction().toJson(resp));
+//			responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress,
+//					request.getRemoteHost());
+//			response.setResponse(responseObj.toString());
+//		} catch (Exception e) {
+//			logger.error("userAuthenticate failed with error " + e.getMessage(), e);
+//			response.setError(e);
+//		}
+//		logger.info("userAuthenticate response " + response.toString());
+//		return response.toString();
+//	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get login response")
 	@RequestMapping(value = "/getLoginResponse", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getLoginResponse(HttpServletRequest request) {
 		OutputResponse response = new OutputResponse();
@@ -385,6 +387,7 @@ public String getLoginResponse(HttpServletRequest request) {
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.POST
 					 */)
+	@ApiOperation(value = "Forget password")
 	@RequestMapping(value = "/forgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String forgetPassword(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody ChangePasswordModel m_User) {
@@ -411,8 +414,6 @@ else if (mUsers.size() == 1) {
 
 						quesAnsList.add(quesAnsMap);
 					}
-					// unnecessary code, remove in next build, return list of questionaries,
-					// quesAnsList
 					resMap.put("SecurityQuesAns", quesAnsList);
 				}
 				response.setResponse(OutputMapper.gsonWithoutExposeRestriction().toJson(resMap));
@@ -426,6 +427,7 @@ else if (mUsers.size() == 1) {
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Set forget password")
 	@RequestMapping(value = "/setForgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String setPassword(
 			@ApiParam(value = "\"{\"userName\":\"String\",\"password\":\"String\",\"transactionId\":\"String\"}\"") @RequestBody ChangePasswordModel m_user) {
@@ -442,7 +444,7 @@ public String setPassword(
 			String setStatus;
 			String decryptPassword = aesUtil.decrypt("Piramal12Piramal", m_user.getPassword());
 			noOfRowModified = iemrAdminUserServiceImpl.setForgetPassword(mUser, decryptPassword,
-			m_user.getTransactionId(), m_user.getIsAdmin());
+					m_user.getTransactionId(), m_user.getIsAdmin());
 			if (noOfRowModified > 0) {
 				setStatus = "Password Changed";
 			} else {
@@ -464,6 +466,7 @@ public String setPassword(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Change password")
 	@RequestMapping(value = "/changePassword", method = RequestMethod.POST, produces = "application/json")
 	public String changePassword(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\",\\\"transactionId\\\":\\\"String\\\"}\"") @RequestBody ChangePasswordModel changePassword) {
@@ -477,15 +480,24 @@ public String changePassword(
 				throw new IEMRException("Change password failed with error as user is not available");
 			}
 			try {
-				if (!securePassword.validatePassword(changePassword.getPassword(), mUsers.get(0).getPassword())) {
-					throw new IEMRException("Change password failed with error as old password is incorrect");
+				int validatePassword;
+				validatePassword = securePassword.validatePassword(changePassword.getPassword(),
+						mUsers.get(0).getPassword());
+				if (validatePassword == 1) {
+					User mUser = mUsers.get(0);
+					noOfRowUpdated = iemrAdminUserServiceImpl.setForgetPassword(mUser, changePassword.getNewPassword(),
+							changePassword.getTransactionId(), changePassword.getIsAdmin());
+
+				} else if (validatePassword == 2) {
+					User mUser = mUsers.get(0);
+					noOfRowUpdated = iemrAdminUserServiceImpl.setForgetPassword(mUser, changePassword.getNewPassword(),
+							changePassword.getTransactionId(), changePassword.getIsAdmin());
+
 				}
 			} catch (Exception e) {
-				throw new IEMRException("Change password failed with error as old password is incorrect");
+				throw new IEMRException(e.getMessage());
 			}
-			User mUser = mUsers.get(0);
-			noOfRowUpdated = iemrAdminUserServiceImpl.setForgetPassword(mUser, changePassword.getNewPassword(),
-					changePassword.getTransactionId(),changePassword.getIsAdmin());
+
 			if (noOfRowUpdated > 0) {
 				changeReqResult = "Password SuccessFully Change";
 			} else {
@@ -499,9 +511,9 @@ public String changePassword(
 		logger.info("changePassword response " + response.toString());
 		return response.toString();
 	}
-	
 
 	@CrossOrigin()
+	@ApiOperation(value = "Save user security questions & answers")
 	@RequestMapping(value = "/saveUserSecurityQuesAns", method = RequestMethod.POST, produces = "application/json")
 	public String saveUserSecurityQuesAns(
 			@ApiParam(value = "\"[{\\\"userID\\\":\\\"Integer\\\",\\\"questionID\\\":\\\"Integer\\\",\\\"answers\\\":\\\"String\\\","
@@ -527,6 +539,7 @@ public String saveUserSecurityQuesAns(
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.GET
 					 */)
+	@ApiOperation(value = "Get security quetions")
 	@RequestMapping(value = "/getsecurityquetions", method = RequestMethod.GET)
 	public String getSecurityts() {
 		OutputResponse response = new OutputResponse();
@@ -546,6 +559,7 @@ public String getSecurityts() {
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.POST
 					 */)
+	@ApiOperation(value = "Get roles by provider id")
 	@RequestMapping(value = "/getRolesByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getRolesByProviderID(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\"}") @RequestBody String request) {
@@ -565,6 +579,7 @@ public String getRolesByProviderID(
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.POST
 					 */)
+	@ApiOperation(value = "Get role screen mapping by provider id")
 	@RequestMapping(value = "/getRoleScreenMappingByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getRoleScreenMappingByProviderID(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\"}") @RequestBody String request) {
@@ -592,6 +607,7 @@ public String getRoleScreenMappingByProviderID(
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.POST
 					 */)
+	@ApiOperation(value = "Get users by provider id")
 	@RequestMapping(value = "/getUsersByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getUsersByProviderID(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", "
@@ -613,6 +629,7 @@ public String getUsersByProviderID(
 					 * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods =
 					 * RequestMethod.POST
 					 */)
+	@ApiOperation(value = "Get user service point van details")
 	@RequestMapping(value = "/getUserServicePointVanDetails", method = RequestMethod.POST, produces = "application/json", headers = "Authorization")
 	public String getUserServicePointVanDetails(
 			@ApiParam(value = "\"{\\\"userID\\\":\\\"Integer\\\",\"providerServiceMapID\":\"Integer\"}\"") @RequestBody String comingRequest) {
@@ -624,7 +641,6 @@ public String getUserServicePointVanDetails(
 			String responseData = iemrAdminUserServiceImpl.getUserServicePointVanDetails(obj.getInt("userID"));
 			response.setResponse(responseData);
 		} catch (Exception e) {
-			// e.printStackTrace();
 			response.setError(e);
 			logger.error("get User SP and van details failed with " + e.getMessage(), e);
 
@@ -634,6 +650,7 @@ public String getUserServicePointVanDetails(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get service point villages")
 	@RequestMapping(value = "/getServicepointVillages", method = RequestMethod.POST, produces = "application/json", headers = "Authorization")
 	public String getServicepointVillages(
 			@ApiParam(value = "\"{\\\"servicePointID\\\":\\\"Integer\\\"}\"") @RequestBody String comingRequest) {
@@ -645,7 +662,6 @@ public String getServicepointVillages(
 			String responseData = iemrAdminUserServiceImpl.getServicepointVillages(obj.getInt("servicePointID"));
 			response.setResponse(responseData);
 		} catch (Exception e) {
-			// e.printStackTrace();
 			response.setError(e);
 			logger.error("get villages with servicepoint failed with " + e.getMessage(), e);
 
@@ -655,6 +671,7 @@ public String getServicepointVillages(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get locations by provider id")
 	@RequestMapping(value = "/getLocationsByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getLocationsByProviderID(
 			@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", "
@@ -672,6 +689,7 @@ public String getLocationsByProviderID(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "User log out")
 	@RequestMapping(value = "/userLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String userLogout(HttpServletRequest request) {
 		OutputResponse response = new OutputResponse();
@@ -691,41 +709,35 @@ public String userLogout(HttpServletRequest request) {
 	 * @param request
 	 * @return
 	 */
-	private void deleteSessionObjectByGettingSessionDetails(String key)
-	{
-		String sessionDetails=null;
+	private void deleteSessionObjectByGettingSessionDetails(String key) {
+		String sessionDetails = null;
 		try {
-			logger.info("inside delete child:"+key);
-			sessionDetails=sessionObject.getSessionObject(key);
-			logger.info("isessionDetails:"+sessionDetails);
+			logger.info("inside delete child:" + key);
+			sessionDetails = sessionObject.getSessionObject(key);
+			logger.info("isessionDetails:" + sessionDetails);
 			JsonObject jsnOBJ = new JsonObject();
 			JsonParser jsnParser = new JsonParser();
 			JsonElement jsnElmnt = jsnParser.parse(sessionDetails);
 			jsnOBJ = jsnElmnt.getAsJsonObject();
-			if(jsnOBJ.has("userName") && jsnOBJ.get("userName") !=null)
-			{
-				logger.info("deleting key:"+jsnOBJ.get("userName").getAsString().trim().toLowerCase());
+			if (jsnOBJ.has("userName") && jsnOBJ.get("userName") != null) {
+				logger.info("deleting key:" + jsnOBJ.get("userName").getAsString().trim().toLowerCase());
 				sessionObject.deleteSessionObject(jsnOBJ.get("userName").getAsString().trim().toLowerCase());
 			}
-		}
-		catch(Exception e)
-		{
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 		}
 	}
-	private void deleteSessionObject(String key)
-	{
-		try
-		{
+
+	private void deleteSessionObject(String key) {
+		try {
 			sessionObject.deleteSessionObject(key);
-		}
-		catch(Exception e)
-		{
+		} catch (Exception e) {
 			logger.error(e.getMessage());
 		}
 	}
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Force log out")
 	@RequestMapping(value = "/forceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String forceLogout(@ApiParam(value = "{\"userName\":\"String user name to force logout\", "
 			+ "\"providerServiceMapID\":\"Integer service provider ID\"}") @RequestBody ForceLogoutRequestModel request) {
@@ -740,6 +752,7 @@ public String forceLogout(@ApiParam(value = "{\"userName\":\"String user name to
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "User force log out")
 	@RequestMapping(value = "/userForceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String userForceLogout(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\"}\"") @RequestBody ForceLogoutRequestModel request) {
@@ -754,6 +767,7 @@ public String userForceLogout(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get agent by role id")
 	@RequestMapping(value = "/getAgentByRoleID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getAgentByRoleID(@ApiParam(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", "
 			+ "\"RoleID\":\"Optional: Integer - role ID to be filtered\"}") @RequestBody String request) {
@@ -770,6 +784,7 @@ public String getAgentByRoleID(@ApiParam(value = "{\"providerServiceMapID\":\"In
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "User authenticate by encryption")
 	@RequestMapping(value = "/userAuthenticateByEncryption", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
 	public String userAuthenticateByEncryption(
 			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody String req,
@@ -814,6 +829,7 @@ public String userAuthenticateByEncryption(
 	}
 
 	@CrossOrigin()
+	@ApiOperation(value = "Get role wrap up time")
 	@RequestMapping(value = "/role/{roleID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) {
 
@@ -827,13 +843,10 @@ public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) {
 		} catch (Exception e) {
 			response.setError(e);
 		}
-//		logger.info("response is " + response.toStringWithSerialization());
 		return response.toString();
-//		return test.toString();
 	}
 
 	/**
-	 * @author DE40034072 Date 23-03-2022
 	 * @param request
 	 * @return transaction Id for password change
 	 */
@@ -863,4 +876,60 @@ public String validateSecurityQuestionAndAnswer(
 		return response.toString();
 	}
 
+	@CrossOrigin()
+	@ApiOperation(value = "User authentication")
+	@RequestMapping(value = "/bhavya/userAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON)
+	public String userAuthenticateBhavya(
+			@ApiParam(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"password\\\":\\\"String\\\"}\"") @RequestBody LoginRequestModel m_User,
+			HttpServletRequest request) {
+		OutputResponse response = new OutputResponse();
+		logger.info("userAuthenticate request - " + m_User + " " + m_User.getUserName() + " " + m_User.getPassword());
+		try {
+			//String decryptPassword = aesUtil.decrypt("Piramal12Piramal", m_User.getPassword());
+			//logger.info("decryptPassword : " + m_User.getPassword());
+			List<User> mUser = iemrAdminUserServiceImpl.userAuthenticate(m_User.getUserName(), m_User.getPassword());
+			JSONObject resMap = new JSONObject();
+			JSONObject serviceRoleMultiMap = new JSONObject();
+			JSONObject serviceRoleMap = new JSONObject();
+			JSONArray serviceRoleList = new JSONArray();
+			JSONObject previlegeObj = new JSONObject();
+			if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)) {
+				String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
+						m_User.getUserName().trim().toLowerCase());
+				if (tokenFromRedis != null) {
+					throw new IEMRException(
+							"You are already logged in,please confirm to logout from other device and login again");
+				}
+			} else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) {
+				deleteSessionObject(m_User.getUserName().trim().toLowerCase());
+			}
+			if (mUser.size() == 1) {
+				createUserMapping(mUser.get(0), resMap, serviceRoleMultiMap, serviceRoleMap, serviceRoleList,
+						previlegeObj);
+			} else {
+				resMap.put("isAuthenticated", /* Boolean.valueOf(false) */false);
+			}
+			JSONObject responseObj = new JSONObject(resMap.toString());
+			JSONArray previlageObjs = new JSONArray();
+			Iterator<?> services = previlegeObj.keys();
+			while (services.hasNext()) {
+				String service = (String) services.next();
+				previlageObjs.put(previlegeObj.getJSONObject(service));
+			}
+			responseObj.put("previlegeObj", previlageObjs);
+			String remoteAddress = request.getHeader("X-FORWARDED-FOR");
+			if (remoteAddress == null || remoteAddress.trim().length() == 0) {
+				remoteAddress = request.getRemoteAddr();
+			}
+			responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress,
+					request.getRemoteHost());
+			response.setResponse(responseObj.toString());
+		} catch (Exception e) {
+			logger.error("userAuthenticate failed with error " + e.getMessage(), e);
+			response.setError(e);
+		}
+		logger.info("userAuthenticate response " + response.toString());
+		return response.toString();
+	}
+
 }
diff --git a/src/main/java/com/iemr/common/controller/version/VersionController.java b/src/main/java/com/iemr/common/controller/version/VersionController.java
index df90faa5..64d8e43b 100644
--- a/src/main/java/com/iemr/common/controller/version/VersionController.java
+++ b/src/main/java/com/iemr/common/controller/version/VersionController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.version;
 
 import java.io.BufferedReader;
@@ -14,40 +35,44 @@
 
 import com.iemr.common.utils.response.OutputResponse;
 
+import io.swagger.annotations.ApiOperation;
+
 @RestController
 public class VersionController {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
-	
+
 	@CrossOrigin()
+	@ApiOperation(value = "Get version")
 	@RequestMapping(value = "/version", method = { RequestMethod.GET })
 	public String versionInformation() {
 		OutputResponse output = new OutputResponse();
 		try {
 			logger.info("version Controller Start");
 			output.setResponse(readGitProperties());
-	    } catch (Exception e) {
-	    	output.setError(e);
-	    }
-		
+		} catch (Exception e) {
+			output.setError(e);
+		}
+
 		logger.info("version Controller End");
 		return output.toString();
 	}
+
 	private String readGitProperties() throws Exception {
-	    ClassLoader classLoader = getClass().getClassLoader();
-	    InputStream inputStream = classLoader.getResourceAsStream("git.properties");
-	    
-	        return readFromInputStream(inputStream);
+		ClassLoader classLoader = getClass().getClassLoader();
+		InputStream inputStream = classLoader.getResourceAsStream("git.properties");
+
+		return readFromInputStream(inputStream);
 	}
-	private String readFromInputStream(InputStream inputStream)
-	throws IOException {
-	    StringBuilder resultStringBuilder = new StringBuilder();
-	    try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
-	        String line;
-	        while ((line = br.readLine()) != null) {
-	            resultStringBuilder.append(line).append("\n");
-	        }
-	    }
-	    return resultStringBuilder.toString();
+
+	private String readFromInputStream(InputStream inputStream) throws IOException {
+		StringBuilder resultStringBuilder = new StringBuilder();
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
+			String line;
+			while ((line = br.readLine()) != null) {
+				resultStringBuilder.append(line).append("\n");
+			}
+		}
+		return resultStringBuilder.toString();
 	}
 }
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidDoseType.java b/src/main/java/com/iemr/common/covidVaccination/CovidDoseType.java
index 565397bf..11614f48 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidDoseType.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidDoseType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidDoseTypeRepo.java b/src/main/java/com/iemr/common/covidVaccination/CovidDoseTypeRepo.java
index 85a52ad8..bf6e7882 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidDoseTypeRepo.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidDoseTypeRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationController.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationController.java
index 70293bfc..4f2f3860 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationController.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import javax.ws.rs.core.MediaType;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationRepo.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationRepo.java
index 3db4e728..c4cc65c2 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationRepo.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationService.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationService.java
index 7fa84a94..587af08b 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationService.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationServiceImpl.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationServiceImpl.java
index 2a440828..eb74b0ee 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationServiceImpl.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationStatus.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationStatus.java
index 49351148..bc93b905 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationStatus.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccinationStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccineType.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccineType.java
index 14509423..bdd00b20 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccineType.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccineType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/covidVaccination/CovidVaccineTypeRepo.java b/src/main/java/com/iemr/common/covidVaccination/CovidVaccineTypeRepo.java
index f2ad6f8d..3f96747f 100644
--- a/src/main/java/com/iemr/common/covidVaccination/CovidVaccineTypeRepo.java
+++ b/src/main/java/com/iemr/common/covidVaccination/CovidVaccineTypeRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.covidVaccination;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BenDemographics.java b/src/main/java/com/iemr/common/data/beneficiary/BenDemographics.java
index 4df951a9..96d9abc2 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BenDemographics.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BenDemographics.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import javax.persistence.FetchType;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BenMedHistory.java b/src/main/java/com/iemr/common/data/beneficiary/BenMedHistory.java
index e21c4521..4a65e967 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BenMedHistory.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BenMedHistory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BenOutboundCallAllocation.java b/src/main/java/com/iemr/common/data/beneficiary/BenOutboundCallAllocation.java
index 90ab5191..eafdb6de 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BenOutboundCallAllocation.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BenOutboundCallAllocation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BenPhoneMap.java b/src/main/java/com/iemr/common/data/beneficiary/BenPhoneMap.java
index 12d8a904..7c7fa734 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BenPhoneMap.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BenPhoneMap.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BenRelationshipType.java b/src/main/java/com/iemr/common/data/beneficiary/BenRelationshipType.java
index 73c54797..d1a41ab1 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BenRelationshipType.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BenRelationshipType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/Beneficiary.java b/src/main/java/com/iemr/common/data/beneficiary/Beneficiary.java
index eb284505..c8c1bf66 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/Beneficiary.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/Beneficiary.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryEducation.java b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryEducation.java
index c18a0ff8..81400dbd 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryEducation.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryEducation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.util.Set;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryIncomeStatus.java b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryIncomeStatus.java
index 902ce677..86377250 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryIncomeStatus.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryIncomeStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryOccupation.java b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryOccupation.java
index 02f06b42..0d152e51 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryOccupation.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryOccupation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.util.Set;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryRegistrationData.java b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryRegistrationData.java
index 11d5780b..3f3c297a 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryRegistrationData.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryRegistrationData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryType.java b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryType.java
index f5209ee9..0d2e2ade 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryType.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/BeneficiaryType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/GovtIdentityType.java b/src/main/java/com/iemr/common/data/beneficiary/GovtIdentityType.java
index 14d47e60..a52cb866 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/GovtIdentityType.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/GovtIdentityType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/PhoneType.java b/src/main/java/com/iemr/common/data/beneficiary/PhoneType.java
index 167c79ab..573f9c9e 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/PhoneType.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/PhoneType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/Promoservice.java b/src/main/java/com/iemr/common/data/beneficiary/Promoservice.java
index 2a72ea92..c2cf619c 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/Promoservice.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/Promoservice.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/beneficiary/SexualOrientation.java b/src/main/java/com/iemr/common/data/beneficiary/SexualOrientation.java
index 390478cc..2fdd2f57 100644
--- a/src/main/java/com/iemr/common/data/beneficiary/SexualOrientation.java
+++ b/src/main/java/com/iemr/common/data/beneficiary/SexualOrientation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/brd/BRDIntegrationData.java b/src/main/java/com/iemr/common/data/brd/BRDIntegrationData.java
index 5ff74af3..af8b58e8 100644
--- a/src/main/java/com/iemr/common/data/brd/BRDIntegrationData.java
+++ b/src/main/java/com/iemr/common/data/brd/BRDIntegrationData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.brd;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/data/callhandling/BeneficiaryCall.java b/src/main/java/com/iemr/common/data/callhandling/BeneficiaryCall.java
index b8ebe6c8..a66d9714 100644
--- a/src/main/java/com/iemr/common/data/callhandling/BeneficiaryCall.java
+++ b/src/main/java/com/iemr/common/data/callhandling/BeneficiaryCall.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.callhandling;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/callhandling/CallType.java b/src/main/java/com/iemr/common/data/callhandling/CallType.java
index 03422721..93bd3dc2 100644
--- a/src/main/java/com/iemr/common/data/callhandling/CallType.java
+++ b/src/main/java/com/iemr/common/data/callhandling/CallType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.callhandling;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/callhandling/OutboundCallRequest.java b/src/main/java/com/iemr/common/data/callhandling/OutboundCallRequest.java
index a9e89d8c..f1fbc7af 100644
--- a/src/main/java/com/iemr/common/data/callhandling/OutboundCallRequest.java
+++ b/src/main/java/com/iemr/common/data/callhandling/OutboundCallRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.callhandling;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/callhandling/PhoneBlock.java b/src/main/java/com/iemr/common/data/callhandling/PhoneBlock.java
index 9e77f996..e6b21aa3 100644
--- a/src/main/java/com/iemr/common/data/callhandling/PhoneBlock.java
+++ b/src/main/java/com/iemr/common/data/callhandling/PhoneBlock.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.callhandling;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/carestream/CreateOrderData.java b/src/main/java/com/iemr/common/data/carestream/CreateOrderData.java
index a064620a..5a0dbd57 100644
--- a/src/main/java/com/iemr/common/data/carestream/CreateOrderData.java
+++ b/src/main/java/com/iemr/common/data/carestream/CreateOrderData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.carestream;
 
 public class CreateOrderData {
diff --git a/src/main/java/com/iemr/common/data/carestream/package-info.java b/src/main/java/com/iemr/common/data/carestream/package-info.java
index a0acaa40..46712c3e 100644
--- a/src/main/java/com/iemr/common/data/carestream/package-info.java
+++ b/src/main/java/com/iemr/common/data/carestream/package-info.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 /**
  * 
  */
diff --git a/src/main/java/com/iemr/common/data/category/CategoryDetails.java b/src/main/java/com/iemr/common/data/category/CategoryDetails.java
index 3c7bbf9e..1e6ca5de 100644
--- a/src/main/java/com/iemr/common/data/category/CategoryDetails.java
+++ b/src/main/java/com/iemr/common/data/category/CategoryDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.category;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/category/SubCategoryDetails.java b/src/main/java/com/iemr/common/data/category/SubCategoryDetails.java
index b9d1ecda..8596513d 100644
--- a/src/main/java/com/iemr/common/data/category/SubCategoryDetails.java
+++ b/src/main/java/com/iemr/common/data/category/SubCategoryDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.category;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/cti/AgentCallStats.java b/src/main/java/com/iemr/common/data/cti/AgentCallStats.java
index c1fef0ba..48e890a8 100644
--- a/src/main/java/com/iemr/common/data/cti/AgentCallStats.java
+++ b/src/main/java/com/iemr/common/data/cti/AgentCallStats.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/AgentLoginKey.java b/src/main/java/com/iemr/common/data/cti/AgentLoginKey.java
index f718705f..d68f9ea5 100644
--- a/src/main/java/com/iemr/common/data/cti/AgentLoginKey.java
+++ b/src/main/java/com/iemr/common/data/cti/AgentLoginKey.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/AgentSkills.java b/src/main/java/com/iemr/common/data/cti/AgentSkills.java
index a9081741..09c77753 100644
--- a/src/main/java/com/iemr/common/data/cti/AgentSkills.java
+++ b/src/main/java/com/iemr/common/data/cti/AgentSkills.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/iemr/common/data/cti/AgentState.java b/src/main/java/com/iemr/common/data/cti/AgentState.java
index 2ffbb9b7..7831763b 100644
--- a/src/main/java/com/iemr/common/data/cti/AgentState.java
+++ b/src/main/java/com/iemr/common/data/cti/AgentState.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/data/cti/AutoPreviewDial.java b/src/main/java/com/iemr/common/data/cti/AutoPreviewDial.java
index 28a4661d..b5b4b6ee 100644
--- a/src/main/java/com/iemr/common/data/cti/AutoPreviewDial.java
+++ b/src/main/java/com/iemr/common/data/cti/AutoPreviewDial.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/iemr/common/data/cti/BlockUnblockNumber.java b/src/main/java/com/iemr/common/data/cti/BlockUnblockNumber.java
index ab5e81db..5dae3064 100644
--- a/src/main/java/com/iemr/common/data/cti/BlockUnblockNumber.java
+++ b/src/main/java/com/iemr/common/data/cti/BlockUnblockNumber.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/CTICampaigns.java b/src/main/java/com/iemr/common/data/cti/CTICampaigns.java
index af7712ad..d0080a0d 100644
--- a/src/main/java/com/iemr/common/data/cti/CTICampaigns.java
+++ b/src/main/java/com/iemr/common/data/cti/CTICampaigns.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/data/cti/CTIResponse.java b/src/main/java/com/iemr/common/data/cti/CTIResponse.java
index 01cc5853..814312fa 100644
--- a/src/main/java/com/iemr/common/data/cti/CTIResponse.java
+++ b/src/main/java/com/iemr/common/data/cti/CTIResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/iemr/common/data/cti/CTIResponseTemp.java b/src/main/java/com/iemr/common/data/cti/CTIResponseTemp.java
index fbd130ad..5296da0f 100644
--- a/src/main/java/com/iemr/common/data/cti/CTIResponseTemp.java
+++ b/src/main/java/com/iemr/common/data/cti/CTIResponseTemp.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.JsonArray;
diff --git a/src/main/java/com/iemr/common/data/cti/CTIUser.java b/src/main/java/com/iemr/common/data/cti/CTIUser.java
index c4045104..9abf4809 100644
--- a/src/main/java/com/iemr/common/data/cti/CTIUser.java
+++ b/src/main/java/com/iemr/common/data/cti/CTIUser.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/CTIVoiceFile.java b/src/main/java/com/iemr/common/data/cti/CTIVoiceFile.java
index 950e6984..2c9a1d71 100644
--- a/src/main/java/com/iemr/common/data/cti/CTIVoiceFile.java
+++ b/src/main/java/com/iemr/common/data/cti/CTIVoiceFile.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/data/cti/CallBeneficiary.java b/src/main/java/com/iemr/common/data/cti/CallBeneficiary.java
index 129935d2..4bcac64e 100644
--- a/src/main/java/com/iemr/common/data/cti/CallBeneficiary.java
+++ b/src/main/java/com/iemr/common/data/cti/CallBeneficiary.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/data/cti/CallDisposition.java b/src/main/java/com/iemr/common/data/cti/CallDisposition.java
index 7ebf007e..e6c94b4c 100644
--- a/src/main/java/com/iemr/common/data/cti/CallDisposition.java
+++ b/src/main/java/com/iemr/common/data/cti/CallDisposition.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/data/cti/CampaignNames.java b/src/main/java/com/iemr/common/data/cti/CampaignNames.java
index 9c41a1dd..e951be50 100644
--- a/src/main/java/com/iemr/common/data/cti/CampaignNames.java
+++ b/src/main/java/com/iemr/common/data/cti/CampaignNames.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/CampaignRole.java b/src/main/java/com/iemr/common/data/cti/CampaignRole.java
index 73eddf2c..25db3f68 100644
--- a/src/main/java/com/iemr/common/data/cti/CampaignRole.java
+++ b/src/main/java/com/iemr/common/data/cti/CampaignRole.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/CampaignSkills.java b/src/main/java/com/iemr/common/data/cti/CampaignSkills.java
index 29630e94..8c84e2f7 100644
--- a/src/main/java/com/iemr/common/data/cti/CampaignSkills.java
+++ b/src/main/java/com/iemr/common/data/cti/CampaignSkills.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/cti/CustomerLanguage.java b/src/main/java/com/iemr/common/data/cti/CustomerLanguage.java
index 8fc23c65..3e933ffe 100644
--- a/src/main/java/com/iemr/common/data/cti/CustomerLanguage.java
+++ b/src/main/java/com/iemr/common/data/cti/CustomerLanguage.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/data/cti/TransferCall.java b/src/main/java/com/iemr/common/data/cti/TransferCall.java
index 4dcd9ae9..40933e19 100644
--- a/src/main/java/com/iemr/common/data/cti/TransferCall.java
+++ b/src/main/java/com/iemr/common/data/cti/TransferCall.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.cti;
 
 import javax.persistence.FetchType;
diff --git a/src/main/java/com/iemr/common/data/directory/Directory.java b/src/main/java/com/iemr/common/data/directory/Directory.java
index 82e2882d..0c9dc1eb 100644
--- a/src/main/java/com/iemr/common/data/directory/Directory.java
+++ b/src/main/java/com/iemr/common/data/directory/Directory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.directory;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/directory/InstituteDirectoryMapping.java b/src/main/java/com/iemr/common/data/directory/InstituteDirectoryMapping.java
index e4918ac8..52a39a6b 100644
--- a/src/main/java/com/iemr/common/data/directory/InstituteDirectoryMapping.java
+++ b/src/main/java/com/iemr/common/data/directory/InstituteDirectoryMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.directory;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/directory/SubDirectory.java b/src/main/java/com/iemr/common/data/directory/SubDirectory.java
index 1a2c4bca..122564b9 100644
--- a/src/main/java/com/iemr/common/data/directory/SubDirectory.java
+++ b/src/main/java/com/iemr/common/data/directory/SubDirectory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.directory;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/door_to_door_app/RequestParser.java b/src/main/java/com/iemr/common/data/door_to_door_app/RequestParser.java
index bc50523b..27038508 100644
--- a/src/main/java/com/iemr/common/data/door_to_door_app/RequestParser.java
+++ b/src/main/java/com/iemr/common/data/door_to_door_app/RequestParser.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.door_to_door_app;
 
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/iemr/common/data/door_to_door_app/V_doortodooruserdetails.java b/src/main/java/com/iemr/common/data/door_to_door_app/V_doortodooruserdetails.java
index bcdbcea9..49a7b304 100644
--- a/src/main/java/com/iemr/common/data/door_to_door_app/V_doortodooruserdetails.java
+++ b/src/main/java/com/iemr/common/data/door_to_door_app/V_doortodooruserdetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.door_to_door_app;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/data/email/EmailNotification.java b/src/main/java/com/iemr/common/data/email/EmailNotification.java
index 2aa492bf..c7e392d6 100644
--- a/src/main/java/com/iemr/common/data/email/EmailNotification.java
+++ b/src/main/java/com/iemr/common/data/email/EmailNotification.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.email;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/email/EmailTemplate.java b/src/main/java/com/iemr/common/data/email/EmailTemplate.java
index 69e29b09..f4ed6e6d 100644
--- a/src/main/java/com/iemr/common/data/email/EmailTemplate.java
+++ b/src/main/java/com/iemr/common/data/email/EmailTemplate.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.email;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/data/email/MDSR_CDREmail.java b/src/main/java/com/iemr/common/data/email/MDSR_CDREmail.java
index ca897ed0..a158ad75 100644
--- a/src/main/java/com/iemr/common/data/email/MDSR_CDREmail.java
+++ b/src/main/java/com/iemr/common/data/email/MDSR_CDREmail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.email;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/email/StockAlertData.java b/src/main/java/com/iemr/common/data/email/StockAlertData.java
index 139d08d7..9bdf4d8b 100644
--- a/src/main/java/com/iemr/common/data/email/StockAlertData.java
+++ b/src/main/java/com/iemr/common/data/email/StockAlertData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.email;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/data/everwell/AddSupportAction.java b/src/main/java/com/iemr/common/data/everwell/AddSupportAction.java
index 694baa2c..485fca8c 100644
--- a/src/main/java/com/iemr/common/data/everwell/AddSupportAction.java
+++ b/src/main/java/com/iemr/common/data/everwell/AddSupportAction.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/everwell/BenPhoneMaps.java b/src/main/java/com/iemr/common/data/everwell/BenPhoneMaps.java
index 91c9db37..0cb06f9d 100644
--- a/src/main/java/com/iemr/common/data/everwell/BenPhoneMaps.java
+++ b/src/main/java/com/iemr/common/data/everwell/BenPhoneMaps.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 public class BenPhoneMaps {
diff --git a/src/main/java/com/iemr/common/data/everwell/EverwellAllocateMultiple.java b/src/main/java/com/iemr/common/data/everwell/EverwellAllocateMultiple.java
index 09406db9..38291755 100644
--- a/src/main/java/com/iemr/common/data/everwell/EverwellAllocateMultiple.java
+++ b/src/main/java/com/iemr/common/data/everwell/EverwellAllocateMultiple.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 import java.math.BigInteger;
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/everwell/EverwellDetails.java b/src/main/java/com/iemr/common/data/everwell/EverwellDetails.java
index 0fb9b29b..8fbb283a 100644
--- a/src/main/java/com/iemr/common/data/everwell/EverwellDetails.java
+++ b/src/main/java/com/iemr/common/data/everwell/EverwellDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/data/everwell/EverwellFeedback.java b/src/main/java/com/iemr/common/data/everwell/EverwellFeedback.java
index c7ab4155..5b1c508f 100644
--- a/src/main/java/com/iemr/common/data/everwell/EverwellFeedback.java
+++ b/src/main/java/com/iemr/common/data/everwell/EverwellFeedback.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/everwell/EverwellRegistration1097Identity.java b/src/main/java/com/iemr/common/data/everwell/EverwellRegistration1097Identity.java
index 81372e7d..d024b73d 100644
--- a/src/main/java/com/iemr/common/data/everwell/EverwellRegistration1097Identity.java
+++ b/src/main/java/com/iemr/common/data/everwell/EverwellRegistration1097Identity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/data/everwell/EverwellSupportAction.java b/src/main/java/com/iemr/common/data/everwell/EverwellSupportAction.java
index 6a7ba32c..d01c9b4f 100644
--- a/src/main/java/com/iemr/common/data/everwell/EverwellSupportAction.java
+++ b/src/main/java/com/iemr/common/data/everwell/EverwellSupportAction.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/everwell/Note.java b/src/main/java/com/iemr/common/data/everwell/Note.java
index d1e4d855..bf483475 100644
--- a/src/main/java/com/iemr/common/data/everwell/Note.java
+++ b/src/main/java/com/iemr/common/data/everwell/Note.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.everwell;
 import java.sql.Timestamp;
 public class Note {
diff --git a/src/main/java/com/iemr/common/data/feedback/BalVivahComplaint.java b/src/main/java/com/iemr/common/data/feedback/BalVivahComplaint.java
index f96197d7..c0d940b0 100644
--- a/src/main/java/com/iemr/common/data/feedback/BalVivahComplaint.java
+++ b/src/main/java/com/iemr/common/data/feedback/BalVivahComplaint.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/feedback/EpidemicOutbreak.java b/src/main/java/com/iemr/common/data/feedback/EpidemicOutbreak.java
index d3ddda40..b2b18cf7 100644
--- a/src/main/java/com/iemr/common/data/feedback/EpidemicOutbreak.java
+++ b/src/main/java/com/iemr/common/data/feedback/EpidemicOutbreak.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java b/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
index 1f5feee6..29ce69a4 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
@@ -76,7 +97,6 @@ public class FeedbackDetails {
 	private String instiName;
 
 	@Transient
-	@Expose
 	private String instituteName = "";
 
 	@Column(name = "DesignationID")
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackLog.java b/src/main/java/com/iemr/common/data/feedback/FeedbackLog.java
index 96310e49..ed967fa9 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackLog.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackLog.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackNatureDetail.java b/src/main/java/com/iemr/common/data/feedback/FeedbackNatureDetail.java
index f0f1d75e..2a74144b 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackNatureDetail.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackNatureDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackRequest.java b/src/main/java/com/iemr/common/data/feedback/FeedbackRequest.java
index 6b10c45f..7b79b3c5 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackRequest.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackResponse.java b/src/main/java/com/iemr/common/data/feedback/FeedbackResponse.java
index 2b67d870..094c86c3 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackResponse.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackSeverity.java b/src/main/java/com/iemr/common/data/feedback/FeedbackSeverity.java
index 74a36392..858f09c2 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackSeverity.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackSeverity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackStatus.java b/src/main/java/com/iemr/common/data/feedback/FeedbackStatus.java
index 7c7b0dfc..ff8757d1 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackStatus.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/FeedbackType.java b/src/main/java/com/iemr/common/data/feedback/FeedbackType.java
index 2ea0e82b..ab3e9a64 100644
--- a/src/main/java/com/iemr/common/data/feedback/FeedbackType.java
+++ b/src/main/java/com/iemr/common/data/feedback/FeedbackType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/feedback/Severity.java b/src/main/java/com/iemr/common/data/feedback/Severity.java
index 5273dfb2..e4654670 100644
--- a/src/main/java/com/iemr/common/data/feedback/Severity.java
+++ b/src/main/java/com/iemr/common/data/feedback/Severity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/healthCareWorkerType/HealthCareWorker.java b/src/main/java/com/iemr/common/data/healthCareWorkerType/HealthCareWorker.java
index ae5423b1..75655e44 100644
--- a/src/main/java/com/iemr/common/data/healthCareWorkerType/HealthCareWorker.java
+++ b/src/main/java/com/iemr/common/data/healthCareWorkerType/HealthCareWorker.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.healthCareWorkerType;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/COVIDHistory.java b/src/main/java/com/iemr/common/data/helpline104history/COVIDHistory.java
index e3b06268..bf0fc6ef 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/COVIDHistory.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/COVIDHistory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/Directoryservice.java b/src/main/java/com/iemr/common/data/helpline104history/Directoryservice.java
index 3b29233f..b647c1a2 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/Directoryservice.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/Directoryservice.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/H104BenMedHistory.java b/src/main/java/com/iemr/common/data/helpline104history/H104BenMedHistory.java
index 829c2ef0..7a22f872 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/H104BenMedHistory.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/H104BenMedHistory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_104drugmapping.java b/src/main/java/com/iemr/common/data/helpline104history/M_104drugmapping.java
index 8f443c0e..3c237da2 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_104drugmapping.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_104drugmapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_BloodGroup.java b/src/main/java/com/iemr/common/data/helpline104history/M_BloodGroup.java
index b840a185..03e56f49 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_BloodGroup.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_BloodGroup.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_Component.java b/src/main/java/com/iemr/common/data/helpline104history/M_Component.java
index a8cd6b83..9f3c49a1 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_Component.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_Component.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_ComponentType.java b/src/main/java/com/iemr/common/data/helpline104history/M_ComponentType.java
index e958294a..a5e7f42f 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_ComponentType.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_ComponentType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_DonatableOrgan.java b/src/main/java/com/iemr/common/data/helpline104history/M_DonatableOrgan.java
index b489a293..3f0e4385 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_DonatableOrgan.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_DonatableOrgan.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/M_DonationType.java b/src/main/java/com/iemr/common/data/helpline104history/M_DonationType.java
index cd4e1303..191b4f8a 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/M_DonationType.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/M_DonationType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/PrescribedDrug.java b/src/main/java/com/iemr/common/data/helpline104history/PrescribedDrug.java
index 52b114d7..1171ee6f 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/PrescribedDrug.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/PrescribedDrug.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/Prescription.java b/src/main/java/com/iemr/common/data/helpline104history/Prescription.java
index 205aa136..1bceacee 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/Prescription.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/Prescription.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/RequestedInstitution.java b/src/main/java/com/iemr/common/data/helpline104history/RequestedInstitution.java
index a605c6f2..4f008c89 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/RequestedInstitution.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/RequestedInstitution.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/T_BloodRequest.java b/src/main/java/com/iemr/common/data/helpline104history/T_BloodRequest.java
index d9210f25..67ae2e0c 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/T_BloodRequest.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/T_BloodRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/T_EpidemicOutbreak.java b/src/main/java/com/iemr/common/data/helpline104history/T_EpidemicOutbreak.java
index 1728b54b..66a345cf 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/T_EpidemicOutbreak.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/T_EpidemicOutbreak.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/T_FoodSafetyCopmlaint.java b/src/main/java/com/iemr/common/data/helpline104history/T_FoodSafetyCopmlaint.java
index 52ebbed9..8f9cac61 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/T_FoodSafetyCopmlaint.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/T_FoodSafetyCopmlaint.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/T_OrganDonation.java b/src/main/java/com/iemr/common/data/helpline104history/T_OrganDonation.java
index 59f949c4..75140210 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/T_OrganDonation.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/T_OrganDonation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/helpline104history/T_RequestedBloodBank.java b/src/main/java/com/iemr/common/data/helpline104history/T_RequestedBloodBank.java
index 71645f12..6feb2810 100644
--- a/src/main/java/com/iemr/common/data/helpline104history/T_RequestedBloodBank.java
+++ b/src/main/java/com/iemr/common/data/helpline104history/T_RequestedBloodBank.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.helpline104history;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/honeywell/District.java b/src/main/java/com/iemr/common/data/honeywell/District.java
index 88056156..ba122b91 100644
--- a/src/main/java/com/iemr/common/data/honeywell/District.java
+++ b/src/main/java/com/iemr/common/data/honeywell/District.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.honeywell;
 
 public class District {
diff --git a/src/main/java/com/iemr/common/data/institute/Designation.java b/src/main/java/com/iemr/common/data/institute/Designation.java
index 65625d47..b15feabe 100644
--- a/src/main/java/com/iemr/common/data/institute/Designation.java
+++ b/src/main/java/com/iemr/common/data/institute/Designation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.institute;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/institute/Institute.java b/src/main/java/com/iemr/common/data/institute/Institute.java
index 03a9c258..210d2fd3 100644
--- a/src/main/java/com/iemr/common/data/institute/Institute.java
+++ b/src/main/java/com/iemr/common/data/institute/Institute.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.institute;
 
 import java.sql.Timestamp;
@@ -153,6 +174,10 @@ public class Institute
 	protected Institute()
 	{
 	}
+	
+	public String getInstituteName() {
+        return institutionName;
+    }
 
 	public Institute(Integer institutionID, String institutionName)
 	{
diff --git a/src/main/java/com/iemr/common/data/institute/InstituteType.java b/src/main/java/com/iemr/common/data/institute/InstituteType.java
index f00c9990..40c403c3 100644
--- a/src/main/java/com/iemr/common/data/institute/InstituteType.java
+++ b/src/main/java/com/iemr/common/data/institute/InstituteType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.institute;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java b/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java
index c5d8a5a0..a17d9bdd 100644
--- a/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java
+++ b/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.kmfilemanager;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/CityDetails.java b/src/main/java/com/iemr/common/data/location/CityDetails.java
index bef77952..0c388064 100644
--- a/src/main/java/com/iemr/common/data/location/CityDetails.java
+++ b/src/main/java/com/iemr/common/data/location/CityDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/Country.java b/src/main/java/com/iemr/common/data/location/Country.java
index 9ef37c3c..63377f64 100644
--- a/src/main/java/com/iemr/common/data/location/Country.java
+++ b/src/main/java/com/iemr/common/data/location/Country.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/DistrictBlock.java b/src/main/java/com/iemr/common/data/location/DistrictBlock.java
index 1f80e85b..04c978b5 100644
--- a/src/main/java/com/iemr/common/data/location/DistrictBlock.java
+++ b/src/main/java/com/iemr/common/data/location/DistrictBlock.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/DistrictBranchMapping.java b/src/main/java/com/iemr/common/data/location/DistrictBranchMapping.java
index 7ecc3345..4e21c9a1 100644
--- a/src/main/java/com/iemr/common/data/location/DistrictBranchMapping.java
+++ b/src/main/java/com/iemr/common/data/location/DistrictBranchMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/Districts.java b/src/main/java/com/iemr/common/data/location/Districts.java
index c8e84c2c..28bc8062 100644
--- a/src/main/java/com/iemr/common/data/location/Districts.java
+++ b/src/main/java/com/iemr/common/data/location/Districts.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/States.java b/src/main/java/com/iemr/common/data/location/States.java
index 3ef22baa..71dfba96 100644
--- a/src/main/java/com/iemr/common/data/location/States.java
+++ b/src/main/java/com/iemr/common/data/location/States.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/location/Taluks.java b/src/main/java/com/iemr/common/data/location/Taluks.java
index 9f2b1adc..743f3ceb 100644
--- a/src/main/java/com/iemr/common/data/location/Taluks.java
+++ b/src/main/java/com/iemr/common/data/location/Taluks.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.location;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/lonic/LonicDescription.java b/src/main/java/com/iemr/common/data/lonic/LonicDescription.java
index 7f6e9bb7..2f837740 100644
--- a/src/main/java/com/iemr/common/data/lonic/LonicDescription.java
+++ b/src/main/java/com/iemr/common/data/lonic/LonicDescription.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.lonic;
 
 
diff --git a/src/main/java/com/iemr/common/data/swaasa/Swaasa.java b/src/main/java/com/iemr/common/data/lungassessment/LungAssessment.java
similarity index 87%
rename from src/main/java/com/iemr/common/data/swaasa/Swaasa.java
rename to src/main/java/com/iemr/common/data/lungassessment/LungAssessment.java
index def565ce..12d74778 100644
--- a/src/main/java/com/iemr/common/data/swaasa/Swaasa.java
+++ b/src/main/java/com/iemr/common/data/lungassessment/LungAssessment.java
@@ -1,4 +1,25 @@
-package com.iemr.common.data.swaasa;
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.data.lungassessment;
 
 import java.sql.Timestamp;
 
@@ -13,14 +34,13 @@
 
 @Entity
 @Table(name = "t_swaasa")
-public class Swaasa {
+public class LungAssessment {
 
 	@Id
 	@GeneratedValue
 	@Column(name = "Id", insertable = false)
 	private Long id;
 
-	// request
 	@Column(name = "Beneficiaryregid")
 	private Long patientId;
 	@Column(name = "AssessmentId")
@@ -30,8 +50,6 @@ public class Swaasa {
 	@Column(name = "Gender")
 	private String gender;
 
-//	@Column(name = "Time_stamp")
-//	private Timestamp timestamp;
 	@Column(name = "frequent_cough")
 	private Integer frequent_cough;
 	@Column(name = "sputum")
@@ -45,7 +63,6 @@ public class Swaasa {
 	@Column(name = "shortness_of_breath")
 	private Integer shortness_of_breath;
 
-	// response
 	@Column(name = "record_duration")
 	private Double record_duration;
 	@Column(name = "status")
@@ -63,7 +80,6 @@ public class Swaasa {
 	@Column(name = "severity")
 	private String severity;
 
-	// others
 	@Column(name = "ProviderServiceMapID")
 	private Integer providerServiceMapID;
 	@Column(name = "Deleted", insertable = false, updatable = false)
diff --git a/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentAuthenticateResponse.java b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentAuthenticateResponse.java
new file mode 100644
index 00000000..24da2a7c
--- /dev/null
+++ b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentAuthenticateResponse.java
@@ -0,0 +1,51 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.data.lungassessment;
+
+import org.springframework.stereotype.Component;
+
+import lombok.ToString;
+
+@Component
+@ToString
+public class LungAssessmentAuthenticateResponse {
+
+	private String status;
+	private String accessToken;
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getAccessToken() {
+		return accessToken;
+	}
+
+	public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentResponseDTO.java b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentResponseDTO.java
new file mode 100644
index 00000000..0e3be37b
--- /dev/null
+++ b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentResponseDTO.java
@@ -0,0 +1,57 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.data.lungassessment;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class LungAssessmentResponseDTO {
+
+	private String status;
+	private LungAssessment data;
+	private String assessmentId;
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public LungAssessment getData() {
+		return data;
+	}
+
+	public void setData(LungAssessment data) {
+		this.data = data;
+	}
+
+	public String getAssessmentId() {
+		return assessmentId;
+	}
+
+	public void setAssessmentId(String assessmentId) {
+		this.assessmentId = assessmentId;
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentValidateCoughReponseDTO.java b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentValidateCoughReponseDTO.java
new file mode 100644
index 00000000..2a3df5de
--- /dev/null
+++ b/src/main/java/com/iemr/common/data/lungassessment/LungAssessmentValidateCoughReponseDTO.java
@@ -0,0 +1,50 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.data.lungassessment;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class LungAssessmentValidateCoughReponseDTO {
+
+	private String status;
+	private Map<String, Object> data;
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Map<String, Object> getData() {
+		return data;
+	}
+
+	public void setData(Map<String, Object> data) {
+		this.data = data;
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/data/swaasa/SymptomsDTO.java b/src/main/java/com/iemr/common/data/lungassessment/SymptomsDTO.java
similarity index 57%
rename from src/main/java/com/iemr/common/data/swaasa/SymptomsDTO.java
rename to src/main/java/com/iemr/common/data/lungassessment/SymptomsDTO.java
index 6e53a369..2215f63c 100644
--- a/src/main/java/com/iemr/common/data/swaasa/SymptomsDTO.java
+++ b/src/main/java/com/iemr/common/data/lungassessment/SymptomsDTO.java
@@ -1,4 +1,25 @@
-package com.iemr.common.data.swaasa;
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.data.lungassessment;
 
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/iemr/common/data/mctshistory/ChildValidDataHandler.java b/src/main/java/com/iemr/common/data/mctshistory/ChildValidDataHandler.java
index c4d53696..d8565268 100644
--- a/src/main/java/com/iemr/common/data/mctshistory/ChildValidDataHandler.java
+++ b/src/main/java/com/iemr/common/data/mctshistory/ChildValidDataHandler.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.mctshistory;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/mctshistory/MctsCallResponseDetail.java b/src/main/java/com/iemr/common/data/mctshistory/MctsCallResponseDetail.java
index 73307b56..518d0624 100644
--- a/src/main/java/com/iemr/common/data/mctshistory/MctsCallResponseDetail.java
+++ b/src/main/java/com/iemr/common/data/mctshistory/MctsCallResponseDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.mctshistory;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/mctshistory/MctsDataReaderDetail.java b/src/main/java/com/iemr/common/data/mctshistory/MctsDataReaderDetail.java
index c87d1cbf..3521e246 100644
--- a/src/main/java/com/iemr/common/data/mctshistory/MctsDataReaderDetail.java
+++ b/src/main/java/com/iemr/common/data/mctshistory/MctsDataReaderDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.mctshistory;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCall.java b/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCall.java
index 82fc07cd..4798b22d 100644
--- a/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCall.java
+++ b/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCall.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.mctshistory;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCallDetail.java b/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCallDetail.java
index 91b29944..2db72c89 100644
--- a/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCallDetail.java
+++ b/src/main/java/com/iemr/common/data/mctshistory/MctsOutboundCallDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.mctshistory;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java b/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java
index 641123a8..ec780476 100644
--- a/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/AbandonCallSummary.java
@@ -1,5 +1,27 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.nhm_dashboard;
 
+import java.math.BigInteger;
 import java.sql.Timestamp;
 
 import javax.persistence.Column;
@@ -37,7 +59,7 @@ public class AbandonCallSummary {
 	private Integer queueTime;
 	@Expose
 	@Column(name = "DIDNumber")
-	private Integer didNumber;
+	private BigInteger didNumber;
 	@Expose
 	@Column(name = "Skills")
 	private String skills;
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/AgentRealTimeData.java b/src/main/java/com/iemr/common/data/nhm_dashboard/AgentRealTimeData.java
new file mode 100644
index 00000000..4c1ab2ee
--- /dev/null
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/AgentRealTimeData.java
@@ -0,0 +1,80 @@
+package com.iemr.common.data.nhm_dashboard;
+
+import java.sql.Timestamp;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.google.gson.annotations.Expose;
+
+import lombok.Data;
+
+@Data
+@Entity
+@Table(name = "t_nhmagentrealtimedata")
+public class AgentRealTimeData {
+	@Id
+	@GeneratedValue
+	@Expose
+	@Column(name = "id", insertable = false)
+	private Long id;
+	
+	@Expose
+	@Column(name="CampaignName")
+	private String campaignName;
+	
+	@Expose
+	@Column(name="Loggedin")
+	private int loggedIn;
+	
+	@Expose
+	@Column(name="Free")
+	private int free;
+	
+	@Expose
+	@Column(name="Incall")
+	private int inCall;
+	@Expose
+	@Column(name="AWT")
+	private int awt;
+	
+	@Expose
+	@Column(name="Hold")
+	private int hold;
+	
+	@Expose
+	@Column(name="NotReady")
+	private int notReady;
+	
+	@Expose
+	@Column(name="Aux")
+	private int aux;
+	
+	@Expose
+	@Column(name="Deleted",insertable = false, updatable = true)
+	private Boolean deleted;
+	
+	@Expose
+	@Column(name = "Processed", insertable = false)
+	private String processed;
+	
+	@Expose
+	@Column(name="CreatedBy")
+	private String createdBy;
+	
+	@Expose
+	@Column(name="CreatedDate")
+	private Timestamp createdDate;
+	
+	@Expose
+	@Column(name="ModifiedBy")
+	private String modifiedBy;
+	
+	@Expose
+	@Column(name="LastModDate")
+	private Timestamp modifiedDate;
+
+}
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/AgentSummaryReport.java b/src/main/java/com/iemr/common/data/nhm_dashboard/AgentSummaryReport.java
index de8b5e84..21df3fe9 100644
--- a/src/main/java/com/iemr/common/data/nhm_dashboard/AgentSummaryReport.java
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/AgentSummaryReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.nhm_dashboard;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/DetailedCallReport.java b/src/main/java/com/iemr/common/data/nhm_dashboard/DetailedCallReport.java
index 09c715d1..e78b6a3d 100644
--- a/src/main/java/com/iemr/common/data/nhm_dashboard/DetailedCallReport.java
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/DetailedCallReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.nhm_dashboard;
 
 import java.sql.Timestamp;
@@ -132,7 +153,7 @@ public class DetailedCallReport {
 	private Integer Hold_Num_Times;
 	@Expose
 	@Column(name = "CallerId")
-	private Integer Caller_Id;
+	private String Caller_Id;
 	@Expose
 	@Column(name = "Channel")
 	private String Channel;
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/LineCallSummary.java b/src/main/java/com/iemr/common/data/nhm_dashboard/LineCallSummary.java
index d5bdd42e..469a2a8b 100644
--- a/src/main/java/com/iemr/common/data/nhm_dashboard/LineCallSummary.java
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/LineCallSummary.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.nhm_dashboard;
 
 import java.sql.Time;
diff --git a/src/main/java/com/iemr/common/data/nhm_dashboard/NHMAgentRequest.java b/src/main/java/com/iemr/common/data/nhm_dashboard/NHMAgentRequest.java
new file mode 100644
index 00000000..22e8abf3
--- /dev/null
+++ b/src/main/java/com/iemr/common/data/nhm_dashboard/NHMAgentRequest.java
@@ -0,0 +1,8 @@
+package com.iemr.common.data.nhm_dashboard;
+
+import lombok.Data;
+
+@Data
+public class NHMAgentRequest {
+private String campaign_name;
+}
diff --git a/src/main/java/com/iemr/common/data/notification/EmergencyContacts.java b/src/main/java/com/iemr/common/data/notification/EmergencyContacts.java
index 2acdcca4..f879b5e1 100644
--- a/src/main/java/com/iemr/common/data/notification/EmergencyContacts.java
+++ b/src/main/java/com/iemr/common/data/notification/EmergencyContacts.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.notification;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/notification/Notification.java b/src/main/java/com/iemr/common/data/notification/Notification.java
index 2f895516..f4c5f963 100644
--- a/src/main/java/com/iemr/common/data/notification/Notification.java
+++ b/src/main/java/com/iemr/common/data/notification/Notification.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.notification;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/notification/NotificationType.java b/src/main/java/com/iemr/common/data/notification/NotificationType.java
index 1369dcb8..828429b3 100644
--- a/src/main/java/com/iemr/common/data/notification/NotificationType.java
+++ b/src/main/java/com/iemr/common/data/notification/NotificationType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.notification;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/otp/OTPRequestParsor.java b/src/main/java/com/iemr/common/data/otp/OTPRequestParsor.java
index 3501a8cc..74202ab3 100644
--- a/src/main/java/com/iemr/common/data/otp/OTPRequestParsor.java
+++ b/src/main/java/com/iemr/common/data/otp/OTPRequestParsor.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.otp;
 
 import javax.persistence.Entity;
diff --git a/src/main/java/com/iemr/common/data/questionconfig/QuestionTypeDetail.java b/src/main/java/com/iemr/common/data/questionconfig/QuestionTypeDetail.java
index 0151b6cd..92ad50be 100644
--- a/src/main/java/com/iemr/common/data/questionconfig/QuestionTypeDetail.java
+++ b/src/main/java/com/iemr/common/data/questionconfig/QuestionTypeDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.questionconfig;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/questionconfig/QuestionnaireDetail.java b/src/main/java/com/iemr/common/data/questionconfig/QuestionnaireDetail.java
index b91553e0..3e20d66f 100644
--- a/src/main/java/com/iemr/common/data/questionconfig/QuestionnaireDetail.java
+++ b/src/main/java/com/iemr/common/data/questionconfig/QuestionnaireDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.questionconfig;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/registration/everwellBeneficicaryRegistration.java b/src/main/java/com/iemr/common/data/registration/everwellBeneficicaryRegistration.java
index 37900ba4..1e69fbfa 100644
--- a/src/main/java/com/iemr/common/data/registration/everwellBeneficicaryRegistration.java
+++ b/src/main/java/com/iemr/common/data/registration/everwellBeneficicaryRegistration.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 
 package com.iemr.common.data.registration;
 
diff --git a/src/main/java/com/iemr/common/data/report/BenDetails.java b/src/main/java/com/iemr/common/data/report/BenDetails.java
index 8baf906c..e6a0c99d 100644
--- a/src/main/java/com/iemr/common/data/report/BenDetails.java
+++ b/src/main/java/com/iemr/common/data/report/BenDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/BeneficiaryDetailsReport.java b/src/main/java/com/iemr/common/data/report/BeneficiaryDetailsReport.java
index 3713c82a..f2104c9e 100644
--- a/src/main/java/com/iemr/common/data/report/BeneficiaryDetailsReport.java
+++ b/src/main/java/com/iemr/common/data/report/BeneficiaryDetailsReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/CTIData.java b/src/main/java/com/iemr/common/data/report/CTIData.java
index 86fcca36..31dcecd9 100644
--- a/src/main/java/com/iemr/common/data/report/CTIData.java
+++ b/src/main/java/com/iemr/common/data/report/CTIData.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import com.iemr.common.utils.mapper.OutputMapper;
diff --git a/src/main/java/com/iemr/common/data/report/CTIResponse.java b/src/main/java/com/iemr/common/data/report/CTIResponse.java
index ac264663..341e6d10 100644
--- a/src/main/java/com/iemr/common/data/report/CTIResponse.java
+++ b/src/main/java/com/iemr/common/data/report/CTIResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/data/report/CallDetailsReport.java b/src/main/java/com/iemr/common/data/report/CallDetailsReport.java
index 2ef98e35..d186e92f 100644
--- a/src/main/java/com/iemr/common/data/report/CallDetailsReport.java
+++ b/src/main/java/com/iemr/common/data/report/CallDetailsReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/CallQualityReport.java b/src/main/java/com/iemr/common/data/report/CallQualityReport.java
index 32098131..00212a88 100644
--- a/src/main/java/com/iemr/common/data/report/CallQualityReport.java
+++ b/src/main/java/com/iemr/common/data/report/CallQualityReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/CallReport.java b/src/main/java/com/iemr/common/data/report/CallReport.java
index 36c1c80c..cc88b0df 100644
--- a/src/main/java/com/iemr/common/data/report/CallReport.java
+++ b/src/main/java/com/iemr/common/data/report/CallReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/DimUserReport.java b/src/main/java/com/iemr/common/data/report/DimUserReport.java
index d86f921b..c081ddff 100644
--- a/src/main/java/com/iemr/common/data/report/DimUserReport.java
+++ b/src/main/java/com/iemr/common/data/report/DimUserReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/FeedbackReport.java b/src/main/java/com/iemr/common/data/report/FeedbackReport.java
index 71d8019f..632d6fb7 100644
--- a/src/main/java/com/iemr/common/data/report/FeedbackReport.java
+++ b/src/main/java/com/iemr/common/data/report/FeedbackReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/MedHistory.java b/src/main/java/com/iemr/common/data/report/MedHistory.java
index b3f41015..b0c3522e 100644
--- a/src/main/java/com/iemr/common/data/report/MedHistory.java
+++ b/src/main/java/com/iemr/common/data/report/MedHistory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/QaReportModel.java b/src/main/java/com/iemr/common/data/report/QaReportModel.java
index 0d7e3f85..1f864bff 100644
--- a/src/main/java/com/iemr/common/data/report/QaReportModel.java
+++ b/src/main/java/com/iemr/common/data/report/QaReportModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/data/report/QaReportModel2.java b/src/main/java/com/iemr/common/data/report/QaReportModel2.java
index 205f5e53..baa73296 100644
--- a/src/main/java/com/iemr/common/data/report/QaReportModel2.java
+++ b/src/main/java/com/iemr/common/data/report/QaReportModel2.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/report/ReportType.java b/src/main/java/com/iemr/common/data/report/ReportType.java
index c95e0603..662dfb9a 100644
--- a/src/main/java/com/iemr/common/data/report/ReportType.java
+++ b/src/main/java/com/iemr/common/data/report/ReportType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/report/UnBlockedPhoneReport.java b/src/main/java/com/iemr/common/data/report/UnBlockedPhoneReport.java
index b80aa17d..905a4f34 100644
--- a/src/main/java/com/iemr/common/data/report/UnBlockedPhoneReport.java
+++ b/src/main/java/com/iemr/common/data/report/UnBlockedPhoneReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/UserReport.java b/src/main/java/com/iemr/common/data/report/UserReport.java
index f8686c1c..e9eedff5 100644
--- a/src/main/java/com/iemr/common/data/report/UserReport.java
+++ b/src/main/java/com/iemr/common/data/report/UserReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/report/UserServiceRoleReport.java b/src/main/java/com/iemr/common/data/report/UserServiceRoleReport.java
index a4425478..939390b6 100644
--- a/src/main/java/com/iemr/common/data/report/UserServiceRoleReport.java
+++ b/src/main/java/com/iemr/common/data/report/UserServiceRoleReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/data/request_logger/CallLogger.java b/src/main/java/com/iemr/common/data/request_logger/CallLogger.java
index 7a16fc75..33715a44 100644
--- a/src/main/java/com/iemr/common/data/request_logger/CallLogger.java
+++ b/src/main/java/com/iemr/common/data/request_logger/CallLogger.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.request_logger;
 
 import java.security.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/scheme/Scheme.java b/src/main/java/com/iemr/common/data/scheme/Scheme.java
index da9707bc..be8b544f 100644
--- a/src/main/java/com/iemr/common/data/scheme/Scheme.java
+++ b/src/main/java/com/iemr/common/data/scheme/Scheme.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.scheme;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/service/SubService.java b/src/main/java/com/iemr/common/data/service/SubService.java
index 9202b388..98f6ec83 100644
--- a/src/main/java/com/iemr/common/data/service/SubService.java
+++ b/src/main/java/com/iemr/common/data/service/SubService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.service;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/sms/SMSNotification.java b/src/main/java/com/iemr/common/data/sms/SMSNotification.java
index 4c994005..38bfe912 100644
--- a/src/main/java/com/iemr/common/data/sms/SMSNotification.java
+++ b/src/main/java/com/iemr/common/data/sms/SMSNotification.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/sms/SMSParameters.java b/src/main/java/com/iemr/common/data/sms/SMSParameters.java
index f9615b77..ca6fb485 100644
--- a/src/main/java/com/iemr/common/data/sms/SMSParameters.java
+++ b/src/main/java/com/iemr/common/data/sms/SMSParameters.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/sms/SMSParametersMap.java b/src/main/java/com/iemr/common/data/sms/SMSParametersMap.java
index a4247720..e66eab07 100644
--- a/src/main/java/com/iemr/common/data/sms/SMSParametersMap.java
+++ b/src/main/java/com/iemr/common/data/sms/SMSParametersMap.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/sms/SMSTemplate.java b/src/main/java/com/iemr/common/data/sms/SMSTemplate.java
index 4e1671cf..e1e3a922 100644
--- a/src/main/java/com/iemr/common/data/sms/SMSTemplate.java
+++ b/src/main/java/com/iemr/common/data/sms/SMSTemplate.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.sms;
 
 import java.sql.Timestamp;
@@ -34,6 +55,8 @@ public class SMSTemplate
 	String smsTemplateName;
 	@Column(name = "SMSTemplate")
 	String smsTemplate;
+	@Column(name = "dltTemplateId")
+	String dltTemplateId;
 	@Column(name = "SMSSenderName")
 	String smsSenderID;
 	@Column(name = "SMSTypeID")
diff --git a/src/main/java/com/iemr/common/data/sms/SMSType.java b/src/main/java/com/iemr/common/data/sms/SMSType.java
index 39ea68df..5fb72c4b 100644
--- a/src/main/java/com/iemr/common/data/sms/SMSType.java
+++ b/src/main/java/com/iemr/common/data/sms/SMSType.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/snomedct/SCTDescription.java b/src/main/java/com/iemr/common/data/snomedct/SCTDescription.java
index 4c4aea22..bbe3a55e 100644
--- a/src/main/java/com/iemr/common/data/snomedct/SCTDescription.java
+++ b/src/main/java/com/iemr/common/data/snomedct/SCTDescription.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.snomedct;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/swaasa/SwaasaAssessmentResponseDTO.java b/src/main/java/com/iemr/common/data/swaasa/SwaasaAssessmentResponseDTO.java
deleted file mode 100644
index bbd70591..00000000
--- a/src/main/java/com/iemr/common/data/swaasa/SwaasaAssessmentResponseDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iemr.common.data.swaasa;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class SwaasaAssessmentResponseDTO {
-
-	private String status;
-	private Swaasa data;
-	private String assessmentId;
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Swaasa getData() {
-		return data;
-	}
-
-	public void setData(Swaasa data) {
-		this.data = data;
-	}
-
-	public String getAssessmentId() {
-		return assessmentId;
-	}
-
-	public void setAssessmentId(String assessmentId) {
-		this.assessmentId = assessmentId;
-	}
-
-}
diff --git a/src/main/java/com/iemr/common/data/swaasa/SwaasaAuthenticateResponse.java b/src/main/java/com/iemr/common/data/swaasa/SwaasaAuthenticateResponse.java
deleted file mode 100644
index 953ecd22..00000000
--- a/src/main/java/com/iemr/common/data/swaasa/SwaasaAuthenticateResponse.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iemr.common.data.swaasa;
-
-import org.springframework.stereotype.Component;
-
-import lombok.ToString;
-
-@Component
-@ToString
-public class SwaasaAuthenticateResponse {
-
-	private String status;
-	private String accessToken;
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getAccessToken() {
-		return accessToken;
-	}
-
-	public void setAccessToken(String accessToken) {
-		this.accessToken = accessToken;
-	}
-
-}
diff --git a/src/main/java/com/iemr/common/data/swaasa/SwaasaValidateCoughReponseDTO.java b/src/main/java/com/iemr/common/data/swaasa/SwaasaValidateCoughReponseDTO.java
deleted file mode 100644
index 5ee01b55..00000000
--- a/src/main/java/com/iemr/common/data/swaasa/SwaasaValidateCoughReponseDTO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.iemr.common.data.swaasa;
-
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class SwaasaValidateCoughReponseDTO {
-
-	private String status;
-	private Map<String, Object> data;
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Map<String, Object> getData() {
-		return data;
-	}
-
-	public void setData(Map<String, Object> data) {
-		this.data = data;
-	}
-
-}
diff --git a/src/main/java/com/iemr/common/data/telemedicine/PrescribedDrugDetail.java b/src/main/java/com/iemr/common/data/telemedicine/PrescribedDrugDetail.java
index 29cf15de..05d196b3 100644
--- a/src/main/java/com/iemr/common/data/telemedicine/PrescribedDrugDetail.java
+++ b/src/main/java/com/iemr/common/data/telemedicine/PrescribedDrugDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.telemedicine;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/telemedicine/TCRequestModel.java b/src/main/java/com/iemr/common/data/telemedicine/TCRequestModel.java
index 335f1071..2b797bc3 100644
--- a/src/main/java/com/iemr/common/data/telemedicine/TCRequestModel.java
+++ b/src/main/java/com/iemr/common/data/telemedicine/TCRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.telemedicine;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/uptsu/FacilityMaster.java b/src/main/java/com/iemr/common/data/uptsu/FacilityMaster.java
index 3e39790c..7d0f15ac 100644
--- a/src/main/java/com/iemr/common/data/uptsu/FacilityMaster.java
+++ b/src/main/java/com/iemr/common/data/uptsu/FacilityMaster.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.uptsu;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/uptsu/SmsRequestOBJ.java b/src/main/java/com/iemr/common/data/uptsu/SmsRequestOBJ.java
index 04eca95b..b1bbdb44 100644
--- a/src/main/java/com/iemr/common/data/uptsu/SmsRequestOBJ.java
+++ b/src/main/java/com/iemr/common/data/uptsu/SmsRequestOBJ.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.uptsu;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/uptsu/T_104AppointmentDetails.java b/src/main/java/com/iemr/common/data/uptsu/T_104AppointmentDetails.java
index c96eafc9..f6feba74 100644
--- a/src/main/java/com/iemr/common/data/uptsu/T_104AppointmentDetails.java
+++ b/src/main/java/com/iemr/common/data/uptsu/T_104AppointmentDetails.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.uptsu;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Community.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Community.java
index 05e7f110..0fb06216 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Community.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Community.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Gender.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Gender.java
index a4483579..1de99288 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Gender.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Gender.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Language.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Language.java
index 77989838..d0f39ce1 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Language.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Language.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/MaritalStatus.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/MaritalStatus.java
index 3e774cf9..440f039a 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/MaritalStatus.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/MaritalStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Religion.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Religion.java
index 2d42783f..0498f69e 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Religion.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Religion.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Status.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Status.java
index 8a15ebf7..b607126a 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Status.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Status.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/userbeneficiarydata/Title.java b/src/main/java/com/iemr/common/data/userbeneficiarydata/Title.java
index 0bda1eae..d75afa06 100644
--- a/src/main/java/com/iemr/common/data/userbeneficiarydata/Title.java
+++ b/src/main/java/com/iemr/common/data/userbeneficiarydata/Title.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.userbeneficiarydata;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/EmailStatus.java b/src/main/java/com/iemr/common/data/users/EmailStatus.java
index 1f1616c0..50041623 100644
--- a/src/main/java/com/iemr/common/data/users/EmailStatus.java
+++ b/src/main/java/com/iemr/common/data/users/EmailStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/EmployeeSignature.java b/src/main/java/com/iemr/common/data/users/EmployeeSignature.java
index 91ff7532..3ccfaf3e 100644
--- a/src/main/java/com/iemr/common/data/users/EmployeeSignature.java
+++ b/src/main/java/com/iemr/common/data/users/EmployeeSignature.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/LoginReqResp.java b/src/main/java/com/iemr/common/data/users/LoginReqResp.java
index c85d3dfe..82290dc8 100644
--- a/src/main/java/com/iemr/common/data/users/LoginReqResp.java
+++ b/src/main/java/com/iemr/common/data/users/LoginReqResp.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/LoginSecurityQuestions.java b/src/main/java/com/iemr/common/data/users/LoginSecurityQuestions.java
index 0ac4d193..1a721131 100644
--- a/src/main/java/com/iemr/common/data/users/LoginSecurityQuestions.java
+++ b/src/main/java/com/iemr/common/data/users/LoginSecurityQuestions.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/M_Role.java b/src/main/java/com/iemr/common/data/users/M_Role.java
index 629ab4ed..338b77c6 100644
--- a/src/main/java/com/iemr/common/data/users/M_Role.java
+++ b/src/main/java/com/iemr/common/data/users/M_Role.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/MasterServicePoint.java b/src/main/java/com/iemr/common/data/users/MasterServicePoint.java
index a8998037..b5bd3556 100644
--- a/src/main/java/com/iemr/common/data/users/MasterServicePoint.java
+++ b/src/main/java/com/iemr/common/data/users/MasterServicePoint.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/users/MasterVan.java b/src/main/java/com/iemr/common/data/users/MasterVan.java
index 81c7997d..b17e48a9 100644
--- a/src/main/java/com/iemr/common/data/users/MasterVan.java
+++ b/src/main/java/com/iemr/common/data/users/MasterVan.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/users/Parkingplace.java b/src/main/java/com/iemr/common/data/users/Parkingplace.java
index a6fb1022..8380795b 100644
--- a/src/main/java/com/iemr/common/data/users/Parkingplace.java
+++ b/src/main/java/com/iemr/common/data/users/Parkingplace.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java b/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java
index 036d38a4..b291cca1 100644
--- a/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java
+++ b/src/main/java/com/iemr/common/data/users/ProviderServiceAddressMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/users/ProviderServiceMapping.java b/src/main/java/com/iemr/common/data/users/ProviderServiceMapping.java
index f0801e98..b1d47f5a 100644
--- a/src/main/java/com/iemr/common/data/users/ProviderServiceMapping.java
+++ b/src/main/java/com/iemr/common/data/users/ProviderServiceMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/Role.java b/src/main/java/com/iemr/common/data/users/Role.java
index d9f451a3..b1f59280 100644
--- a/src/main/java/com/iemr/common/data/users/Role.java
+++ b/src/main/java/com/iemr/common/data/users/Role.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
@@ -76,6 +97,10 @@ public class Role
 	@Expose
 	@Transient
 	private String agentID;
+	
+	@Expose
+	@Transient
+	private Boolean isSanjeevani;
 
 	// protected Role() {
 	// }
diff --git a/src/main/java/com/iemr/common/data/users/Screen.java b/src/main/java/com/iemr/common/data/users/Screen.java
index 46ec37e9..c807dadf 100644
--- a/src/main/java/com/iemr/common/data/users/Screen.java
+++ b/src/main/java/com/iemr/common/data/users/Screen.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/ServiceMaster.java b/src/main/java/com/iemr/common/data/users/ServiceMaster.java
index c3ed6e4b..814f07a9 100644
--- a/src/main/java/com/iemr/common/data/users/ServiceMaster.java
+++ b/src/main/java/com/iemr/common/data/users/ServiceMaster.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/ServiceProvider.java b/src/main/java/com/iemr/common/data/users/ServiceProvider.java
index dab14b47..35f0b2be 100644
--- a/src/main/java/com/iemr/common/data/users/ServiceProvider.java
+++ b/src/main/java/com/iemr/common/data/users/ServiceProvider.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/users/ServiceRoleScreenMapping.java b/src/main/java/com/iemr/common/data/users/ServiceRoleScreenMapping.java
index 65eb03f2..114a8fc9 100644
--- a/src/main/java/com/iemr/common/data/users/ServiceRoleScreenMapping.java
+++ b/src/main/java/com/iemr/common/data/users/ServiceRoleScreenMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/Servicepointvillagemap.java b/src/main/java/com/iemr/common/data/users/Servicepointvillagemap.java
index a6bd3a0d..c40cf37c 100644
--- a/src/main/java/com/iemr/common/data/users/Servicepointvillagemap.java
+++ b/src/main/java/com/iemr/common/data/users/Servicepointvillagemap.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/data/users/User.java b/src/main/java/com/iemr/common/data/users/User.java
index 70978da6..59885aab 100644
--- a/src/main/java/com/iemr/common/data/users/User.java
+++ b/src/main/java/com/iemr/common/data/users/User.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/UserDemographics.java b/src/main/java/com/iemr/common/data/users/UserDemographics.java
index d257ea18..33014f23 100644
--- a/src/main/java/com/iemr/common/data/users/UserDemographics.java
+++ b/src/main/java/com/iemr/common/data/users/UserDemographics.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/UserLangMapping.java b/src/main/java/com/iemr/common/data/users/UserLangMapping.java
index 6316d9c2..5f6cc1d2 100644
--- a/src/main/java/com/iemr/common/data/users/UserLangMapping.java
+++ b/src/main/java/com/iemr/common/data/users/UserLangMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/UserParkingplaceMapping.java b/src/main/java/com/iemr/common/data/users/UserParkingplaceMapping.java
index f495d381..2ead7912 100644
--- a/src/main/java/com/iemr/common/data/users/UserParkingplaceMapping.java
+++ b/src/main/java/com/iemr/common/data/users/UserParkingplaceMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.util.Set;
diff --git a/src/main/java/com/iemr/common/data/users/UserQualification.java b/src/main/java/com/iemr/common/data/users/UserQualification.java
index fa7490b4..26d2d586 100644
--- a/src/main/java/com/iemr/common/data/users/UserQualification.java
+++ b/src/main/java/com/iemr/common/data/users/UserQualification.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/UserSecurityQMapping.java b/src/main/java/com/iemr/common/data/users/UserSecurityQMapping.java
index 2f005442..0f89407f 100644
--- a/src/main/java/com/iemr/common/data/users/UserSecurityQMapping.java
+++ b/src/main/java/com/iemr/common/data/users/UserSecurityQMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java
index ed682aed..40a70daf 100644
--- a/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java
+++ b/src/main/java/com/iemr/common/data/users/UserServiceRoleMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
@@ -86,6 +107,10 @@ public class UserServiceRoleMapping
 	@Expose
 	@Column(name = "isOutbound")
 	private Boolean outbound;
+	
+	@Expose
+	@Column(name = "isSanjeevani")
+	private Boolean isSanjeevani;
 
 
 	// @Expose
@@ -276,7 +301,7 @@ public String toString()
 
 	public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappingID, Long UserID, Integer roleID,
 			Role m_Role, Integer providerServiceMapID, ProviderServiceMapping m_ProviderServiceMapping,
-			String agentID,Boolean inbound, Boolean outbound, String agentPassword, Integer workingLocationID,
+			String agentID,Boolean inbound, Boolean outbound, Boolean isSanjeevani, String agentPassword, Integer workingLocationID,
 			ProviderServiceAddressMapping providerServiceAddressMapping)
 	{
 		UserServiceRoleMapping userRoleMapping = new UserServiceRoleMapping();
@@ -291,6 +316,7 @@ public static UserServiceRoleMapping initializeUserRoleMappingObjs(Long USRMappi
 		userRoleMapping.agentID = agentID;
 		userRoleMapping.inbound = inbound;
 		userRoleMapping.outbound = outbound;
+		userRoleMapping.isSanjeevani = isSanjeevani;
 		userRoleMapping.agentPassword = agentPassword;
 		userRoleMapping.workingLocationID = workingLocationID;
 		userRoleMapping.m_Role.setWorkingLocationID(workingLocationID);
diff --git a/src/main/java/com/iemr/common/data/users/VanServicepointMapping.java b/src/main/java/com/iemr/common/data/users/VanServicepointMapping.java
index 38407883..ff4b07f4 100644
--- a/src/main/java/com/iemr/common/data/users/VanServicepointMapping.java
+++ b/src/main/java/com/iemr/common/data/users/VanServicepointMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/data/users/WorkLocation.java b/src/main/java/com/iemr/common/data/users/WorkLocation.java
index 8f520ae0..74a16965 100644
--- a/src/main/java/com/iemr/common/data/users/WorkLocation.java
+++ b/src/main/java/com/iemr/common/data/users/WorkLocation.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.data.users;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/dto/identity/Address.java b/src/main/java/com/iemr/common/dto/identity/Address.java
index 49297100..7a5e563f 100644
--- a/src/main/java/com/iemr/common/dto/identity/Address.java
+++ b/src/main/java/com/iemr/common/dto/identity/Address.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import com.iemr.common.model.beneficiary.BeneficiaryDemographicsModel;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenCompleteDetailDTO.java b/src/main/java/com/iemr/common/dto/identity/BenCompleteDetailDTO.java
index 800abc2f..ad1dc7bf 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenCompleteDetailDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenCompleteDetailDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java
index 64c9219f..ad55f7b3 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenDetailDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
@@ -54,6 +75,7 @@ public class BenDetailDTO implements Serializable {
 	private Short healthCareWorkerId;
 	private String isHIVPositive;
 	private Integer beneficiaryAge;
+	private String monthlyFamilyIncome;
 
 	private Long houseHoldID;
 	private String guideLineID;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenDetailForCallHistory.java b/src/main/java/com/iemr/common/dto/identity/BenDetailForCallHistory.java
index 40009c0c..6e9d1c9c 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenDetailForCallHistory.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenDetailForCallHistory.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenDetailForOutboundDTO.java b/src/main/java/com/iemr/common/dto/identity/BenDetailForOutboundDTO.java
index 18122d98..9b97d7d5 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenDetailForOutboundDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenDetailForOutboundDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenFamilyDTO.java b/src/main/java/com/iemr/common/dto/identity/BenFamilyDTO.java
index 543612b8..61b9df57 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenFamilyDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenFamilyDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/BenIdentityDTO.java
index ee2def32..36109efb 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenIdentityDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenIdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BenServiceDTO.java b/src/main/java/com/iemr/common/dto/identity/BenServiceDTO.java
index f54d3ee3..78feab49 100644
--- a/src/main/java/com/iemr/common/dto/identity/BenServiceDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BenServiceDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
index cb7ebf91..02d63161 100644
--- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
@@ -53,6 +74,7 @@ public class BeneficiariesDTO {
 	private String incomeStatus;
 	private BigInteger religionId;
 	private String religion;
+	private String monthlyFamilyIncome;
 
 	// End Outreach
 
diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesPartialDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesPartialDTO.java
index b9c8c2d2..c865accd 100644
--- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesPartialDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesPartialDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiaryCreateResp.java b/src/main/java/com/iemr/common/dto/identity/BeneficiaryCreateResp.java
index 247391c9..70abcc1d 100644
--- a/src/main/java/com/iemr/common/dto/identity/BeneficiaryCreateResp.java
+++ b/src/main/java/com/iemr/common/dto/identity/BeneficiaryCreateResp.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiaryFamilyTags.java b/src/main/java/com/iemr/common/dto/identity/BeneficiaryFamilyTags.java
index b7586ed6..03876f08 100644
--- a/src/main/java/com/iemr/common/dto/identity/BeneficiaryFamilyTags.java
+++ b/src/main/java/com/iemr/common/dto/identity/BeneficiaryFamilyTags.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 // import com.iemr.common.identity.domain.MBeneficiarymapping;
diff --git a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java
index 1536ee46..52d63649 100644
--- a/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.sql.Timestamp;
@@ -37,7 +58,7 @@ public class CommonIdentityDTO {
 	private Integer ageAtMarriage;
 	private Integer educationId;
 	private String education;
-	private Boolean emergencyRegistration;
+	private Boolean emergencyRegistration = false;
 	private Integer healthCareWorkerId;
 	private String healthCareWorker;
 	private String fatherName;
@@ -67,6 +88,7 @@ public class CommonIdentityDTO {
 	private Integer titleId;
 	private String title;
 	private Integer zoneId;
+	private String monthlyFamilyIncome;
 
 	// address
 	private Address currentAddress;
diff --git a/src/main/java/com/iemr/common/dto/identity/Contact.java b/src/main/java/com/iemr/common/dto/identity/Contact.java
index 235f9fce..5e121067 100644
--- a/src/main/java/com/iemr/common/dto/identity/Contact.java
+++ b/src/main/java/com/iemr/common/dto/identity/Contact.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/dto/identity/Identity.java b/src/main/java/com/iemr/common/dto/identity/Identity.java
index 03b938c5..e03c9efd 100644
--- a/src/main/java/com/iemr/common/dto/identity/Identity.java
+++ b/src/main/java/com/iemr/common/dto/identity/Identity.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
index 49caa3eb..7a533df7 100644
--- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
@@ -83,6 +104,7 @@ public class IdentityEditDTO {
 	private String religion;
 	private Integer religionId;
 	private String placeOfWork;
+	private String monthlyFamilyIncome;
 
 	// family details
 	private Boolean changeInFamilyDetails = false;
@@ -140,6 +162,8 @@ public class IdentityEditDTO {
 	private Integer vanID;
 	@Expose
 	private Integer parkingPlaceId;
+	
 
 	// END OF new column added for data sync
+	private boolean emergencyRegistration;
 }
diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityFilterDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityFilterDTO.java
index 0712cba0..9854b28e 100644
--- a/src/main/java/com/iemr/common/dto/identity/IdentityFilterDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/IdentityFilterDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/dto/identity/IdentitySearchDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentitySearchDTO.java
index ca37b347..9ae3f92e 100644
--- a/src/main/java/com/iemr/common/dto/identity/IdentitySearchDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/IdentitySearchDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/dto/identity/Phone.java b/src/main/java/com/iemr/common/dto/identity/Phone.java
index fd3156db..2de3a41c 100644
--- a/src/main/java/com/iemr/common/dto/identity/Phone.java
+++ b/src/main/java/com/iemr/common/dto/identity/Phone.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/dto/identity/ReserveIdentityDTO.java b/src/main/java/com/iemr/common/dto/identity/ReserveIdentityDTO.java
index dd489f92..ddb38c1e 100644
--- a/src/main/java/com/iemr/common/dto/identity/ReserveIdentityDTO.java
+++ b/src/main/java/com/iemr/common/dto/identity/ReserveIdentityDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.dto.identity;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapper.java b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapper.java
index a4de0ee0..dc724cf5 100644
--- a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapper.java
+++ b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.DecoratedWith;
diff --git a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java
index 0d17e355..a9d7f947 100644
--- a/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/BenCompleteDetailMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.math.BigInteger;
@@ -114,6 +135,9 @@ public BeneficiaryDemographicsModel createBenDemographicsModel(BeneficiariesDTO
 			demographicsModel.setIncomeStatusName(benDetails.getIncomeStatus());
 			demographicsModel.setIncomeStatus(benDetails.getIncomeStatus());
 		}
+		if (benDetails.getMonthlyFamilyIncome() != null) {
+			demographicsModel.setMonthlyFamilyIncome(benDetails.getMonthlyFamilyIncome());
+		}
 		demographicsModel.setCreatedBy(createdBy);
 		demographicsModel.setPinCode(address.getPinCode());
 		demographicsModel.setAddressLine1(address.getAddrLine1());
diff --git a/src/main/java/com/iemr/common/mapper/BenIdentityMapper.java b/src/main/java/com/iemr/common/mapper/BenIdentityMapper.java
index 1923fbb0..2362f375 100644
--- a/src/main/java/com/iemr/common/mapper/BenIdentityMapper.java
+++ b/src/main/java/com/iemr/common/mapper/BenIdentityMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 
 package com.iemr.common.mapper;
 
diff --git a/src/main/java/com/iemr/common/mapper/BenPhoneMapper.java b/src/main/java/com/iemr/common/mapper/BenPhoneMapper.java
index 536014fd..aea68419 100644
--- a/src/main/java/com/iemr/common/mapper/BenPhoneMapper.java
+++ b/src/main/java/com/iemr/common/mapper/BenPhoneMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/BenPhoneMapperDecorator.java b/src/main/java/com/iemr/common/mapper/BenPhoneMapperDecorator.java
index 763427c5..3fd08fc9 100644
--- a/src/main/java/com/iemr/common/mapper/BenPhoneMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/BenPhoneMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/mapper/CallMapper.java b/src/main/java/com/iemr/common/mapper/CallMapper.java
index 30a28f7f..e31b901a 100644
--- a/src/main/java/com/iemr/common/mapper/CallMapper.java
+++ b/src/main/java/com/iemr/common/mapper/CallMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/CityMapper.java b/src/main/java/com/iemr/common/mapper/CityMapper.java
index 8fe827ba..11906678 100644
--- a/src/main/java/com/iemr/common/mapper/CityMapper.java
+++ b/src/main/java/com/iemr/common/mapper/CityMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapper.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapper.java
index 92021cce..7512da23 100644
--- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapper.java
+++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java
index 683cf730..2a1ed05b 100644
--- a/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/CommonIdentityMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +82,7 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene
 		commonIdentityDTO.setIfscCode(beneficiary.getIfscCode());
 		commonIdentityDTO.setBenImage(beneficiary.getBenImage());
 		commonIdentityDTO.setSpouseName(beneficiary.getSpouseName());
+		commonIdentityDTO.setCreatedDate(beneficiary.getCreatedDate());
 		commonIdentityDTO.setPreferredEmailId(beneficiary.getEmail());
 		commonIdentityDTO.setFatherName(beneficiary.getFatherName());
 		commonIdentityDTO.setAgeAtMarriage(beneficiary.getAgeAtMarriage());
@@ -163,6 +185,10 @@ public CommonIdentityDTO beneficiaryModelCommonIdentityDTO(BeneficiaryModel bene
 		commonIdentityDTO.setParkingPlaceId(beneficiary.getParkingPlaceID());
 
 		commonIdentityDTO.setBeneficiaryConsent(beneficiary.getBeneficiaryConsent());
+		if(beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null) {
+			commonIdentityDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome());
+		}
+		
 		// End
 		return commonIdentityDTO;
 	}
diff --git a/src/main/java/com/iemr/common/mapper/CommunityMapper.java b/src/main/java/com/iemr/common/mapper/CommunityMapper.java
index bf535653..17066e22 100644
--- a/src/main/java/com/iemr/common/mapper/CommunityMapper.java
+++ b/src/main/java/com/iemr/common/mapper/CommunityMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/CommunityMapperDecorator.java b/src/main/java/com/iemr/common/mapper/CommunityMapperDecorator.java
index 575147ae..b34c80b4 100644
--- a/src/main/java/com/iemr/common/mapper/CommunityMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/CommunityMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/CountryMapper.java b/src/main/java/com/iemr/common/mapper/CountryMapper.java
index cf95c59f..0fad1fb9 100644
--- a/src/main/java/com/iemr/common/mapper/CountryMapper.java
+++ b/src/main/java/com/iemr/common/mapper/CountryMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DemograhicsMapper.java b/src/main/java/com/iemr/common/mapper/DemograhicsMapper.java
index 4f4afab8..8a190c86 100644
--- a/src/main/java/com/iemr/common/mapper/DemograhicsMapper.java
+++ b/src/main/java/com/iemr/common/mapper/DemograhicsMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DesignationMapper.java b/src/main/java/com/iemr/common/mapper/DesignationMapper.java
index 7530ecad..a45acc5c 100644
--- a/src/main/java/com/iemr/common/mapper/DesignationMapper.java
+++ b/src/main/java/com/iemr/common/mapper/DesignationMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictBlockMapper.java b/src/main/java/com/iemr/common/mapper/DistrictBlockMapper.java
index a461e536..d9f4c3d5 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictBlockMapper.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictBlockMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictBlockMapperDecorator.java b/src/main/java/com/iemr/common/mapper/DistrictBlockMapperDecorator.java
index a022f324..c3713fe6 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictBlockMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictBlockMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictBranchMapper.java b/src/main/java/com/iemr/common/mapper/DistrictBranchMapper.java
index 52d2472a..9eec9731 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictBranchMapper.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictBranchMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictBranchMapperDecorator.java b/src/main/java/com/iemr/common/mapper/DistrictBranchMapperDecorator.java
index 5aaa8ecf..cd38232d 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictBranchMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictBranchMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictMapper.java b/src/main/java/com/iemr/common/mapper/DistrictMapper.java
index 63827c5e..a19e9215 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictMapper.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/DistrictMapperDecorator.java b/src/main/java/com/iemr/common/mapper/DistrictMapperDecorator.java
index 9aa1a33d..1aad9cc9 100644
--- a/src/main/java/com/iemr/common/mapper/DistrictMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/DistrictMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/EducationMapper.java b/src/main/java/com/iemr/common/mapper/EducationMapper.java
index 0a49f269..2bd4c028 100644
--- a/src/main/java/com/iemr/common/mapper/EducationMapper.java
+++ b/src/main/java/com/iemr/common/mapper/EducationMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/EducationMapperDecorator.java b/src/main/java/com/iemr/common/mapper/EducationMapperDecorator.java
index 0b7078c1..e4ef4181 100644
--- a/src/main/java/com/iemr/common/mapper/EducationMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/EducationMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/FeedbackDetailsMapper.java b/src/main/java/com/iemr/common/mapper/FeedbackDetailsMapper.java
index 57e3306b..7be51c0e 100644
--- a/src/main/java/com/iemr/common/mapper/FeedbackDetailsMapper.java
+++ b/src/main/java/com/iemr/common/mapper/FeedbackDetailsMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.Mapper;
diff --git a/src/main/java/com/iemr/common/mapper/FeedbackListMapper.java b/src/main/java/com/iemr/common/mapper/FeedbackListMapper.java
index c6160c3e..d30f6653 100644
--- a/src/main/java/com/iemr/common/mapper/FeedbackListMapper.java
+++ b/src/main/java/com/iemr/common/mapper/FeedbackListMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/FeedbackRequestMapper.java b/src/main/java/com/iemr/common/mapper/FeedbackRequestMapper.java
index 1ff2b0e6..40fa6c9f 100644
--- a/src/main/java/com/iemr/common/mapper/FeedbackRequestMapper.java
+++ b/src/main/java/com/iemr/common/mapper/FeedbackRequestMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/FeedbackResponseMapper.java b/src/main/java/com/iemr/common/mapper/FeedbackResponseMapper.java
index b144ba4f..e6cf9bfd 100644
--- a/src/main/java/com/iemr/common/mapper/FeedbackResponseMapper.java
+++ b/src/main/java/com/iemr/common/mapper/FeedbackResponseMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/GenderMapper.java b/src/main/java/com/iemr/common/mapper/GenderMapper.java
index 6400c6af..971fcc29 100644
--- a/src/main/java/com/iemr/common/mapper/GenderMapper.java
+++ b/src/main/java/com/iemr/common/mapper/GenderMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/GenderMapperDecorator.java b/src/main/java/com/iemr/common/mapper/GenderMapperDecorator.java
index a948b2c8..315dd732 100644
--- a/src/main/java/com/iemr/common/mapper/GenderMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/GenderMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/GovtIdentityTypeDecorator.java b/src/main/java/com/iemr/common/mapper/GovtIdentityTypeDecorator.java
index d949eae3..23f5225a 100644
--- a/src/main/java/com/iemr/common/mapper/GovtIdentityTypeDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/GovtIdentityTypeDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/mapper/GovtIdentityTypeMapper.java b/src/main/java/com/iemr/common/mapper/GovtIdentityTypeMapper.java
index b1bdd0f3..f2bd50d3 100644
--- a/src/main/java/com/iemr/common/mapper/GovtIdentityTypeMapper.java
+++ b/src/main/java/com/iemr/common/mapper/GovtIdentityTypeMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapper.java b/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapper.java
index 86dc3d2c..1f204443 100644
--- a/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapper.java
+++ b/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapperDecorator.java b/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapperDecorator.java
index 34a45754..e25efa83 100644
--- a/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/HealthCareWorkerMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapper.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapper.java
index 59fadece..49eece57 100644
--- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapper.java
+++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java
index 03fe6981..010fbb28 100644
--- a/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/IdentityBenEditMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.math.BigInteger;
@@ -217,6 +238,8 @@ public IdentityEditDTO BenToIdentityEditMapper(BeneficiaryModel beneficiary) {
 			identityEditDTO.setVanID(beneficiary.getVanID());
 		if (beneficiary.getParkingPlaceID() != null)
 			identityEditDTO.setParkingPlaceId(beneficiary.getParkingPlaceID());
+		if (beneficiary.getI_bendemographics() != null && beneficiary.getI_bendemographics().getMonthlyFamilyIncome() != null)
+			identityEditDTO.setMonthlyFamilyIncome(beneficiary.getI_bendemographics().getMonthlyFamilyIncome());
 
 		return identityEditDTO;
 	}
diff --git a/src/main/java/com/iemr/common/mapper/IncomeStatusMapper.java b/src/main/java/com/iemr/common/mapper/IncomeStatusMapper.java
index ab678a3e..a7b9059b 100644
--- a/src/main/java/com/iemr/common/mapper/IncomeStatusMapper.java
+++ b/src/main/java/com/iemr/common/mapper/IncomeStatusMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/IncomeStatusMapperDecorator.java b/src/main/java/com/iemr/common/mapper/IncomeStatusMapperDecorator.java
index 17a43439..63d19ca8 100644
--- a/src/main/java/com/iemr/common/mapper/IncomeStatusMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/IncomeStatusMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/LanguageMapper.java b/src/main/java/com/iemr/common/mapper/LanguageMapper.java
index 760149ee..f7d7bd02 100644
--- a/src/main/java/com/iemr/common/mapper/LanguageMapper.java
+++ b/src/main/java/com/iemr/common/mapper/LanguageMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.DecoratedWith;
diff --git a/src/main/java/com/iemr/common/mapper/LanguageMapperDecorator.java b/src/main/java/com/iemr/common/mapper/LanguageMapperDecorator.java
index 55740434..912350e5 100644
--- a/src/main/java/com/iemr/common/mapper/LanguageMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/LanguageMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/LoginRoleScreenMapper.java b/src/main/java/com/iemr/common/mapper/LoginRoleScreenMapper.java
index c4514e64..19a12e17 100644
--- a/src/main/java/com/iemr/common/mapper/LoginRoleScreenMapper.java
+++ b/src/main/java/com/iemr/common/mapper/LoginRoleScreenMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/MaritalStatusMapper.java b/src/main/java/com/iemr/common/mapper/MaritalStatusMapper.java
index a4bbffa2..b68ce888 100644
--- a/src/main/java/com/iemr/common/mapper/MaritalStatusMapper.java
+++ b/src/main/java/com/iemr/common/mapper/MaritalStatusMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/MaritalStatusMapperDecorator.java b/src/main/java/com/iemr/common/mapper/MaritalStatusMapperDecorator.java
index d5141938..bce7a5b3 100644
--- a/src/main/java/com/iemr/common/mapper/MaritalStatusMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/MaritalStatusMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/OccupationMapper.java b/src/main/java/com/iemr/common/mapper/OccupationMapper.java
index 9cb6c7cf..1411d48e 100644
--- a/src/main/java/com/iemr/common/mapper/OccupationMapper.java
+++ b/src/main/java/com/iemr/common/mapper/OccupationMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.DecoratedWith;
diff --git a/src/main/java/com/iemr/common/mapper/OccupationMapperDecorator.java b/src/main/java/com/iemr/common/mapper/OccupationMapperDecorator.java
index f6567277..33159ba5 100644
--- a/src/main/java/com/iemr/common/mapper/OccupationMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/OccupationMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/OutboundCallRequestMapper.java b/src/main/java/com/iemr/common/mapper/OutboundCallRequestMapper.java
index 9c706441..2664aeee 100644
--- a/src/main/java/com/iemr/common/mapper/OutboundCallRequestMapper.java
+++ b/src/main/java/com/iemr/common/mapper/OutboundCallRequestMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/PhoneTypeMapper.java b/src/main/java/com/iemr/common/mapper/PhoneTypeMapper.java
index dc749daa..db79c0f6 100644
--- a/src/main/java/com/iemr/common/mapper/PhoneTypeMapper.java
+++ b/src/main/java/com/iemr/common/mapper/PhoneTypeMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/ProviderServiceAddressMapper.java b/src/main/java/com/iemr/common/mapper/ProviderServiceAddressMapper.java
index ec194fdf..bb55e4a9 100644
--- a/src/main/java/com/iemr/common/mapper/ProviderServiceAddressMapper.java
+++ b/src/main/java/com/iemr/common/mapper/ProviderServiceAddressMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/ProviderServiceMapper.java b/src/main/java/com/iemr/common/mapper/ProviderServiceMapper.java
index d6f10fab..1f1edf21 100644
--- a/src/main/java/com/iemr/common/mapper/ProviderServiceMapper.java
+++ b/src/main/java/com/iemr/common/mapper/ProviderServiceMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.Mapper;
diff --git a/src/main/java/com/iemr/common/mapper/RelationshipMapper.java b/src/main/java/com/iemr/common/mapper/RelationshipMapper.java
index e0b7903a..2c5ceff6 100644
--- a/src/main/java/com/iemr/common/mapper/RelationshipMapper.java
+++ b/src/main/java/com/iemr/common/mapper/RelationshipMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/RelationshipMapperDecorator.java b/src/main/java/com/iemr/common/mapper/RelationshipMapperDecorator.java
index 1da14c1b..a55c3784 100644
--- a/src/main/java/com/iemr/common/mapper/RelationshipMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/RelationshipMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/ReligionMapper.java b/src/main/java/com/iemr/common/mapper/ReligionMapper.java
index d6c70669..66b02d6e 100644
--- a/src/main/java/com/iemr/common/mapper/ReligionMapper.java
+++ b/src/main/java/com/iemr/common/mapper/ReligionMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/ReligionMapperDecorator.java b/src/main/java/com/iemr/common/mapper/ReligionMapperDecorator.java
index 4f328131..16892616 100644
--- a/src/main/java/com/iemr/common/mapper/ReligionMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/ReligionMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/Report1097Mapper.java b/src/main/java/com/iemr/common/mapper/Report1097Mapper.java
index 4aed2965..5bb7922c 100644
--- a/src/main/java/com/iemr/common/mapper/Report1097Mapper.java
+++ b/src/main/java/com/iemr/common/mapper/Report1097Mapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/RoleMapper.java b/src/main/java/com/iemr/common/mapper/RoleMapper.java
index 84ca2333..ed79a91c 100644
--- a/src/main/java/com/iemr/common/mapper/RoleMapper.java
+++ b/src/main/java/com/iemr/common/mapper/RoleMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/ScreenMapper.java b/src/main/java/com/iemr/common/mapper/ScreenMapper.java
index 020da9fc..f01214fc 100644
--- a/src/main/java/com/iemr/common/mapper/ScreenMapper.java
+++ b/src/main/java/com/iemr/common/mapper/ScreenMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/SexualOrientationMapper.java b/src/main/java/com/iemr/common/mapper/SexualOrientationMapper.java
index 284f3c81..03f1a2c6 100644
--- a/src/main/java/com/iemr/common/mapper/SexualOrientationMapper.java
+++ b/src/main/java/com/iemr/common/mapper/SexualOrientationMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/SexualOrientationMapperDecorator.java b/src/main/java/com/iemr/common/mapper/SexualOrientationMapperDecorator.java
index 4ccfa060..354ab1ac 100644
--- a/src/main/java/com/iemr/common/mapper/SexualOrientationMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/SexualOrientationMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/StateMapper.java b/src/main/java/com/iemr/common/mapper/StateMapper.java
index 8ecf4da1..8ded5640 100644
--- a/src/main/java/com/iemr/common/mapper/StateMapper.java
+++ b/src/main/java/com/iemr/common/mapper/StateMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.DecoratedWith;
diff --git a/src/main/java/com/iemr/common/mapper/StateMapperDecorator.java b/src/main/java/com/iemr/common/mapper/StateMapperDecorator.java
index 69896d64..faec401a 100644
--- a/src/main/java/com/iemr/common/mapper/StateMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/StateMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/StatusMapper.java b/src/main/java/com/iemr/common/mapper/StatusMapper.java
index c8f6fe95..6e999d49 100644
--- a/src/main/java/com/iemr/common/mapper/StatusMapper.java
+++ b/src/main/java/com/iemr/common/mapper/StatusMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.DecoratedWith;
diff --git a/src/main/java/com/iemr/common/mapper/StatusMapperDecorator.java b/src/main/java/com/iemr/common/mapper/StatusMapperDecorator.java
index d6a9a2a7..c338712a 100644
--- a/src/main/java/com/iemr/common/mapper/StatusMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/StatusMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/TitleMapper.java b/src/main/java/com/iemr/common/mapper/TitleMapper.java
index 28e9b67a..88691d9a 100644
--- a/src/main/java/com/iemr/common/mapper/TitleMapper.java
+++ b/src/main/java/com/iemr/common/mapper/TitleMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/TitleMapperDecorator.java b/src/main/java/com/iemr/common/mapper/TitleMapperDecorator.java
index 71aa9625..3c6055c5 100644
--- a/src/main/java/com/iemr/common/mapper/TitleMapperDecorator.java
+++ b/src/main/java/com/iemr/common/mapper/TitleMapperDecorator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/mapper/UserLangMapper.java b/src/main/java/com/iemr/common/mapper/UserLangMapper.java
index cdda983e..c1c56547 100644
--- a/src/main/java/com/iemr/common/mapper/UserLangMapper.java
+++ b/src/main/java/com/iemr/common/mapper/UserLangMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/UserMapper.java b/src/main/java/com/iemr/common/mapper/UserMapper.java
index da1198be..1a25f562 100644
--- a/src/main/java/com/iemr/common/mapper/UserMapper.java
+++ b/src/main/java/com/iemr/common/mapper/UserMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import org.mapstruct.Mapper;
diff --git a/src/main/java/com/iemr/common/mapper/UserServiceRoleMapper.java b/src/main/java/com/iemr/common/mapper/UserServiceRoleMapper.java
index 984b284f..0c2464b7 100644
--- a/src/main/java/com/iemr/common/mapper/UserServiceRoleMapper.java
+++ b/src/main/java/com/iemr/common/mapper/UserServiceRoleMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/sms/SMSMapper.java b/src/main/java/com/iemr/common/mapper/sms/SMSMapper.java
index 22451d47..6dce2624 100644
--- a/src/main/java/com/iemr/common/mapper/sms/SMSMapper.java
+++ b/src/main/java/com/iemr/common/mapper/sms/SMSMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper.sms;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/mapper/utils/IdentityResponseFormatter.java b/src/main/java/com/iemr/common/mapper/utils/IdentityResponseFormatter.java
index 3a52b6db..76dd86c1 100644
--- a/src/main/java/com/iemr/common/mapper/utils/IdentityResponseFormatter.java
+++ b/src/main/java/com/iemr/common/mapper/utils/IdentityResponseFormatter.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper.utils;
 
 import org.json.JSONObject;
diff --git a/src/main/java/com/iemr/common/mapper/utils/InputMapper.java b/src/main/java/com/iemr/common/mapper/utils/InputMapper.java
index a364367c..67c5059c 100644
--- a/src/main/java/com/iemr/common/mapper/utils/InputMapper.java
+++ b/src/main/java/com/iemr/common/mapper/utils/InputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.mapper.utils;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/AbhaAddressDTO.java b/src/main/java/com/iemr/common/model/beneficiary/AbhaAddressDTO.java
index 3f71a148..29d96119 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/AbhaAddressDTO.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/AbhaAddressDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.io.Serializable;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BenMedHistoryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BenMedHistoryModel.java
index d2b07ffd..cdce8e24 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BenMedHistoryModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BenMedHistoryModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BenPhoneMapModel.java b/src/main/java/com/iemr/common/model/beneficiary/BenPhoneMapModel.java
index 8c0191a9..36a81e66 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BenPhoneMapModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BenPhoneMapModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BenRelationshipTypeModel.java b/src/main/java/com/iemr/common/model/beneficiary/BenRelationshipTypeModel.java
index b35e9692..6e5d4a29 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BenRelationshipTypeModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BenRelationshipTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryCallModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryCallModel.java
index ca6bb9fa..374baae5 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryCallModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryCallModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java
index c5d2eec1..83450844 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryDemographicsModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import com.google.gson.annotations.Expose;
@@ -12,9 +33,11 @@
 import com.iemr.common.model.userbeneficiary.ReligionModel;
 import com.iemr.common.model.userbeneficiary.StateModel;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
+@AllArgsConstructor
 public class BeneficiaryDemographicsModel {
 	@Expose
 	private Long benDemographicsID;
@@ -156,6 +179,8 @@ public class BeneficiaryDemographicsModel {
 	private String incomeStatus;
 	@Expose
 	private String religion;
+	@Expose
+	private String monthlyFamilyIncome;
 
 	public BeneficiaryDemographicsModel() {
 
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryEducationModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryEducationModel.java
index 3beb1526..310794eb 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryEducationModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryEducationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryGenModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryGenModel.java
index 08fe873c..6ee62eb7 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryGenModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryGenModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryIncomeStatusModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryIncomeStatusModel.java
index 2d40841a..6a970235 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryIncomeStatusModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryIncomeStatusModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
index 1712fc92..ed0980a6 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.math.BigInteger;
@@ -20,9 +41,13 @@
 import com.iemr.common.model.userbeneficiary.SexualOrientationModel;
 import com.iemr.common.model.userbeneficiary.StatusModel;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	private static final Integer DAYS_IN_YEAR = 365;
 	private static final Integer DAYS_IN_MONTH = 30;
@@ -240,6 +265,13 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 
 	@Expose
 	private Boolean beneficiaryConsent;
+	
+	@Expose
+	private String monthlyFamilyIncome;
+	@Expose
+	private boolean emergencyRegistration;
+	
+	
 
 	public static Timestamp getTimestampData(Timestamp timestamp) {
 		return timestamp;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel104.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel104.java
index 97cff7a6..609d4ba2 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel104.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel104.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryOccupationModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryOccupationModel.java
index 31680fa6..7928c687 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryOccupationModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryOccupationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/beneficiary/CallRequestByIDModel.java b/src/main/java/com/iemr/common/model/beneficiary/CallRequestByIDModel.java
index 94485377..1fc0765e 100644
--- a/src/main/java/com/iemr/common/model/beneficiary/CallRequestByIDModel.java
+++ b/src/main/java/com/iemr/common/model/beneficiary/CallRequestByIDModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.beneficiary;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/email/EmailRequest.java b/src/main/java/com/iemr/common/model/email/EmailRequest.java
index 212cfd65..7f090bfc 100644
--- a/src/main/java/com/iemr/common/model/email/EmailRequest.java
+++ b/src/main/java/com/iemr/common/model/email/EmailRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.email;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientAddress.java b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientAddress.java
new file mode 100644
index 00000000..14f3985b
--- /dev/null
+++ b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientAddress.java
@@ -0,0 +1,23 @@
+package com.iemr.common.model.esanjeevani;
+
+import lombok.Data;
+
+@Data
+public class ESanjeevaniPatientAddress {
+	
+    public String addressLine1;
+    public String addressType;
+    public String addressUse;
+    public int blockCode;
+    public String blockDisplay;
+    public int cityCode;
+    public String cityDisplay;
+    public String countryCode;
+    public String countryDisplay;
+    public int districtCode;
+    public String districtDisplay;
+    public String postalCode;
+    public int stateCode;
+    public String stateDisplay;
+
+}
diff --git a/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientContactDetail.java b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientContactDetail.java
new file mode 100644
index 00000000..bfe63102
--- /dev/null
+++ b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientContactDetail.java
@@ -0,0 +1,13 @@
+package com.iemr.common.model.esanjeevani;
+
+import lombok.Data;
+
+@Data
+public class ESanjeevaniPatientContactDetail {
+	
+    public boolean contactPointStatus;
+    public String contactPointType;
+    public String contactPointUse;
+    public String contactPointValue;
+
+}
diff --git a/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientRegistration.java b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientRegistration.java
new file mode 100644
index 00000000..cd1e3d90
--- /dev/null
+++ b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniPatientRegistration.java
@@ -0,0 +1,29 @@
+package com.iemr.common.model.esanjeevani;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+import org.springframework.stereotype.Component;
+
+import lombok.Data;
+
+@Data
+public class ESanjeevaniPatientRegistration {
+
+    public String abhaAddress;
+    public String abhaNumber;
+    public int age;
+    public String birthdate;
+    public String displayName;
+    public String firstName;
+    public String middleName;
+    public String lastName;
+    public int genderCode;
+    public String genderDisplay;
+    public boolean isBlock;
+    public String source;
+    
+    public ArrayList<ESanjeevaniPatientAddress> lstPatientAddress;
+    public ArrayList<ESanjeevaniPatientContactDetail> lstPatientContactDetail;
+
+}
diff --git a/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniProviderAuth.java b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniProviderAuth.java
new file mode 100644
index 00000000..6b588daf
--- /dev/null
+++ b/src/main/java/com/iemr/common/model/esanjeevani/ESanjeevaniProviderAuth.java
@@ -0,0 +1,12 @@
+package com.iemr.common.model.esanjeevani;
+
+import lombok.Data;
+
+@Data
+public class ESanjeevaniProviderAuth {
+
+	private String userName;
+	private String password;
+	private String salt;
+	private String source;
+}
diff --git a/src/main/java/com/iemr/common/model/excel/Criteria.java b/src/main/java/com/iemr/common/model/excel/Criteria.java
index 9634278c..cf0cfa70 100644
--- a/src/main/java/com/iemr/common/model/excel/Criteria.java
+++ b/src/main/java/com/iemr/common/model/excel/Criteria.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.excel;
 
 public class Criteria {
diff --git a/src/main/java/com/iemr/common/model/excel/ExcelHelper.java b/src/main/java/com/iemr/common/model/excel/ExcelHelper.java
index 5dfd31b0..ffb1f4a4 100644
--- a/src/main/java/com/iemr/common/model/excel/ExcelHelper.java
+++ b/src/main/java/com/iemr/common/model/excel/ExcelHelper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.excel;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/main/java/com/iemr/common/model/feedback/AuthorityEmailID.java b/src/main/java/com/iemr/common/model/feedback/AuthorityEmailID.java
index 60d69de3..12c4ef68 100644
--- a/src/main/java/com/iemr/common/model/feedback/AuthorityEmailID.java
+++ b/src/main/java/com/iemr/common/model/feedback/AuthorityEmailID.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import javax.persistence.Column;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackDetailsModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackDetailsModel.java
index 90e64e1a..4f13209c 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackDetailsModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackDetailsModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackListRequestModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackListRequestModel.java
index cc2b930b..204aea3d 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackListRequestModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackListRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackListResponseModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackListResponseModel.java
index 1db7a876..f5d1428b 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackListResponseModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackListResponseModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackNatureDetailModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackNatureDetailModel.java
index 8006c0c9..39dc4390 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackNatureDetailModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackNatureDetailModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackRequestModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackRequestModel.java
index 3f551243..7f727101 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackRequestModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackResponseModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackResponseModel.java
index c836164c..27a92a2a 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackResponseModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackResponseModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackSeverityModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackSeverityModel.java
index 19de792e..6e84202c 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackSeverityModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackSeverityModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackStatusModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackStatusModel.java
index 53e05f05..15a58aae 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackStatusModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackStatusModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/feedback/FeedbackTypeModel.java b/src/main/java/com/iemr/common/model/feedback/FeedbackTypeModel.java
index 9b5f96a4..76597c9e 100644
--- a/src/main/java/com/iemr/common/model/feedback/FeedbackTypeModel.java
+++ b/src/main/java/com/iemr/common/model/feedback/FeedbackTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.feedback;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/institute/InstituteDirectoryMapping.java b/src/main/java/com/iemr/common/model/institute/InstituteDirectoryMapping.java
index 4fbb95cf..eefcbbfe 100644
--- a/src/main/java/com/iemr/common/model/institute/InstituteDirectoryMapping.java
+++ b/src/main/java/com/iemr/common/model/institute/InstituteDirectoryMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.institute;
 
 import com.iemr.common.model.user.SubDirectoryModel;
diff --git a/src/main/java/com/iemr/common/model/institute/InstituteModel.java b/src/main/java/com/iemr/common/model/institute/InstituteModel.java
index 13781f5c..e9cd99a2 100644
--- a/src/main/java/com/iemr/common/model/institute/InstituteModel.java
+++ b/src/main/java/com/iemr/common/model/institute/InstituteModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.institute;
 
 import com.iemr.common.model.userbeneficiary.DistrictBlockModel;
diff --git a/src/main/java/com/iemr/common/model/institute/InstituteTypeModel.java b/src/main/java/com/iemr/common/model/institute/InstituteTypeModel.java
index e4d4cafe..538e1028 100644
--- a/src/main/java/com/iemr/common/model/institute/InstituteTypeModel.java
+++ b/src/main/java/com/iemr/common/model/institute/InstituteTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.institute;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/reports/AgentWiseReport.java b/src/main/java/com/iemr/common/model/reports/AgentWiseReport.java
index cbf6f46c..83ece4ab 100644
--- a/src/main/java/com/iemr/common/model/reports/AgentWiseReport.java
+++ b/src/main/java/com/iemr/common/model/reports/AgentWiseReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/iemr/common/model/reports/CallSummaryReport.java b/src/main/java/com/iemr/common/model/reports/CallSummaryReport.java
index 40417a2c..dcf8a86b 100644
--- a/src/main/java/com/iemr/common/model/reports/CallSummaryReport.java
+++ b/src/main/java/com/iemr/common/model/reports/CallSummaryReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/reports/CallTypeWiseReport.java b/src/main/java/com/iemr/common/model/reports/CallTypeWiseReport.java
index ae45be72..cdef5570 100644
--- a/src/main/java/com/iemr/common/model/reports/CallTypeWiseReport.java
+++ b/src/main/java/com/iemr/common/model/reports/CallTypeWiseReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/iemr/common/model/reports/ComplaintDetailReport.java b/src/main/java/com/iemr/common/model/reports/ComplaintDetailReport.java
index fdaa43bf..22ea96e7 100644
--- a/src/main/java/com/iemr/common/model/reports/ComplaintDetailReport.java
+++ b/src/main/java/com/iemr/common/model/reports/ComplaintDetailReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/iemr/common/model/reports/DateWiseReport.java b/src/main/java/com/iemr/common/model/reports/DateWiseReport.java
index da5114dd..03bd26d2 100644
--- a/src/main/java/com/iemr/common/model/reports/DateWiseReport.java
+++ b/src/main/java/com/iemr/common/model/reports/DateWiseReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/reports/LocationWiseReport.java b/src/main/java/com/iemr/common/model/reports/LocationWiseReport.java
index ed8b6a0a..0d4dcba3 100644
--- a/src/main/java/com/iemr/common/model/reports/LocationWiseReport.java
+++ b/src/main/java/com/iemr/common/model/reports/LocationWiseReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/iemr/common/model/reports/QualityReportModel.java b/src/main/java/com/iemr/common/model/reports/QualityReportModel.java
index 8deb4294..b15956db 100644
--- a/src/main/java/com/iemr/common/model/reports/QualityReportModel.java
+++ b/src/main/java/com/iemr/common/model/reports/QualityReportModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/reports/Report1097RequestModel.java b/src/main/java/com/iemr/common/model/reports/Report1097RequestModel.java
index e201fb1b..09c45bc8 100644
--- a/src/main/java/com/iemr/common/model/reports/Report1097RequestModel.java
+++ b/src/main/java/com/iemr/common/model/reports/Report1097RequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/reports/Report1097ResponseModel.java b/src/main/java/com/iemr/common/model/reports/Report1097ResponseModel.java
index c47f0160..18c17d24 100644
--- a/src/main/java/com/iemr/common/model/reports/Report1097ResponseModel.java
+++ b/src/main/java/com/iemr/common/model/reports/Report1097ResponseModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/reports/SkillSetWiseReport.java b/src/main/java/com/iemr/common/model/reports/SkillSetWiseReport.java
index 3f97a620..e3eaae91 100644
--- a/src/main/java/com/iemr/common/model/reports/SkillSetWiseReport.java
+++ b/src/main/java/com/iemr/common/model/reports/SkillSetWiseReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/iemr/common/model/reports/UnBlockedUserReport.java b/src/main/java/com/iemr/common/model/reports/UnBlockedUserReport.java
index 6bdbe14d..91e90133 100644
--- a/src/main/java/com/iemr/common/model/reports/UnBlockedUserReport.java
+++ b/src/main/java/com/iemr/common/model/reports/UnBlockedUserReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.reports;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/sms/CreateSMSRequest.java b/src/main/java/com/iemr/common/model/sms/CreateSMSRequest.java
index c00f697f..358730c9 100644
--- a/src/main/java/com/iemr/common/model/sms/CreateSMSRequest.java
+++ b/src/main/java/com/iemr/common/model/sms/CreateSMSRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/model/sms/FullSMSTemplateResponse.java b/src/main/java/com/iemr/common/model/sms/FullSMSTemplateResponse.java
index 7ffc98eb..9c15d46a 100644
--- a/src/main/java/com/iemr/common/model/sms/FullSMSTemplateResponse.java
+++ b/src/main/java/com/iemr/common/model/sms/FullSMSTemplateResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/sms/SMSParameterMapModel.java b/src/main/java/com/iemr/common/model/sms/SMSParameterMapModel.java
index 403f33ed..032e90d2 100644
--- a/src/main/java/com/iemr/common/model/sms/SMSParameterMapModel.java
+++ b/src/main/java/com/iemr/common/model/sms/SMSParameterMapModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/sms/SMSParameterModel.java b/src/main/java/com/iemr/common/model/sms/SMSParameterModel.java
index 1136e7cd..45a17789 100644
--- a/src/main/java/com/iemr/common/model/sms/SMSParameterModel.java
+++ b/src/main/java/com/iemr/common/model/sms/SMSParameterModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/sms/SMSRequest.java b/src/main/java/com/iemr/common/model/sms/SMSRequest.java
index c2175661..f3494a53 100644
--- a/src/main/java/com/iemr/common/model/sms/SMSRequest.java
+++ b/src/main/java/com/iemr/common/model/sms/SMSRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import java.sql.Timestamp;
@@ -18,7 +39,7 @@ public class SMSRequest {
 	private Integer blockID;
 	private Boolean is1097 = false;
 	private Long userID;
-	private Integer InstituteID;
+	private Integer instituteID;
 	private Long feedbackID;
 	private String createdBy;
 	private String alternateNo;
diff --git a/src/main/java/com/iemr/common/model/sms/SMSTemplateResponse.java b/src/main/java/com/iemr/common/model/sms/SMSTemplateResponse.java
index f4744b39..6aebd8ad 100644
--- a/src/main/java/com/iemr/common/model/sms/SMSTemplateResponse.java
+++ b/src/main/java/com/iemr/common/model/sms/SMSTemplateResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/sms/SMSTypeModel.java b/src/main/java/com/iemr/common/model/sms/SMSTypeModel.java
index e64a7457..ff8ea53a 100644
--- a/src/main/java/com/iemr/common/model/sms/SMSTypeModel.java
+++ b/src/main/java/com/iemr/common/model/sms/SMSTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java b/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java
new file mode 100644
index 00000000..df6fbdb8
--- /dev/null
+++ b/src/main/java/com/iemr/common/model/sms/SmsAPIRequestModel.java
@@ -0,0 +1,31 @@
+package com.iemr.common.model.sms;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+@Data
+public class SmsAPIRequestModel implements Serializable{
+	
+	private String customerId;
+	private StringBuffer destinationAddress;
+	private String message;
+	private String sourceAddress;
+	private String messageType;
+	private String dltTemplateId;
+	private String entityId;
+	
+	
+	public SmsAPIRequestModel(String customerId, StringBuffer destinationAddress, String message,
+			String sourceAddress, String messageType, String dltTemplateId, String entityId) {
+		this.customerId = customerId;
+		this.destinationAddress = destinationAddress;
+		this.message = message;
+		this.sourceAddress = sourceAddress;
+		this.messageType = messageType;
+		this.dltTemplateId = dltTemplateId;
+		this.entityId = entityId;
+	}
+
+
+}
diff --git a/src/main/java/com/iemr/common/model/sms/UpdateSMSRequest.java b/src/main/java/com/iemr/common/model/sms/UpdateSMSRequest.java
index 2f16f45a..c456e01f 100644
--- a/src/main/java/com/iemr/common/model/sms/UpdateSMSRequest.java
+++ b/src/main/java/com/iemr/common/model/sms/UpdateSMSRequest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.sms;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/ChangePasswordModel.java b/src/main/java/com/iemr/common/model/user/ChangePasswordModel.java
index 96a17aff..571d6c66 100644
--- a/src/main/java/com/iemr/common/model/user/ChangePasswordModel.java
+++ b/src/main/java/com/iemr/common/model/user/ChangePasswordModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/ForceLogoutRequestModel.java b/src/main/java/com/iemr/common/model/user/ForceLogoutRequestModel.java
index 90c62490..550a79ca 100644
--- a/src/main/java/com/iemr/common/model/user/ForceLogoutRequestModel.java
+++ b/src/main/java/com/iemr/common/model/user/ForceLogoutRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/HealthCareWorkerModel.java b/src/main/java/com/iemr/common/model/user/HealthCareWorkerModel.java
index 18895e5b..f0a6592c 100644
--- a/src/main/java/com/iemr/common/model/user/HealthCareWorkerModel.java
+++ b/src/main/java/com/iemr/common/model/user/HealthCareWorkerModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/user/KMFileManagerModel.java b/src/main/java/com/iemr/common/model/user/KMFileManagerModel.java
index 690edd11..28d55637 100644
--- a/src/main/java/com/iemr/common/model/user/KMFileManagerModel.java
+++ b/src/main/java/com/iemr/common/model/user/KMFileManagerModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/LoginRequestModel.java b/src/main/java/com/iemr/common/model/user/LoginRequestModel.java
index a320669a..770eaeb4 100644
--- a/src/main/java/com/iemr/common/model/user/LoginRequestModel.java
+++ b/src/main/java/com/iemr/common/model/user/LoginRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/LoginRequestModelEverwell.java b/src/main/java/com/iemr/common/model/user/LoginRequestModelEverwell.java
index ba7f2324..c7b36096 100644
--- a/src/main/java/com/iemr/common/model/user/LoginRequestModelEverwell.java
+++ b/src/main/java/com/iemr/common/model/user/LoginRequestModelEverwell.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/LoginResponseModel.java b/src/main/java/com/iemr/common/model/user/LoginResponseModel.java
index 04168e12..10d45222 100644
--- a/src/main/java/com/iemr/common/model/user/LoginResponseModel.java
+++ b/src/main/java/com/iemr/common/model/user/LoginResponseModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/NotificationModel.java b/src/main/java/com/iemr/common/model/user/NotificationModel.java
index 80c48ef5..25913097 100644
--- a/src/main/java/com/iemr/common/model/user/NotificationModel.java
+++ b/src/main/java/com/iemr/common/model/user/NotificationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/NotificationTypeModel.java b/src/main/java/com/iemr/common/model/user/NotificationTypeModel.java
index 446d67a2..f6f53b2a 100644
--- a/src/main/java/com/iemr/common/model/user/NotificationTypeModel.java
+++ b/src/main/java/com/iemr/common/model/user/NotificationTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/OutboundCallRequestModel.java b/src/main/java/com/iemr/common/model/user/OutboundCallRequestModel.java
index 5b13a411..e1daf507 100644
--- a/src/main/java/com/iemr/common/model/user/OutboundCallRequestModel.java
+++ b/src/main/java/com/iemr/common/model/user/OutboundCallRequestModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/PhoneBlockModel.java b/src/main/java/com/iemr/common/model/user/PhoneBlockModel.java
index 2ecb8a0e..2827ea8e 100644
--- a/src/main/java/com/iemr/common/model/user/PhoneBlockModel.java
+++ b/src/main/java/com/iemr/common/model/user/PhoneBlockModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/ProviderServiceAddressMappingModel.java b/src/main/java/com/iemr/common/model/user/ProviderServiceAddressMappingModel.java
index 18bae22d..3d1e2fe9 100644
--- a/src/main/java/com/iemr/common/model/user/ProviderServiceAddressMappingModel.java
+++ b/src/main/java/com/iemr/common/model/user/ProviderServiceAddressMappingModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/ProviderServiceMappingModel.java b/src/main/java/com/iemr/common/model/user/ProviderServiceMappingModel.java
index e86d1b4c..869f71ce 100644
--- a/src/main/java/com/iemr/common/model/user/ProviderServiceMappingModel.java
+++ b/src/main/java/com/iemr/common/model/user/ProviderServiceMappingModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.iemr.common.model.userbeneficiary.StatusModel;
diff --git a/src/main/java/com/iemr/common/model/user/QuestionAnswerValidateModel.java b/src/main/java/com/iemr/common/model/user/QuestionAnswerValidateModel.java
index aafe45a1..50358775 100644
--- a/src/main/java/com/iemr/common/model/user/QuestionAnswerValidateModel.java
+++ b/src/main/java/com/iemr/common/model/user/QuestionAnswerValidateModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/RoleFeatureOutputModel.java b/src/main/java/com/iemr/common/model/user/RoleFeatureOutputModel.java
index 835cfc43..6f9fc950 100644
--- a/src/main/java/com/iemr/common/model/user/RoleFeatureOutputModel.java
+++ b/src/main/java/com/iemr/common/model/user/RoleFeatureOutputModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/model/user/RoleModel.java b/src/main/java/com/iemr/common/model/user/RoleModel.java
index 7e506c40..3313629b 100644
--- a/src/main/java/com/iemr/common/model/user/RoleModel.java
+++ b/src/main/java/com/iemr/common/model/user/RoleModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/model/user/ScreenModel.java b/src/main/java/com/iemr/common/model/user/ScreenModel.java
index b6f5edae..c91892c2 100644
--- a/src/main/java/com/iemr/common/model/user/ScreenModel.java
+++ b/src/main/java/com/iemr/common/model/user/ScreenModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/ServiceMasterModel.java b/src/main/java/com/iemr/common/model/user/ServiceMasterModel.java
index 3c097752..1805f3ec 100644
--- a/src/main/java/com/iemr/common/model/user/ServiceMasterModel.java
+++ b/src/main/java/com/iemr/common/model/user/ServiceMasterModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/ServiceProviderModel.java b/src/main/java/com/iemr/common/model/user/ServiceProviderModel.java
index f09f684a..a831ddd5 100644
--- a/src/main/java/com/iemr/common/model/user/ServiceProviderModel.java
+++ b/src/main/java/com/iemr/common/model/user/ServiceProviderModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Date;
diff --git a/src/main/java/com/iemr/common/model/user/ServiceRoleScreenMappingModel.java b/src/main/java/com/iemr/common/model/user/ServiceRoleScreenMappingModel.java
index bed70338..cece342a 100644
--- a/src/main/java/com/iemr/common/model/user/ServiceRoleScreenMappingModel.java
+++ b/src/main/java/com/iemr/common/model/user/ServiceRoleScreenMappingModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/SubDirectoryModel.java b/src/main/java/com/iemr/common/model/user/SubDirectoryModel.java
index 7f56b41f..2c3a8b5a 100644
--- a/src/main/java/com/iemr/common/model/user/SubDirectoryModel.java
+++ b/src/main/java/com/iemr/common/model/user/SubDirectoryModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/SubServiceModel.java b/src/main/java/com/iemr/common/model/user/SubServiceModel.java
index 279500b4..a56858de 100644
--- a/src/main/java/com/iemr/common/model/user/SubServiceModel.java
+++ b/src/main/java/com/iemr/common/model/user/SubServiceModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/user/TitleModel.java b/src/main/java/com/iemr/common/model/user/TitleModel.java
index e1dd3ede..9b60a18a 100644
--- a/src/main/java/com/iemr/common/model/user/TitleModel.java
+++ b/src/main/java/com/iemr/common/model/user/TitleModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/user/UserDemographicsModel.java b/src/main/java/com/iemr/common/model/user/UserDemographicsModel.java
index 8524b7f2..63f471fc 100644
--- a/src/main/java/com/iemr/common/model/user/UserDemographicsModel.java
+++ b/src/main/java/com/iemr/common/model/user/UserDemographicsModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.iemr.common.model.userbeneficiary.CityModel;
diff --git a/src/main/java/com/iemr/common/model/user/UserLangMappingModel.java b/src/main/java/com/iemr/common/model/user/UserLangMappingModel.java
index 0c7b5987..5f0f64d7 100644
--- a/src/main/java/com/iemr/common/model/user/UserLangMappingModel.java
+++ b/src/main/java/com/iemr/common/model/user/UserLangMappingModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.iemr.common.model.userbeneficiary.LanguageModel;
diff --git a/src/main/java/com/iemr/common/model/user/UserModel.java b/src/main/java/com/iemr/common/model/user/UserModel.java
index 391e0053..2971fbf9 100644
--- a/src/main/java/com/iemr/common/model/user/UserModel.java
+++ b/src/main/java/com/iemr/common/model/user/UserModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/model/user/UserServiceRoleMappingModel.java b/src/main/java/com/iemr/common/model/user/UserServiceRoleMappingModel.java
index 743be0cf..59f6f727 100644
--- a/src/main/java/com/iemr/common/model/user/UserServiceRoleMappingModel.java
+++ b/src/main/java/com/iemr/common/model/user/UserServiceRoleMappingModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import com.iemr.common.model.userbeneficiary.StatusModel;
diff --git a/src/main/java/com/iemr/common/model/user/WorkLocationModel.java b/src/main/java/com/iemr/common/model/user/WorkLocationModel.java
index 30690662..d4956d3a 100644
--- a/src/main/java/com/iemr/common/model/user/WorkLocationModel.java
+++ b/src/main/java/com/iemr/common/model/user/WorkLocationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.user;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/BeneficiaryIdentityModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/BeneficiaryIdentityModel.java
index 4d069043..5457e188 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/BeneficiaryIdentityModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/BeneficiaryIdentityModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/CityModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/CityModel.java
index f4ae56ef..86841f52 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/CityModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/CityModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/CommunityModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/CommunityModel.java
index b56e4412..b2d92ec5 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/CommunityModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/CommunityModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/CountryModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/CountryModel.java
index 3ac23e72..198deb7f 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/CountryModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/CountryModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/DesignationModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/DesignationModel.java
index ca8960ea..235f8bf9 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/DesignationModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/DesignationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/DirectoryModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/DirectoryModel.java
index 88f67ee2..ed2951e4 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/DirectoryModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/DirectoryModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBlockModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBlockModel.java
index bde67256..ba1117c1 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBlockModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBlockModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBranchModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBranchModel.java
index e3f98066..709fa222 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBranchModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictBranchModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictModel.java
index 7cc1f541..049137b8 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/DistrictModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/DistrictModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/EmailStatusModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/EmailStatusModel.java
index b3684ccd..04ef0725 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/EmailStatusModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/EmailStatusModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/EmergencyContactsModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/EmergencyContactsModel.java
index de6728d5..f2be9217 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/EmergencyContactsModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/EmergencyContactsModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.iemr.common.model.user.NotificationTypeModel;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/GenderModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/GenderModel.java
index 9f296bf7..734a7078 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/GenderModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/GenderModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/GovtIdentityTypeModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/GovtIdentityTypeModel.java
index 6dde9074..25a5eab5 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/GovtIdentityTypeModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/GovtIdentityTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/LanguageModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/LanguageModel.java
index 4904ba17..d1771e25 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/LanguageModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/LanguageModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/MaritalStatusModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/MaritalStatusModel.java
index 32502a71..5de6c445 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/MaritalStatusModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/MaritalStatusModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/PhoneTypeModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/PhoneTypeModel.java
index ff2310c6..2e56ce54 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/PhoneTypeModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/PhoneTypeModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/ReligionModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/ReligionModel.java
index 12b8ddbc..87c4ab72 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/ReligionModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/ReligionModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/SexualOrientationModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/SexualOrientationModel.java
index 8e8775e3..9c071c8e 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/SexualOrientationModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/SexualOrientationModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/StateModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/StateModel.java
index d3b9d473..1029d69c 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/StateModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/StateModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/model/userbeneficiary/StatusModel.java b/src/main/java/com/iemr/common/model/userbeneficiary/StatusModel.java
index 5105f487..f7a26d31 100644
--- a/src/main/java/com/iemr/common/model/userbeneficiary/StatusModel.java
+++ b/src/main/java/com/iemr/common/model/userbeneficiary/StatusModel.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.model.userbeneficiary;
 
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationChangeStatusDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationChangeStatusDTO.java
index a0dfa076..272614e4 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationChangeStatusDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationChangeStatusDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCount.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCount.java
index 551309bf..4f90a6fc 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCount.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCount.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCountDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCountDTO.java
index ae261dd9..b086b9da 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCountDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationCountDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetail.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetail.java
index efe77ded..7299b48e 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetail.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetail.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetailDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetailDTO.java
index 8af1c585..228c9fa1 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetailDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationDetailDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationSetDeleteDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationSetDeleteDTO.java
index 59e99a6c..9f6fb521 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationSetDeleteDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/AlertAndNotificationSetDeleteDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/SuccessObjectDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/SuccessObjectDTO.java
index 43e329b3..9f09ce40 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/SuccessObjectDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/SuccessObjectDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationCreateDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationCreateDTO.java
index eb64fad6..891cbd46 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationCreateDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationCreateDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMaxDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMaxDTO.java
index a59d92ae..dd4ce737 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMaxDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMaxDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMinDTO.java b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMinDTO.java
index e68b6dfe..5dade390 100644
--- a/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMinDTO.java
+++ b/src/main/java/com/iemr/common/notification/agent/DTO/UserNotificationDisplayMinDTO.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent.DTO;
 
 import lombok.Data;
diff --git a/src/main/java/com/iemr/common/notification/agent/UserNotificationMapping.java b/src/main/java/com/iemr/common/notification/agent/UserNotificationMapping.java
index 48ff8b46..39158401 100644
--- a/src/main/java/com/iemr/common/notification/agent/UserNotificationMapping.java
+++ b/src/main/java/com/iemr/common/notification/agent/UserNotificationMapping.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java
index cc8ba2fd..ad48e62e 100644
--- a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java
+++ b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingRepo.java b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingRepo.java
index 15784ba4..a59bbc1f 100644
--- a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingRepo.java
+++ b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingService.java b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingService.java
index af708ba4..d093a92c 100644
--- a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingService.java
+++ b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.agent;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/notification/exception/IEMRException.java b/src/main/java/com/iemr/common/notification/exception/IEMRException.java
index e978cceb..7e557405 100644
--- a/src/main/java/com/iemr/common/notification/exception/IEMRException.java
+++ b/src/main/java/com/iemr/common/notification/exception/IEMRException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.exception;
 
 public class IEMRException extends Exception {
diff --git a/src/main/java/com/iemr/common/notification/exception/IllegalActionException.java b/src/main/java/com/iemr/common/notification/exception/IllegalActionException.java
index 18cc434f..f5194a8e 100644
--- a/src/main/java/com/iemr/common/notification/exception/IllegalActionException.java
+++ b/src/main/java/com/iemr/common/notification/exception/IllegalActionException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.exception;
 
 public class IllegalActionException extends Exception {
diff --git a/src/main/java/com/iemr/common/notification/exception/MissingMandatoryFieldsException.java b/src/main/java/com/iemr/common/notification/exception/MissingMandatoryFieldsException.java
index f4ee41fb..c49e42d2 100644
--- a/src/main/java/com/iemr/common/notification/exception/MissingMandatoryFieldsException.java
+++ b/src/main/java/com/iemr/common/notification/exception/MissingMandatoryFieldsException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.exception;
 
 public class MissingMandatoryFieldsException extends Exception {
diff --git a/src/main/java/com/iemr/common/notification/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/notification/exception/SearchCriteriaException.java
index bfe0939a..b802c5de 100644
--- a/src/main/java/com/iemr/common/notification/exception/SearchCriteriaException.java
+++ b/src/main/java/com/iemr/common/notification/exception/SearchCriteriaException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.exception;
 
 public class SearchCriteriaException {
diff --git a/src/main/java/com/iemr/common/notification/util/InputMapper.java b/src/main/java/com/iemr/common/notification/util/InputMapper.java
index 00c04491..23303b81 100644
--- a/src/main/java/com/iemr/common/notification/util/InputMapper.java
+++ b/src/main/java/com/iemr/common/notification/util/InputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.util;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/notification/util/OutputMapper.java b/src/main/java/com/iemr/common/notification/util/OutputMapper.java
index 95f606b9..86ce0f4f 100644
--- a/src/main/java/com/iemr/common/notification/util/OutputMapper.java
+++ b/src/main/java/com/iemr/common/notification/util/OutputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.util;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/com/iemr/common/notification/util/OutputResponse.java b/src/main/java/com/iemr/common/notification/util/OutputResponse.java
index 25d2680a..bbf037c7 100644
--- a/src/main/java/com/iemr/common/notification/util/OutputResponse.java
+++ b/src/main/java/com/iemr/common/notification/util/OutputResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification.util;
 
 import java.util.Calendar;
diff --git a/src/main/java/com/iemr/common/repo/door_to_door_app/V_doortodooruserdetailsRepo.java b/src/main/java/com/iemr/common/repo/door_to_door_app/V_doortodooruserdetailsRepo.java
index 1c6579fe..21c252bc 100644
--- a/src/main/java/com/iemr/common/repo/door_to_door_app/V_doortodooruserdetailsRepo.java
+++ b/src/main/java/com/iemr/common/repo/door_to_door_app/V_doortodooruserdetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repo.door_to_door_app;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repo/esanjeevani/ESanjeevaniRepo.java b/src/main/java/com/iemr/common/repo/esanjeevani/ESanjeevaniRepo.java
new file mode 100644
index 00000000..48806c41
--- /dev/null
+++ b/src/main/java/com/iemr/common/repo/esanjeevani/ESanjeevaniRepo.java
@@ -0,0 +1,47 @@
+package com.iemr.common.repo.esanjeevani;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RestResource;
+import org.springframework.stereotype.Repository;
+
+import com.iemr.common.data.door_to_door_app.V_doortodooruserdetails;
+@Repository
+@RestResource(exported = false)
+public interface ESanjeevaniRepo extends CrudRepository<V_doortodooruserdetails, Integer>{
+	
+	@Query(nativeQuery = true, value = "SELECT BenDetailsId AS benDetailsId, BenAddressId AS benAddressId,  BenContactsId AS benContactsId  FROM db_identity.i_beneficiarymapping WHERE BenRegId = :benRegID")
+	public List<Object[]> getBeneficiaryMappingIds(@Param("benRegID") Long benRegID);
+
+
+	@Query(nativeQuery = true, value = "SELECT FirstName, LastName, MiddleName, Gender, DOB FROM db_identity.i_beneficiarydetails WHERE BeneficiaryDetailsId = :benDetailsId")
+	public List<Object[]> getBeneficiaryDeatils(@Param("benDetailsId") BigInteger benDetailsId);
+	
+	@Query(nativeQuery = true, value = "SELECT PreferredPhoneNum FROM db_identity.i_beneficiarycontacts WHERE BenContactsID = :benContactId")
+	public String getBeneficiaryContactDetails(@Param("benContactId") BigInteger benContactId);
+	
+	@Query(nativeQuery = true, value = "SELECT CurrCountryId, CurrCountry, CurrStateId, CurrState, CurrDistrictId, CurrDistrict, CurrSubDistrictId, CurrSubDistrict, "
+			+ "CurrAddrLine1, CurrPinCode FROM db_identity.i_beneficiaryaddress WHERE BenAddressID = :benAddressId")
+	public List<Object[]> getBeneficiaryAddressDetails(@Param("benAddressId") BigInteger benAddressId);
+	
+	@Query(nativeQuery = true, value = "SELECT HealthID AS healthId, HealthIDNumber AS healthIdNumber FROM db_iemr.m_benhealthidmapping WHERE BeneficiaryRegID = :benRegID")
+	public List<Object[]> getBeneficiaryHealthIdDeatils(@Param("benRegID") Long benRegID);
+	
+	@Query(nativeQuery = true, value = "SELECT GovtStateID FROM db_iemr.m_state WHERE StateID = :stateId ")
+	public Integer getGovStateId(@Param("stateId") Integer stateId);
+	
+	@Query(nativeQuery = true, value = "SELECT GovtDistrictID FROM db_iemr.m_district WHERE DistrictID = :districtId ")
+	public Integer getGovDistrictId(@Param("districtId") Integer districtId);
+	
+	@Query(nativeQuery = true, value = "SELECT GovSubDistrictID,GovVillageID,VillageName FROM db_iemr.m_districtbranchmapping WHERE DistrictBranchID = :subDistrictId ")
+	public List<Object[]> getGovSubDistrictId(@Param("subDistrictId") Integer subDistrictId);
+	
+	@Query(nativeQuery = true, value = "SELECT CountryCode FROM db_iemr.m_country WHERE CountryID = :countryID ")
+	public String getGovCountyId(@Param("countryID") Integer countryID);
+}
diff --git a/src/main/java/com/iemr/common/repo/lungassessment/LungAssessmentRepository.java b/src/main/java/com/iemr/common/repo/lungassessment/LungAssessmentRepository.java
new file mode 100644
index 00000000..d6d80c5d
--- /dev/null
+++ b/src/main/java/com/iemr/common/repo/lungassessment/LungAssessmentRepository.java
@@ -0,0 +1,38 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.repo.lungassessment;
+
+import java.util.List;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RestResource;
+import org.springframework.stereotype.Repository;
+
+import com.iemr.common.data.lungassessment.LungAssessment;
+
+@Repository
+@RestResource(exported = false)
+public interface LungAssessmentRepository extends CrudRepository<LungAssessment, Long> {
+	public List<LungAssessment> findByAssessmentId(String assessmentId);
+
+	public List<LungAssessment> findByPatientId(Long patientId);
+}
diff --git a/src/main/java/com/iemr/common/repo/snomedct/SnomedRepository.java b/src/main/java/com/iemr/common/repo/snomedct/SnomedRepository.java
index 9dff6116..b6cc73b3 100644
--- a/src/main/java/com/iemr/common/repo/snomedct/SnomedRepository.java
+++ b/src/main/java/com/iemr/common/repo/snomedct/SnomedRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repo.snomedct;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repo/swaasa/SwaasaRepository.java b/src/main/java/com/iemr/common/repo/swaasa/SwaasaRepository.java
deleted file mode 100644
index 8f01a75e..00000000
--- a/src/main/java/com/iemr/common/repo/swaasa/SwaasaRepository.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iemr.common.repo.swaasa;
-
-import java.util.List;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.rest.core.annotation.RestResource;
-import org.springframework.stereotype.Repository;
-
-import com.iemr.common.data.swaasa.Swaasa;
-
-@Repository
-@RestResource(exported = false)
-public interface SwaasaRepository extends CrudRepository<Swaasa, Long> {
-	public List<Swaasa> findByAssessmentId(String assessmentId);
-
-	public List<Swaasa> findByPatientId(Long patientId);
-}
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/BenPhoneMapRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/BenPhoneMapRepository.java
index 3cf21eac..b0498182 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/BenPhoneMapRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/BenPhoneMapRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 //@Repository
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryOccupationRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryOccupationRepository.java
index 675853fb..bc7d6b25 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryOccupationRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryOccupationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryRelationshipTypeRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryRelationshipTypeRepository.java
index c2d2e027..3956c3c2 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryRelationshipTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/BeneficiaryRelationshipTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/CommunityRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/CommunityRepository.java
index f89a5822..fe1e72ac 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/CommunityRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/CommunityRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/EducationRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/EducationRepository.java
index d9bcfe17..6eecb4cd 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/EducationRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/EducationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/GovtIdentityTypeRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/GovtIdentityTypeRepository.java
index ae147151..18c66179 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/GovtIdentityTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/GovtIdentityTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/IEMRBeneficiaryTypeRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/IEMRBeneficiaryTypeRepository.java
index 7edc0317..d5b2fb60 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/IEMRBeneficiaryTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/IEMRBeneficiaryTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/beneficiary/IncomeStatusRepository.java b/src/main/java/com/iemr/common/repository/beneficiary/IncomeStatusRepository.java
index a047aad0..23f99144 100644
--- a/src/main/java/com/iemr/common/repository/beneficiary/IncomeStatusRepository.java
+++ b/src/main/java/com/iemr/common/repository/beneficiary/IncomeStatusRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.beneficiary;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/brd/BRDIntegrationRepository.java b/src/main/java/com/iemr/common/repository/brd/BRDIntegrationRepository.java
index 0a4b4fcf..5433474a 100644
--- a/src/main/java/com/iemr/common/repository/brd/BRDIntegrationRepository.java
+++ b/src/main/java/com/iemr/common/repository/brd/BRDIntegrationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.brd;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java b/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java
index 80687c3e..db754c0a 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.callhandling;
 
 import java.sql.Timestamp;
@@ -162,4 +183,7 @@ public int updateVoiceFilePathNew(@Param("agentID") String agentID, @Param("call
 	public ArrayList<BeneficiaryCall> getExistingBCByCallIDAndAgentID(@Param("callID") String callID,
 			@Param("agentID") String agentID);
 
+	@Query(value="select CallTypeID from db_iemr.m_callType where CallType='default null callType' order by CreatedDate DESC LIMIT 1",nativeQuery=true)
+	public Integer getCallTypeId();
+
 }
diff --git a/src/main/java/com/iemr/common/repository/callhandling/DialPreferenceManualRepository.java b/src/main/java/com/iemr/common/repository/callhandling/DialPreferenceManualRepository.java
index 4b061785..6db41929 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/DialPreferenceManualRepository.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/DialPreferenceManualRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.callhandling;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java b/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java
index 9599908a..adfc6c42 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.callhandling;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/callhandling/OutboundCallRequestRepository.java b/src/main/java/com/iemr/common/repository/callhandling/OutboundCallRequestRepository.java
index db30ccb4..c7220b4c 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/OutboundCallRequestRepository.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/OutboundCallRequestRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 
 package com.iemr.common.repository.callhandling;
 
diff --git a/src/main/java/com/iemr/common/repository/callhandling/PhoneBlockRepository.java b/src/main/java/com/iemr/common/repository/callhandling/PhoneBlockRepository.java
index bcaf3012..8d215476 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/PhoneBlockRepository.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/PhoneBlockRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.callhandling;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/callhandling/TCRequestModelRepo.java b/src/main/java/com/iemr/common/repository/callhandling/TCRequestModelRepo.java
index 61bbba40..dfd436a0 100644
--- a/src/main/java/com/iemr/common/repository/callhandling/TCRequestModelRepo.java
+++ b/src/main/java/com/iemr/common/repository/callhandling/TCRequestModelRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.callhandling;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/repository/category/CategoryRepository.java b/src/main/java/com/iemr/common/repository/category/CategoryRepository.java
index d1590ec2..c08bdf1c 100644
--- a/src/main/java/com/iemr/common/repository/category/CategoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/category/CategoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.category;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/category/SubCategoryRepository.java b/src/main/java/com/iemr/common/repository/category/SubCategoryRepository.java
index 7e7d6a97..3b739ccc 100644
--- a/src/main/java/com/iemr/common/repository/category/SubCategoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/category/SubCategoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.category;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/directory/DirectoryMappingRepository.java b/src/main/java/com/iemr/common/repository/directory/DirectoryMappingRepository.java
index b27590f1..4296a75a 100644
--- a/src/main/java/com/iemr/common/repository/directory/DirectoryMappingRepository.java
+++ b/src/main/java/com/iemr/common/repository/directory/DirectoryMappingRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/directory/DirectoryRepository.java b/src/main/java/com/iemr/common/repository/directory/DirectoryRepository.java
index 7533774c..265c6054 100644
--- a/src/main/java/com/iemr/common/repository/directory/DirectoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/directory/DirectoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/directory/SubDirectoryRepository.java b/src/main/java/com/iemr/common/repository/directory/SubDirectoryRepository.java
index cdf4cbfc..90dbc04d 100644
--- a/src/main/java/com/iemr/common/repository/directory/SubDirectoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/directory/SubDirectoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.directory;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/email/EmailRepository.java b/src/main/java/com/iemr/common/repository/email/EmailRepository.java
index 83c17fd9..c55b144d 100644
--- a/src/main/java/com/iemr/common/repository/email/EmailRepository.java
+++ b/src/main/java/com/iemr/common/repository/email/EmailRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.email;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/email/MDSR_CDREmailRepository.java b/src/main/java/com/iemr/common/repository/email/MDSR_CDREmailRepository.java
index eb919006..7949b575 100644
--- a/src/main/java/com/iemr/common/repository/email/MDSR_CDREmailRepository.java
+++ b/src/main/java/com/iemr/common/repository/email/MDSR_CDREmailRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.email;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/email/StockAlertDataRepo.java b/src/main/java/com/iemr/common/repository/email/StockAlertDataRepo.java
index 2b3a402c..93879ada 100644
--- a/src/main/java/com/iemr/common/repository/email/StockAlertDataRepo.java
+++ b/src/main/java/com/iemr/common/repository/email/StockAlertDataRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.email;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/everwell/EverwellCallHandlingRepository.java b/src/main/java/com/iemr/common/repository/everwell/EverwellCallHandlingRepository.java
index c6ca258c..dc2b636c 100644
--- a/src/main/java/com/iemr/common/repository/everwell/EverwellCallHandlingRepository.java
+++ b/src/main/java/com/iemr/common/repository/everwell/EverwellCallHandlingRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/everwell/EverwellFeedbackRepo.java b/src/main/java/com/iemr/common/repository/everwell/EverwellFeedbackRepo.java
index 9359d296..579fb1c7 100644
--- a/src/main/java/com/iemr/common/repository/everwell/EverwellFeedbackRepo.java
+++ b/src/main/java/com/iemr/common/repository/everwell/EverwellFeedbackRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/everwell/EverwellFetchAndSync.java b/src/main/java/com/iemr/common/repository/everwell/EverwellFetchAndSync.java
index 636c1e5a..f0bb915c 100644
--- a/src/main/java/com/iemr/common/repository/everwell/EverwellFetchAndSync.java
+++ b/src/main/java/com/iemr/common/repository/everwell/EverwellFetchAndSync.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/feedback/BalVivahComplaintRepo.java b/src/main/java/com/iemr/common/repository/feedback/BalVivahComplaintRepo.java
index 10f36881..63fe5ab4 100644
--- a/src/main/java/com/iemr/common/repository/feedback/BalVivahComplaintRepo.java
+++ b/src/main/java/com/iemr/common/repository/feedback/BalVivahComplaintRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/repository/feedback/EmailStatusRepository.java b/src/main/java/com/iemr/common/repository/feedback/EmailStatusRepository.java
index 0c45d11a..71d4f4e6 100644
--- a/src/main/java/com/iemr/common/repository/feedback/EmailStatusRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/EmailStatusRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackLogRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackLogRepository.java
index 592b11e3..838222c3 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackLogRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackLogRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackRepository.java
index 69c83ec3..506c0f1c 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackRequestRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackRequestRepository.java
index d3ab7811..efb81ea8 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackRequestRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackRequestRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackResponseRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackResponseRepository.java
index c27df363..6d88207e 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackResponseRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackResponseRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackSeverityRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackSeverityRepository.java
index 9e8cbdc9..4046b4de 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackSeverityRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackSeverityRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackStatusRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackStatusRepository.java
index 20a50e66..3f603ca1 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackStatusRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackStatusRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/feedback/FeedbackTypeRepository.java b/src/main/java/com/iemr/common/repository/feedback/FeedbackTypeRepository.java
index 2c4bd03e..3838af3f 100644
--- a/src/main/java/com/iemr/common/repository/feedback/FeedbackTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/feedback/FeedbackTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/feedback/T_EpidemicOutbreakRepo.java b/src/main/java/com/iemr/common/repository/feedback/T_EpidemicOutbreakRepo.java
index 579a4ac7..fba84b0f 100644
--- a/src/main/java/com/iemr/common/repository/feedback/T_EpidemicOutbreakRepo.java
+++ b/src/main/java/com/iemr/common/repository/feedback/T_EpidemicOutbreakRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.feedback;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/repository/helpline104history/H104BenHistoryRepository.java b/src/main/java/com/iemr/common/repository/helpline104history/H104BenHistoryRepository.java
index cd04b367..788cbd43 100644
--- a/src/main/java/com/iemr/common/repository/helpline104history/H104BenHistoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/helpline104history/H104BenHistoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.helpline104history;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/helpline104history/PrescribedDrugRepository.java b/src/main/java/com/iemr/common/repository/helpline104history/PrescribedDrugRepository.java
index 0f726253..3bb2f9ae 100644
--- a/src/main/java/com/iemr/common/repository/helpline104history/PrescribedDrugRepository.java
+++ b/src/main/java/com/iemr/common/repository/helpline104history/PrescribedDrugRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.helpline104history;
 
 
diff --git a/src/main/java/com/iemr/common/repository/institute/DesignationRepository.java b/src/main/java/com/iemr/common/repository/institute/DesignationRepository.java
index b851149d..485526ae 100644
--- a/src/main/java/com/iemr/common/repository/institute/DesignationRepository.java
+++ b/src/main/java/com/iemr/common/repository/institute/DesignationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.institute;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/institute/InstituteRepository.java b/src/main/java/com/iemr/common/repository/institute/InstituteRepository.java
index 0ea06e7f..f3e41bf8 100644
--- a/src/main/java/com/iemr/common/repository/institute/InstituteRepository.java
+++ b/src/main/java/com/iemr/common/repository/institute/InstituteRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.institute;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/institute/InstituteTypeRepository.java b/src/main/java/com/iemr/common/repository/institute/InstituteTypeRepository.java
index 12ee97f4..66f5c546 100644
--- a/src/main/java/com/iemr/common/repository/institute/InstituteTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/institute/InstituteTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.institute;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/kmfilemanager/KMFileManagerRepository.java b/src/main/java/com/iemr/common/repository/kmfilemanager/KMFileManagerRepository.java
index 33a8f270..88592781 100644
--- a/src/main/java/com/iemr/common/repository/kmfilemanager/KMFileManagerRepository.java
+++ b/src/main/java/com/iemr/common/repository/kmfilemanager/KMFileManagerRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.kmfilemanager;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationCityRepository.java b/src/main/java/com/iemr/common/repository/location/LocationCityRepository.java
index 2d8ee36d..a4ea163b 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationCityRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationCityRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationCountryRepository.java b/src/main/java/com/iemr/common/repository/location/LocationCountryRepository.java
index 594bf435..df637831 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationCountryRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationCountryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationDistrictBlockRepository.java b/src/main/java/com/iemr/common/repository/location/LocationDistrictBlockRepository.java
index a6be97a1..4202ea11 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationDistrictBlockRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationDistrictBlockRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationDistrictRepository.java b/src/main/java/com/iemr/common/repository/location/LocationDistrictRepository.java
index 630f0327..011f9602 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationDistrictRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationDistrictRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationDistrilctBranchRepository.java b/src/main/java/com/iemr/common/repository/location/LocationDistrilctBranchRepository.java
index 101a6b5d..07386bbc 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationDistrilctBranchRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationDistrilctBranchRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java b/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java
index 10211941..02785c0d 100644
--- a/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java
+++ b/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.location;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/lonic/LonicRepository.java b/src/main/java/com/iemr/common/repository/lonic/LonicRepository.java
index b7acafa0..93288a9f 100644
--- a/src/main/java/com/iemr/common/repository/lonic/LonicRepository.java
+++ b/src/main/java/com/iemr/common/repository/lonic/LonicRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.lonic;
 
 
diff --git a/src/main/java/com/iemr/common/repository/mctshistory/OutboundHistoryRepository.java b/src/main/java/com/iemr/common/repository/mctshistory/OutboundHistoryRepository.java
index b223d68f..d9a12d75 100644
--- a/src/main/java/com/iemr/common/repository/mctshistory/OutboundHistoryRepository.java
+++ b/src/main/java/com/iemr/common/repository/mctshistory/OutboundHistoryRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.mctshistory;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/mctshistory/OutboundResponseRepository.java b/src/main/java/com/iemr/common/repository/mctshistory/OutboundResponseRepository.java
index 60f28076..11a9b8c9 100644
--- a/src/main/java/com/iemr/common/repository/mctshistory/OutboundResponseRepository.java
+++ b/src/main/java/com/iemr/common/repository/mctshistory/OutboundResponseRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.mctshistory;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/nhm_dashboard/AbandonCallSummaryRepo.java b/src/main/java/com/iemr/common/repository/nhm_dashboard/AbandonCallSummaryRepo.java
index 19e547b4..49d266d9 100644
--- a/src/main/java/com/iemr/common/repository/nhm_dashboard/AbandonCallSummaryRepo.java
+++ b/src/main/java/com/iemr/common/repository/nhm_dashboard/AbandonCallSummaryRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.nhm_dashboard;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/nhm_dashboard/AgentSummaryReportRepo.java b/src/main/java/com/iemr/common/repository/nhm_dashboard/AgentSummaryReportRepo.java
index 275ef399..29a4142f 100644
--- a/src/main/java/com/iemr/common/repository/nhm_dashboard/AgentSummaryReportRepo.java
+++ b/src/main/java/com/iemr/common/repository/nhm_dashboard/AgentSummaryReportRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.nhm_dashboard;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/nhm_dashboard/DetailedCallReportRepo.java b/src/main/java/com/iemr/common/repository/nhm_dashboard/DetailedCallReportRepo.java
index c67e4bba..bb89881b 100644
--- a/src/main/java/com/iemr/common/repository/nhm_dashboard/DetailedCallReportRepo.java
+++ b/src/main/java/com/iemr/common/repository/nhm_dashboard/DetailedCallReportRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.nhm_dashboard;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/nhm_dashboard/LineCallSummaryRepo.java b/src/main/java/com/iemr/common/repository/nhm_dashboard/LineCallSummaryRepo.java
index f8100099..27a26938 100644
--- a/src/main/java/com/iemr/common/repository/nhm_dashboard/LineCallSummaryRepo.java
+++ b/src/main/java/com/iemr/common/repository/nhm_dashboard/LineCallSummaryRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.nhm_dashboard;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/nhm_dashboard/NHMAgentRealTimeDataRepo.java b/src/main/java/com/iemr/common/repository/nhm_dashboard/NHMAgentRealTimeDataRepo.java
new file mode 100644
index 00000000..971f692c
--- /dev/null
+++ b/src/main/java/com/iemr/common/repository/nhm_dashboard/NHMAgentRealTimeDataRepo.java
@@ -0,0 +1,10 @@
+package com.iemr.common.repository.nhm_dashboard;
+
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import com.iemr.common.data.nhm_dashboard.AgentRealTimeData;
+@Repository
+public interface NHMAgentRealTimeDataRepo extends CrudRepository<AgentRealTimeData, Long>{
+
+}
diff --git a/src/main/java/com/iemr/common/repository/notification/EmergencyContactsRepository.java b/src/main/java/com/iemr/common/repository/notification/EmergencyContactsRepository.java
index 22831db8..dfe6b172 100644
--- a/src/main/java/com/iemr/common/repository/notification/EmergencyContactsRepository.java
+++ b/src/main/java/com/iemr/common/repository/notification/EmergencyContactsRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.notification;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/notification/NotificationRepository.java b/src/main/java/com/iemr/common/repository/notification/NotificationRepository.java
index 884135b4..d9bf12fa 100644
--- a/src/main/java/com/iemr/common/repository/notification/NotificationRepository.java
+++ b/src/main/java/com/iemr/common/repository/notification/NotificationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.notification;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/notification/NotificationTypeRepository.java b/src/main/java/com/iemr/common/repository/notification/NotificationTypeRepository.java
index 850237eb..9caa7344 100644
--- a/src/main/java/com/iemr/common/repository/notification/NotificationTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/notification/NotificationTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.notification;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/questionconfig/QuestionTypeRepository.java b/src/main/java/com/iemr/common/repository/questionconfig/QuestionTypeRepository.java
index 544fd83c..c5797d0e 100644
--- a/src/main/java/com/iemr/common/repository/questionconfig/QuestionTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/questionconfig/QuestionTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.questionconfig;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/questionconfig/QuestionnaireRepository.java b/src/main/java/com/iemr/common/repository/questionconfig/QuestionnaireRepository.java
index 4782389a..8b6dca59 100644
--- a/src/main/java/com/iemr/common/repository/questionconfig/QuestionnaireRepository.java
+++ b/src/main/java/com/iemr/common/repository/questionconfig/QuestionnaireRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.questionconfig;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/report/CRMCallReportRepo.java b/src/main/java/com/iemr/common/repository/report/CRMCallReportRepo.java
index 6be59d58..a197d6b2 100644
--- a/src/main/java/com/iemr/common/repository/report/CRMCallReportRepo.java
+++ b/src/main/java/com/iemr/common/repository/report/CRMCallReportRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.report;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/report/CallReportRepo.java b/src/main/java/com/iemr/common/repository/report/CallReportRepo.java
index b0d9a1ad..61341eaf 100644
--- a/src/main/java/com/iemr/common/repository/report/CallReportRepo.java
+++ b/src/main/java/com/iemr/common/repository/report/CallReportRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.report;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/request_logger/CallLoggerRepo.java b/src/main/java/com/iemr/common/repository/request_logger/CallLoggerRepo.java
index 346dfaf9..b2b7ed3a 100644
--- a/src/main/java/com/iemr/common/repository/request_logger/CallLoggerRepo.java
+++ b/src/main/java/com/iemr/common/repository/request_logger/CallLoggerRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.request_logger;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/scheme/SchemeRepository.java b/src/main/java/com/iemr/common/repository/scheme/SchemeRepository.java
index e0977575..709dd489 100644
--- a/src/main/java/com/iemr/common/repository/scheme/SchemeRepository.java
+++ b/src/main/java/com/iemr/common/repository/scheme/SchemeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.scheme;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/services/ServiceTypeRepository.java b/src/main/java/com/iemr/common/repository/services/ServiceTypeRepository.java
index 1f0ca65f..664c2517 100644
--- a/src/main/java/com/iemr/common/repository/services/ServiceTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/services/ServiceTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.services;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/services/ServiesRepository.java b/src/main/java/com/iemr/common/repository/services/ServiesRepository.java
index 6e034e39..d53ece35 100644
--- a/src/main/java/com/iemr/common/repository/services/ServiesRepository.java
+++ b/src/main/java/com/iemr/common/repository/services/ServiesRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.services;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/sms/SMSNotificationRepository.java b/src/main/java/com/iemr/common/repository/sms/SMSNotificationRepository.java
index 18f61ae5..819ba88e 100644
--- a/src/main/java/com/iemr/common/repository/sms/SMSNotificationRepository.java
+++ b/src/main/java/com/iemr/common/repository/sms/SMSNotificationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.sms;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/repository/sms/SMSParameterMapRepository.java b/src/main/java/com/iemr/common/repository/sms/SMSParameterMapRepository.java
index b39ec086..23a1e07f 100644
--- a/src/main/java/com/iemr/common/repository/sms/SMSParameterMapRepository.java
+++ b/src/main/java/com/iemr/common/repository/sms/SMSParameterMapRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.sms;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/sms/SMSParameterRepository.java b/src/main/java/com/iemr/common/repository/sms/SMSParameterRepository.java
index c96d7be3..f58e448f 100644
--- a/src/main/java/com/iemr/common/repository/sms/SMSParameterRepository.java
+++ b/src/main/java/com/iemr/common/repository/sms/SMSParameterRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.sms;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/sms/SMSTemplateRepository.java b/src/main/java/com/iemr/common/repository/sms/SMSTemplateRepository.java
index dc563d48..45e19a6b 100644
--- a/src/main/java/com/iemr/common/repository/sms/SMSTemplateRepository.java
+++ b/src/main/java/com/iemr/common/repository/sms/SMSTemplateRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.sms;
 
 import java.util.List;
@@ -34,4 +55,8 @@ public List<SMSTemplate> getSMSTemplateByProviderServiceMapIDAndSMSTypeID(
 	@Modifying
 	@Query("update SMSTemplate set deleted = :deleted where smsTemplateID = :smsTemplateID")
 	public int updateSMSTemplate(@Param("smsTemplateID") Integer smsTemplateID, @Param("deleted") Boolean deleted);
+	
+	@Query("select smsTemplate.dltTemplateId from SMSTemplate smsTemplate where smsTemplate.smsTemplateID = :smsTemplateID and smsTemplate.deleted <> true")
+	public String findDLTTemplateID(@Param("smsTemplateID") Integer smsTemplateID );
+
 }
diff --git a/src/main/java/com/iemr/common/repository/sms/SMSTypeRepository.java b/src/main/java/com/iemr/common/repository/sms/SMSTypeRepository.java
index 26763553..1c6e82d3 100644
--- a/src/main/java/com/iemr/common/repository/sms/SMSTypeRepository.java
+++ b/src/main/java/com/iemr/common/repository/sms/SMSTypeRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.sms;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/uptsu/FacilityMasterRepo.java b/src/main/java/com/iemr/common/repository/uptsu/FacilityMasterRepo.java
index 347428ef..5e153d0b 100644
--- a/src/main/java/com/iemr/common/repository/uptsu/FacilityMasterRepo.java
+++ b/src/main/java/com/iemr/common/repository/uptsu/FacilityMasterRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.uptsu;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/uptsu/T_104AppointmentDetailsRepo.java b/src/main/java/com/iemr/common/repository/uptsu/T_104AppointmentDetailsRepo.java
index 1c497bcc..a8c83bca 100644
--- a/src/main/java/com/iemr/common/repository/uptsu/T_104AppointmentDetailsRepo.java
+++ b/src/main/java/com/iemr/common/repository/uptsu/T_104AppointmentDetailsRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.uptsu;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/GenderRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/GenderRepository.java
index 0e478537..4f7fd182 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/GenderRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/GenderRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/LanguageRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/LanguageRepository.java
index 9f7591b7..c6f01f70 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/LanguageRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/LanguageRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/MaritalStatusRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/MaritalStatusRepository.java
index 956d2180..9e0ccc94 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/MaritalStatusRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/MaritalStatusRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/ReligionRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/ReligionRepository.java
index c7fe7a1e..8c9b3fb8 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/ReligionRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/ReligionRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/SexualOrientationRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/SexualOrientationRepository.java
index cf1fed7d..897a89f9 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/SexualOrientationRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/SexualOrientationRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/StatusRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/StatusRepository.java
index 9b734f55..f8aec8a6 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/StatusRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/StatusRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/TitleRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/TitleRepository.java
index e28274eb..304d106c 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/TitleRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/TitleRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/userbeneficiarydata/UserBeneficiaryDataRepository.java b/src/main/java/com/iemr/common/repository/userbeneficiarydata/UserBeneficiaryDataRepository.java
index 8d54c1e0..2c5c7db2 100644
--- a/src/main/java/com/iemr/common/repository/userbeneficiarydata/UserBeneficiaryDataRepository.java
+++ b/src/main/java/com/iemr/common/repository/userbeneficiarydata/UserBeneficiaryDataRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.userbeneficiarydata;
 
 import java.util.Objects;
diff --git a/src/main/java/com/iemr/common/repository/users/EmployeeSignatureRepo.java b/src/main/java/com/iemr/common/repository/users/EmployeeSignatureRepo.java
index 7121d549..1fa635bd 100644
--- a/src/main/java/com/iemr/common/repository/users/EmployeeSignatureRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/EmployeeSignatureRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/repository/users/HealthCareWorkerRepository.java b/src/main/java/com/iemr/common/repository/users/HealthCareWorkerRepository.java
index ef754f25..6b0921d6 100644
--- a/src/main/java/com/iemr/common/repository/users/HealthCareWorkerRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/HealthCareWorkerRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/IEMRUserLoginSecurityRepository.java b/src/main/java/com/iemr/common/repository/users/IEMRUserLoginSecurityRepository.java
index 052eda73..976e3aed 100644
--- a/src/main/java/com/iemr/common/repository/users/IEMRUserLoginSecurityRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/IEMRUserLoginSecurityRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 
diff --git a/src/main/java/com/iemr/common/repository/users/IEMRUserRepositoryCustom.java b/src/main/java/com/iemr/common/repository/users/IEMRUserRepositoryCustom.java
index 75794bfd..d0802915 100644
--- a/src/main/java/com/iemr/common/repository/users/IEMRUserRepositoryCustom.java
+++ b/src/main/java/com/iemr/common/repository/users/IEMRUserRepositoryCustom.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
@@ -53,5 +74,8 @@ public interface IEMRUserRepositoryCustom extends CrudRepository<User, Long> {
 	@Query("SELECT u FROM UserSecurityQMapping u WHERE u.UserID=:UserID AND u.QuestionID=:QuestionID AND u.Answers=:Answers")
 	UserSecurityQMapping verifySecurityQuestionAnswers(@Param("UserID") Long UserID,
 			@Param("QuestionID") String QuestionID, @Param("Answers") String Answers);
+	
+	@Query("SELECT u FROM User u WHERE u.userID=5718")
+	User getAllExistingUsers();
 
 }
diff --git a/src/main/java/com/iemr/common/repository/users/IEMRUserSecurityQuesAnsRepository.java b/src/main/java/com/iemr/common/repository/users/IEMRUserSecurityQuesAnsRepository.java
index e2a06b29..b76b6539 100644
--- a/src/main/java/com/iemr/common/repository/users/IEMRUserSecurityQuesAnsRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/IEMRUserSecurityQuesAnsRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import org.springframework.data.repository.CrudRepository;
diff --git a/src/main/java/com/iemr/common/repository/users/MasterServicePointRepo.java b/src/main/java/com/iemr/common/repository/users/MasterServicePointRepo.java
index f68fc11c..29ac1001 100644
--- a/src/main/java/com/iemr/common/repository/users/MasterServicePointRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/MasterServicePointRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/MasterVanRepo.java b/src/main/java/com/iemr/common/repository/users/MasterVanRepo.java
index eabfd89b..da0c513a 100644
--- a/src/main/java/com/iemr/common/repository/users/MasterVanRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/MasterVanRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/ProviderServiceMapRepository.java b/src/main/java/com/iemr/common/repository/users/ProviderServiceMapRepository.java
index d00faa85..1ccf6b38 100644
--- a/src/main/java/com/iemr/common/repository/users/ProviderServiceMapRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/ProviderServiceMapRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/com/iemr/common/repository/users/RoleRepo.java b/src/main/java/com/iemr/common/repository/users/RoleRepo.java
index f3fa2137..0907f388 100644
--- a/src/main/java/com/iemr/common/repository/users/RoleRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/RoleRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/repository/users/ServicePointVillageMappingRepo.java b/src/main/java/com/iemr/common/repository/users/ServicePointVillageMappingRepo.java
index 08e84b01..ba17d79a 100644
--- a/src/main/java/com/iemr/common/repository/users/ServicePointVillageMappingRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/ServicePointVillageMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/ServiceRoleScreenMappingRepository.java b/src/main/java/com/iemr/common/repository/users/ServiceRoleScreenMappingRepository.java
index 72de6ce6..3a2135d1 100644
--- a/src/main/java/com/iemr/common/repository/users/ServiceRoleScreenMappingRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/ServiceRoleScreenMappingRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/UserParkingplaceMappingRepo.java b/src/main/java/com/iemr/common/repository/users/UserParkingplaceMappingRepo.java
index eebed14c..39e72c3f 100644
--- a/src/main/java/com/iemr/common/repository/users/UserParkingplaceMappingRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/UserParkingplaceMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java
index 758a3df1..7e4f95a1 100644
--- a/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java
+++ b/src/main/java/com/iemr/common/repository/users/UserRoleMappingRepository.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
@@ -17,7 +38,7 @@
 public interface UserRoleMappingRepository extends CrudRepository<UserServiceRoleMapping, Long>
 {
 	@Query("select map.USRMappingID, map.UserID, map.RoleID, map.m_Role, map.providerServiceMapID, "
-			+ "map.agentID, map.inbound, map.outbound, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from "
+			+ "map.agentID, map.inbound, map.outbound, map.isSanjeevani, map.agentPassword, map.workingLocationID, map.providerServiceAddressMapping from "
 			+ "UserServiceRoleMapping map left join map.m_ProviderServiceMapping psm left join psm.serviceProvider sp "
 			+ "left join map.m_Role left join map.providerServiceAddressMapping "
 			+ "where map.Deleted = false and UserID = :UserID and sp.statusID in (1,2) "
diff --git a/src/main/java/com/iemr/common/repository/users/VanServicepointMappingRepo.java b/src/main/java/com/iemr/common/repository/users/VanServicepointMappingRepo.java
index f9b16ff2..70af035d 100644
--- a/src/main/java/com/iemr/common/repository/users/VanServicepointMappingRepo.java
+++ b/src/main/java/com/iemr/common/repository/users/VanServicepointMappingRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.repository.users;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/secondary/repository/callreport/CallReportSecondaryRepo.java b/src/main/java/com/iemr/common/secondary/repository/callreport/CallReportSecondaryRepo.java
index b2f9ccbd..f08195ce 100644
--- a/src/main/java/com/iemr/common/secondary/repository/callreport/CallReportSecondaryRepo.java
+++ b/src/main/java/com/iemr/common/secondary/repository/callreport/CallReportSecondaryRepo.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.secondary.repository.callreport;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeService.java b/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeService.java
index 65475890..88c491af 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeServiceImpl.java
index 6abf184e..33c2e6ee 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/BenRelationshipTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationService.java b/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationService.java
index bc56500f..ac93596b 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationServiceImpl.java
index fa013586..90f84050 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/BeneficiaryOccupationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeService.java b/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeService.java
index 9b3ff79d..456d5c5d 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeServiceImpl.java
index 3377c4d1..421e8e22 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/GovtIdentityTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeService.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeService.java
index 7d4e7b2e..05db29cb 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import com.iemr.common.data.beneficiary.BeneficiaryType;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeServiceImpl.java
index 277bba95..6b4d40c6 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRBeneficiaryTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserService.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserService.java
index cd2d7b41..6e7848cd 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
index 23d5079d..159f2b1f 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.math.BigInteger;
@@ -256,6 +277,12 @@ public String findBeneficiary(BeneficiaryModel i_beneficiary, String auth) throw
 			BigInteger numBig = new BigInteger(i_beneficiary.getBeneficiaryID());
 			identitySearchDTO.setBeneficiaryId(numBig);
 		}
+		
+		if(i_beneficiary.getIs1097() != null && i_beneficiary.getIs1097() == true) {
+            i_beneficiary.setIs1097(true);
+        }else {
+            i_beneficiary.setIs1097(false);
+        }
 
 		Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
 		List<BeneficiariesDTO> listBen = identityBeneficiaryService
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryService.java b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryService.java
index 06316729..3bd43ee7 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.HashSet;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
index b3c106d6..950f3a82 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/IdentityBeneficiaryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.ArrayList;
@@ -65,23 +86,26 @@ public List<BeneficiariesDTO> getBeneficiaryListByIDs(HashSet benIdList, String
 		result = httpUtils.post(ConfigProperties.getPropertyByName("identity-api-url-getByBenRegIdList").replace(
 				IDENTITY_BASE_URL, (is1097 ? identity1097BaseURL : identityBaseURL)), benIdList.toString(), header);
 		OutputResponse identityResponse = inputMapper.gson().fromJson(result, OutputResponse.class);
-		if (identityResponse.getStatusCode() == OutputResponse.USERID_FAILURE) {
+		if (identityResponse != null && identityResponse.getStatusCode() == OutputResponse.USERID_FAILURE) {
 			throw new IEMRException(identityResponse.getErrorMessage());
 		}
-		JsonObject responseObj = (JsonObject) parser.parse(result);
-		// JsonArray data = (JsonArray) parser.parse(
-		JsonObject data1 = (JsonObject) responseObj.get("response");
-		String s = data1.get("data").getAsString();
-		JsonArray responseArray = parser.parse(s).getAsJsonArray();
+		if (null != result) {
+			JsonObject responseObj = (JsonObject) parser.parse(result);
+			// JsonArray data = (JsonArray) parser.parse(
+			JsonObject data1 = (JsonObject) responseObj.get("response");
+			String s = data1.get("data").getAsString();
+			JsonArray responseArray = parser.parse(s).getAsJsonArray();
 
-		// String data="s";
-		// JsonArray responseArray = (JsonArray) parser.parse(data);
+			// String data="s";
+			// JsonArray responseArray = (JsonArray) parser.parse(data);
 
-		for (JsonElement jsonElement : responseArray) {
+			for (JsonElement jsonElement : responseArray) {
 
-			BeneficiariesDTO callRequest = inputMapper.gson().fromJson(jsonElement.toString(), BeneficiariesDTO.class);
-			listBenDetailForOutboundDTO.add(callRequest);
+				BeneficiariesDTO callRequest = inputMapper.gson().fromJson(jsonElement.toString(),
+						BeneficiariesDTO.class);
+				listBenDetailForOutboundDTO.add(callRequest);
 
+			}
 		}
 		return listBenDetailForOutboundDTO;
 	}
diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryService.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryService.java
index c966c806..50269924 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 /**
  * 
  */
diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
index b8f489f6..791bc51a 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 /**
  * 
  */
@@ -41,8 +62,7 @@
  *
  */
 @Service
-public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService
-{
+public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryService {
 
 	@Autowired
 	CommonIdentityMapper identityMapper;
@@ -54,7 +74,7 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic
 
 	@Autowired
 	Validator validator;
-	
+
 	@Autowired
 	OutboundHistoryRepository outboundHistoryRepository;
 
@@ -66,305 +86,163 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic
 	/**
 	 * Inject IemrUserRegisterRepository
 	 */
-	// @Autowired
-	// public void setBeneficiaryRepository(BeneficiaryRepository
-	// benificiaryRepository) {
-	//
-	// this.benificiaryRepository = benificiaryRepository;
-	// }
-
-	// private BeneficiaryDemographicsRepository beneficiaryDemographicsRepository;
-
-	// @Autowired
-	// public void setBeneficiaryDemographicsRepository(
-	// BeneficiaryDemographicsRepository beneficiaryDemographicsRepository) {
-	// this.beneficiaryDemographicsRepository = beneficiaryDemographicsRepository;
-	// }
-
-	// private BenPhoneMapRepository benPhoneMapRepository;
-
-	// @Autowired
-	// public void setBenPhoneMapRepository(BenPhoneMapRepository
-	// benPhoneMapRepository) {
-	// this.benPhoneMapRepository = benPhoneMapRepository;
-	// }
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Override
-	public Beneficiary save(Beneficiary benificiaryDetails)
-	{
+	public Beneficiary save(Beneficiary benificiaryDetails) {
 
 		logger.info("benificiaryDetails: " + benificiaryDetails);
-		// CommonIdentityDTO identityDTO =
-		// identityMapper.BeneficiaryModelCommonIdentityDTO(benificiaryDetails);
-		// logger.info("identityDTO: "+identityDTO);
-		// commented below code as beneficiary has been removed from iemr
-		// Beneficiary savedBenificiaryDetails =
-		// benificiaryRepository.save(benificiaryDetails);
-		// if (benificiaryDetails.getI_bendemographics() != null) {
-		// benificiaryDetails.getI_bendemographics().setCreatedBy(savedBenificiaryDetails.getCreatedBy());
-		// benificiaryDetails.getI_bendemographics()
-		// .setBeneficiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID());
-		// beneficiaryDemographicsRepository.save(benificiaryDetails.getI_bendemographics());
-		// }
-		// if (benificiaryDetails.getBenPhoneMaps() != null) {
-		// for (int idx = 0; idx < benificiaryDetails.getBenPhoneMaps().size(); idx++) {
-		// benificiaryDetails.getBenPhoneMaps().get(idx)
-		// .setBenificiaryRegID(savedBenificiaryDetails.getBeneficiaryRegID());
-		// if (benificiaryDetails.getBenPhoneMaps().get(idx).getParentBenRegID() ==
-		// null) {
-		// benificiaryDetails.getBenPhoneMaps().get(idx)
-		// .setParentBenRegID(savedBenificiaryDetails.getBeneficiaryRegID());
-		// }
-		// }
-		// benPhoneMapRepository.save(benificiaryDetails.getBenPhoneMaps());
-		// }
-		// benificiaryRepository.addBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID()
-		// + "",
-		// savedBenificiaryDetails.getBeneficiaryRegID());
-		// updateBeneficiaryID(savedBenificiaryDetails.getBeneficiaryRegID() + "",
-		// savedBenificiaryDetails.getBeneficiaryRegID());
+
 		return new Beneficiary(); // savedBenificiaryDetails;
 	}
 
 	@Async
-	private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID)
-	{
-		try
-		{
+	private void updateBeneficiaryID(String beneficiaryID, Long beneficiaryRegID) {
+		try {
 			// benificiaryRepository.addBeneficiaryID(beneficiaryID, beneficiaryRegID);
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			logger.error("updateBeneficiaryID failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Async
 	@Override
-	public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException
-	{
+	public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException {
 		Integer updatedRows = 0;
 
-		// try
-		// {
-		//// updatedRows = benificiaryRepository.updateDetailsbyID(benificiaryDetails.getTitleId(),
-		//// benificiaryDetails.getFirstName(), benificiaryDetails.getMiddleName(),
-		//// benificiaryDetails.getLastName(), benificiaryDetails.getStatusID(),
-		//// benificiaryDetails.getGenderID(), benificiaryDetails.getMaritalStatusID(),
-		//// benificiaryDetails.getdOB(), benificiaryDetails.getFatherName(), benificiaryDetails.getSpouseName(),
-		//// benificiaryDetails.getGovtIdentityNo(), benificiaryDetails.getGovtIdentityTypeID(),
-		//// benificiaryDetails.getRegisteredServiceID(), benificiaryDetails.isDeleted(),
-		//// benificiaryDetails.getBeneficiaryRegID(), benificiaryDetails.getSexualOrientationId(),
-		//// benificiaryDetails.getIsHIVPos(), benificiaryDetails.getPlaceOfWork(),
-		//// benificiaryDetails.getRemarks(), benificiaryDetails.getSourceOfInformation());
-		// if (benificiaryDetails.getI_bendemographics() != null)
-		// {
-		// updatedRows = updateDemographics(benificiaryDetails.getI_bendemographics());
-		// }
-		// if (benificiaryDetails.getBenPhoneMaps() != null)
-		// {
-		// List<BenPhoneMapModel> benPhoneMaps = benificiaryDetails.getBenPhoneMaps();
-		//// for (BenPhoneMap benPhoneMap : benPhoneMaps)
-		//// {
-		//// logger.debug(benPhoneMap.toString());
-		//// if (benPhoneMap.getBenPhMapID() != null)
-		//// {
-		//// benPhoneMapRepository.update(benPhoneMap.getBenPhMapID(), benPhoneMap.getBenificiaryRegID(),
-		//// benPhoneMap.getParentBenRegID(), benPhoneMap.getBenRelationshipID(),
-		//// benPhoneMap.getPhoneNo(), benPhoneMap.getPhoneTypeID(), benPhoneMap.getDeleted());
-		//// } else
-		//// {
-		//// benPhoneMapRepository.save(new Gson().fromJson(benPhoneMap.toString(), BenPhoneMap.class));
-		//// }
-		//// }
-		// }
-		// } catch (Exception e)
-		// {
-		// logger.error("updateBenificiary failed with error " + e.getMessage(), e);
-		// }
-
 		IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails);
 		if (benificiaryDetails.getBeneficiaryIdentities() != null
-				&& benificiaryDetails.getBeneficiaryIdentities().size() > 0)
-		{
+				&& benificiaryDetails.getBeneficiaryIdentities().size() > 0) {
 			identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),
 					benificiaryDetails.getCreatedBy()));
 		}
 		identityEditDTO.setDob(benificiaryDetails.getDOB());
 		// String jsoninput=new Gson().toJson(identityEditDTO);
-		updatedRows =
-				identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth, benificiaryDetails.getIs1097());
-		// updateBeneficiaryPreferredLanguage(identityEditDTO, auth);
-		
-		// updateMCTSRecord(benificiaryDetails);
-		
+		updatedRows = identityBeneficiaryService.editIdentityEditDTO(identityEditDTO, auth,
+				benificiaryDetails.getIs1097());
+
 		return updatedRows;
 	}
 
-	private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics)
-	{
+	private int updateDemographics(BeneficiaryDemographicsModel i_BenDemographics) {
 		int updatedRows = 0;
 		System.out.println(i_BenDemographics);
-		// if
-		// (beneficiaryDemographicsRepository.getBeneficiaryDemograhics(i_BenDemographics.getBeneficiaryRegID())
-		// .size() > 0) {
-		// updatedRows =
-		// beneficiaryDemographicsRepository.update(i_BenDemographics.getBeneficiaryRegID(),
-		// i_BenDemographics.getEducationID(), i_BenDemographics.getOccupationID(),
-		// i_BenDemographics.getIncomeStatusID(), i_BenDemographics.getCommunityID(),
-		// i_BenDemographics.getPreferredLangID(), i_BenDemographics.getReligionID(),
-		// i_BenDemographics.getIsPhoto(), i_BenDemographics.getPhotoFilePath(),
-		// i_BenDemographics.getIsBiometric(), i_BenDemographics.getBiometricFilePath(),
-		// i_BenDemographics.getAddressLine1(), i_BenDemographics.getAddressLine2(),
-		// i_BenDemographics.getAddressLine3(), i_BenDemographics.getAddressLine4(),
-		// i_BenDemographics.getAddressLine5(), i_BenDemographics.getCityID(),
-		// i_BenDemographics.getStateID(),
-		// i_BenDemographics.getCountryID(), i_BenDemographics.getPinCode(),
-		// i_BenDemographics.getIsAddPresent(), i_BenDemographics.getIsAddPermanent(),
-		// i_BenDemographics.getDeleted(), i_BenDemographics.getDistrictBranchID(),
-		// i_BenDemographics.getBlockID(), i_BenDemographics.getDistrictID());
-		// } else {
-		// i_BenDemographics.setCreatedBy("updateProcess");
-		// beneficiaryDemographicsRepository.save(i_BenDemographics);
-		// updatedRows++;
-		// }
+
 		return updatedRows;
 	}
 
 	@Override
-	public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception
-	{
+	public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servletRequest) throws Exception {
 
 //		logger.info("benificiaryDetails: " + beneficiaryModel);
 
 		CommonIdentityDTO identityDTO = identityMapper.beneficiaryModelCommonIdentityDTO(beneficiaryModel);
+		identityDTO.setEmergencyRegistration(beneficiaryModel.isEmergencyRegistration());
 		identityDTO
 				.setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps()));
 		String request = InputMapper.getInstance().gson().toJson(identityDTO).toString();
 
+		if (beneficiaryModel.getIs1097() == null)
+			beneficiaryModel.setIs1097(false);
+
 		String identityResponse = identityBeneficiaryService.getIdentityResponse(request,
 				servletRequest.getHeader("authorization"), beneficiaryModel.getIs1097());
 		JSONObject responseObj = new JSONObject(identityResponse);
 		BeneficiaryModel beneficiary = new BeneficiaryModel();
-		if (responseObj.has("response"))
-		{
+		if (responseObj.has("response")) {
 			OutputResponse response = InputMapper.getInstance()
 					.fromJson(responseObj.getJSONObject("response").toString(), OutputResponse.class);
-			if (response.isSuccess())
-			{
-				BeneficiariesDTO createdBen =
-						InputMapper.getInstance().fromJson(response.getData(), BeneficiariesDTO.class);
+			if (response.isSuccess()) {
+				BeneficiariesDTO createdBen = InputMapper.getInstance().fromJson(response.getData(),
+						BeneficiariesDTO.class);
 				beneficiaryModel.setBeneficiaryRegID(Long.parseLong(createdBen.getBenRegId().toString()));
 				beneficiaryModel.setBeneficiaryID(createdBen.getBenId().toString());
 				beneficiary = beneficiaryModel;
-			}
-			else
-			{
-				return response.toString();		
+			} else {
+				return response.toString();
 			}
 		}
 		return OutputMapper.gsonWithoutExposeRestriction().toJson(beneficiary);
 	}
+
 	@Override
-	public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException{
+	public Integer updateCommunityorEducation(BeneficiaryModel benificiaryDetails, String auth) throws IEMRException {
 		IdentityEditDTO identityEditDTO = new IdentityEditDTO();
-		identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID()+""));
-		if(benificiaryDetails.getI_bendemographics()!=null){
+		identityEditDTO.setBeneficiaryRegId(new BigInteger(benificiaryDetails.getBeneficiaryRegID() + ""));
+		if (benificiaryDetails.getI_bendemographics() != null) {
 			identityEditDTO.setCommunityId(benificiaryDetails.getI_bendemographics().getCommunityID());
 			identityEditDTO.setEducationId(benificiaryDetails.getI_bendemographics().getEducationID());
 		}
-		
-////		identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails);
-//		if (benificiaryDetails.getBeneficiaryIdentities() != null
-//				&& benificiaryDetails.getBeneficiaryIdentities().size() > 0)
-//		{
-//			identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),
-//					benificiaryDetails.getCreatedBy()));
-//		}
-//		identityEditDTO.setDob(benificiaryDetails.getDOB());
-		
-		Integer updatedRows=0;
-		updatedRows =
-				identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth, benificiaryDetails.getIs1097());
+
+		Integer updatedRows = 0;
+		updatedRows = identityBeneficiaryService.editIdentityEditDTOCommunityorEducation(identityEditDTO, auth,
+				benificiaryDetails.getIs1097());
 		// updateBeneficiaryPreferredLanguage(identityEditDTO, auth);
 		return updatedRows;
 	}
-	
 
-	private void updateMCTSRecord(BeneficiaryModel beneficiaryModel)
-	{
+	private void updateMCTSRecord(BeneficiaryModel beneficiaryModel) {
 		List<MctsOutboundCallDetail> mctsOutboundCallDetails = new ArrayList<MctsOutboundCallDetail>();
-		
+
 		try {
-			
-			mctsOutboundCallDetails= outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID());
-			
-			MctsOutboundCallDetail callDetail= mctsOutboundCallDetails.get(0);
-			
-			if(callDetail !=null && callDetail.getIsMother()!=null)
-			{
-				
+
+			mctsOutboundCallDetails = outboundHistoryRepository.checkBenExist(beneficiaryModel.getBeneficiaryRegID());
+
+			MctsOutboundCallDetail callDetail = mctsOutboundCallDetails.get(0);
+
+			if (callDetail != null && callDetail.getIsMother() != null) {
+
 				String firstName = beneficiaryModel.getFirstName();
 				String lastName = beneficiaryModel.getLastName();
-				String name= "";
-				if(lastName!=null && !lastName.equalsIgnoreCase(""))
-				{
-					name= firstName +" "+ lastName;
+				String name = "";
+				if (lastName != null && !lastName.equalsIgnoreCase("")) {
+					name = firstName + " " + lastName;
+				} else {
+					name = firstName;
 				}
-				else
-				{
-					name= firstName;
-				}
-				
+
 				Integer age = beneficiaryModel.getAge();
-				
-				String districtName= outboundHistoryRepository.getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID());
-				String talukaName= outboundHistoryRepository.getBlockName(beneficiaryModel.getI_bendemographics().getBlockID());
-				String villageName= outboundHistoryRepository.getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID());
-				
-				String gender=null;
-				if(beneficiaryModel.getGenderID()==1)
-				{
-					gender ="Male"; 
-				}
-				else if(beneficiaryModel.getGenderID()==2)
-				{
-					gender ="Female";
-				}
-				else
-				{
-					gender="Transgender";
+
+				String districtName = outboundHistoryRepository
+						.getDistrictName(beneficiaryModel.getI_bendemographics().getDistrictID());
+				String talukaName = outboundHistoryRepository
+						.getBlockName(beneficiaryModel.getI_bendemographics().getBlockID());
+				String villageName = outboundHistoryRepository
+						.getVillageName(beneficiaryModel.getI_bendemographics().getDistrictBranchID());
+
+				String gender = null;
+				if (beneficiaryModel.getGenderID() == 1) {
+					gender = "Male";
+				} else if (beneficiaryModel.getGenderID() == 2) {
+					gender = "Female";
+				} else {
+					gender = "Transgender";
 				}
-				
+
 				Timestamp lastModDate = Timestamp.valueOf(LocalDateTime.now());
-				if(callDetail.getIsMother()==true)
-				{
-					int updateRow= outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName, villageName, 
-							lastModDate, beneficiaryModel.getBeneficiaryRegID());
-				}
-				else
-				{
-					int updateRow= outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName, villageName, 
-							lastModDate, beneficiaryModel.getBeneficiaryRegID());
+				if (callDetail.getIsMother() == true) {
+					int updateRow = outboundHistoryRepository.updateMotherData(name, age, districtName, talukaName,
+							villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID());
+				} else {
+					int updateRow = outboundHistoryRepository.updateChildData(name, gender, districtName, talukaName,
+							villageName, lastModDate, beneficiaryModel.getBeneficiaryRegID());
 
 				}
 			}
 		} catch (Exception e) {
 
 		}
-				
-		
+
 	}
 
 	@Override
-	public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception
-	{
+	public String generateBeneficiaryIDs(String request, HttpServletRequest servletRequest) throws Exception {
 
 		logger.info("request: " + request.toString());
 		List<BeneficiaryGenModel> listBen = identityBeneficiaryService.generateBeneficiaryIDs(request,
 				servletRequest.getHeader("authorization"));
-		
+
 		return listBen.toString();
 	}
 }
diff --git a/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationService.java b/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationService.java
index 446b83e3..ec654e98 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationService.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationServiceImpl.java
index cb16a89a..eecff9a6 100644
--- a/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/beneficiary/SexualOrientationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.beneficiary;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/biometric/BiometricService.java b/src/main/java/com/iemr/common/service/biometric/BiometricService.java
new file mode 100644
index 00000000..af3d400d
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/biometric/BiometricService.java
@@ -0,0 +1,7 @@
+package com.iemr.common.service.biometric;
+
+public interface BiometricService {
+
+	String getBioData(String pid);
+
+}
diff --git a/src/main/java/com/iemr/common/service/biometric/BiometricServiceImpl.java b/src/main/java/com/iemr/common/service/biometric/BiometricServiceImpl.java
new file mode 100644
index 00000000..0789ee86
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/biometric/BiometricServiceImpl.java
@@ -0,0 +1,223 @@
+package com.iemr.common.service.biometric;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.net.URL;
+import java.util.Base64;
+import java.util.stream.Collectors;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
+import org.json.XML;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+@Service
+public class BiometricServiceImpl implements BiometricService {
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+	@Value("${biometric.discover.url}")
+	String discoverUrl;
+
+	@Value("${biometric.deviceInfo.url}")
+	private String deviceInfoUrl;
+
+	@Value("${biometric.capture.url}")
+	private String captureUrl;
+	
+	@Override
+	public String getBioData(String env) {
+		String pidRes = null;
+		try {
+			String portNumber = null;
+			for (int i = 11100; i <= 11120; i++) {
+				String port = String.valueOf(i);
+				String apiUrl = discoverUrl.replace("port", port);
+
+				String httpMethod = "RDSERVICE";
+				HttpClient httpClient = HttpClientBuilder.create().build();
+
+				HttpRequestBase request = new HttpRequestBase() {
+					@Override
+					public String getMethod() {
+						return httpMethod;
+					}
+				};
+				request.setURI(URI.create(apiUrl));
+				request.setHeader(HttpHeaders.CONTENT_TYPE, "TEXT/XML");
+				try {
+					HttpResponse response = httpClient.execute((HttpUriRequest) request);
+
+					HttpEntity entity = response.getEntity();
+					String responseString = EntityUtils.toString(entity, "UTF-8");
+					if (!responseString.contains("NOTREADY")) {
+						portNumber = port;
+						break;
+					}
+				} catch (Exception e) {
+					logger.error("Error while checking biometric status: " + e.getMessage());
+				}
+			}
+			String xmlResponse = getDeviceInfo(portNumber, env);
+			if(xmlResponse != null) {
+				pidRes = Base64.getEncoder().encodeToString(xmlResponse.getBytes());
+			}
+		} catch (Exception e) {
+			logger.error("Error while getting biometric data: " + e.getMessage());
+		}
+		return pidRes;
+	}
+
+	private String getDeviceInfo(String portNumber, String env) {
+		String deviceRes = null;
+		String deviceInforURL = deviceInfoUrl.replace("port", portNumber);
+
+		String httpMethod = "DEVICEINFO";
+		HttpClient httpClient = HttpClientBuilder.create().build();
+
+		HttpRequestBase request = new HttpRequestBase() {
+			@Override
+			public String getMethod() {
+				return httpMethod;
+			}
+		};
+		request.setURI(URI.create(deviceInforURL));
+		request.setHeader(HttpHeaders.CONTENT_TYPE, "TEXT/XML");
+		try {
+			HttpResponse response = httpClient.execute((HttpUriRequest) request);
+
+			HttpEntity entity = response.getEntity();
+			String responseString = EntityUtils.toString(entity, "UTF-8");
+
+			if (null != response && response.getStatusLine().getStatusCode() == 200) {
+				deviceRes = getCaptureInfo(portNumber, env);
+			}
+		} catch (Exception e) {
+			logger.error("Error while getting biometric device info : " + e.getMessage());
+		}
+		return deviceRes;
+	}
+
+	private String getCaptureInfo(String portNumber, String env) throws Exception {
+		String captureRes = null;
+		if (null != portNumber) {
+			try {
+				// Create a new DocumentBuilder
+				DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+				DocumentBuilder docBuilder = dbFactory.newDocumentBuilder();
+
+				// Create a new Document
+				Document doc = docBuilder.newDocument();
+
+				// Create the root element <PidOptions>
+				Element pidOptionsElement = doc.createElement("PidOptions");
+				pidOptionsElement.setAttribute("ver", "1.0");
+				doc.appendChild(pidOptionsElement);
+
+				// Create the <Opts> element and its attributes
+				Element optsElement = doc.createElement("Opts");
+				optsElement.setAttribute("fCount", "1");
+				optsElement.setAttribute("fType", "2");
+				optsElement.setAttribute("iCount", "0");
+				optsElement.setAttribute("pCount", "0");
+				optsElement.setAttribute("pgCount", "2");
+				optsElement.setAttribute("format", "0");
+				optsElement.setAttribute("pidVer", "2.0");
+				optsElement.setAttribute("timeout", "10000");
+				optsElement.setAttribute("pTimeout", "20000");
+				optsElement.setAttribute("wadh", "E0jzJ/P8UopUHAieZn8CKqS4WPMi5ZSYXgfnlfkWjrc=");
+				optsElement.setAttribute("posh", "UNKNOWN");
+				optsElement.setAttribute("env", env);
+				pidOptionsElement.appendChild(optsElement);
+
+				// Create the <CustOpts> element
+				Element custOptsElement = doc.createElement("CustOpts");
+				pidOptionsElement.appendChild(custOptsElement);
+
+				// Create the <Param> element inside <CustOpts> with its attributes
+				Element paramElement = doc.createElement("Param");
+				paramElement.setAttribute("name", "mantrakey");
+				paramElement.setAttribute("value", "");
+				custOptsElement.appendChild(paramElement);
+
+				// Create a text node for indentation
+				Text text = doc.createTextNode("\n");
+				pidOptionsElement.insertBefore(text, optsElement);
+
+				// Print the XML content to the console
+				String xml = XMLToString(doc);
+				
+				String capturingURL = captureUrl.replace("port", portNumber);
+				URL url = new URL(capturingURL);
+
+				String httpMethod = "CAPTURE";
+				HttpClient httpClient = HttpClients.createDefault();
+
+				HttpEntityEnclosingRequestBase request = new HttpEntityEnclosingRequestBase() {
+					@Override
+					public String getMethod() {
+						return httpMethod;
+					}
+				};
+				request.setURI(URI.create(capturingURL));
+				StringEntity entity2 = new StringEntity(xml);
+				request.setEntity(entity2);
+				request.setHeader(HttpHeaders.CONTENT_TYPE, "TEXT/XML");
+				
+				HttpResponse response = httpClient.execute(request);
+				response.setHeader("Content-Type", "TEXT/XML");
+				InputStream entity1 = response.getEntity().getContent();
+				String result = new BufferedReader(new InputStreamReader(entity1))
+						   .lines().collect(Collectors.joining("\n"));
+				if(result.contains("Success")) {
+					captureRes = result;
+				} else {
+					throw new Exception("Capture timed out");
+				}
+				
+		} catch (ParserConfigurationException e) {
+			logger.error("Error while capturing fingerprint: " + e.getMessage());
+		}
+		}
+		return captureRes;
+	}
+
+	private String XMLToString(Document doc) {
+		String response = null;
+		try {
+			javax.xml.transform.TransformerFactory tf = javax.xml.transform.TransformerFactory.newInstance();
+			javax.xml.transform.Transformer transformer = tf.newTransformer();
+			transformer.setOutputProperty(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
+			javax.xml.transform.stream.StreamResult result = new javax.xml.transform.stream.StreamResult(
+					new java.io.StringWriter());
+			javax.xml.transform.dom.DOMSource source = new javax.xml.transform.dom.DOMSource(doc);
+			transformer.transform(source, result);
+			response = result.getWriter().toString();
+		} catch (Exception e) {
+			logger.error("Error while converting XML to String: " + e.getMessage());
+		}
+		return response;
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/service/brd/BRDIntegrationService.java b/src/main/java/com/iemr/common/service/brd/BRDIntegrationService.java
index 75354ac3..38964f1d 100644
--- a/src/main/java/com/iemr/common/service/brd/BRDIntegrationService.java
+++ b/src/main/java/com/iemr/common/service/brd/BRDIntegrationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.brd;
 
 public interface BRDIntegrationService {
diff --git a/src/main/java/com/iemr/common/service/brd/BRDIntegrationServiceUmpl.java b/src/main/java/com/iemr/common/service/brd/BRDIntegrationServiceUmpl.java
index 3e8040e6..c7a80264 100644
--- a/src/main/java/com/iemr/common/service/brd/BRDIntegrationServiceUmpl.java
+++ b/src/main/java/com/iemr/common/service/brd/BRDIntegrationServiceUmpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.brd;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallService.java b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallService.java
index 9bd5cb3c..05b7fdcb 100644
--- a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallService.java
+++ b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.callhandling;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java
index 4035cc90..c7560872 100644
--- a/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/callhandling/BeneficiaryCallServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.callhandling;
 
 import java.sql.Timestamp;
@@ -273,6 +294,12 @@ else if (benCalls != null && benCalls.getPhoneNo() != null)
 		} else if (benCalls.getAgentIPAddress() == null) {
 			benCalls.setAgentIPAddress(agentIPAddress);
 		}
+		
+		if(benCalls.getCallTypeID() == null) {
+
+			benCalls.setCallTypeID(beneficiaryCallRepository.getCallTypeId());
+
+		}
 
 		// changes from null to new object, in controller obj.toString() is getting used
 		BeneficiaryCall savedCalls = new BeneficiaryCall();
@@ -382,7 +409,7 @@ public Integer closeCall(String request, String ipAddress) throws Exception {
 			if (benificiaryCall.getIsTransfered() == null || benificiaryCall.getIsTransfered() == false) {
 				updateCallDisposition(benificiaryCall, benificiaryCall.getAgentIPAddress());
 
-				Thread.sleep(3000);
+				Thread.sleep(1000);
 				
 				disconnectCallInCTI(benificiaryCall);
 			}
diff --git a/src/main/java/com/iemr/common/service/callhandling/CalltypeService.java b/src/main/java/com/iemr/common/service/callhandling/CalltypeService.java
index 08045b3a..d3e6aa48 100644
--- a/src/main/java/com/iemr/common/service/callhandling/CalltypeService.java
+++ b/src/main/java/com/iemr/common/service/callhandling/CalltypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.callhandling;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/callhandling/CalltypeServiceImpl.java b/src/main/java/com/iemr/common/service/callhandling/CalltypeServiceImpl.java
index 5d851518..48299096 100644
--- a/src/main/java/com/iemr/common/service/callhandling/CalltypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/callhandling/CalltypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.callhandling;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/category/CategoryService.java b/src/main/java/com/iemr/common/service/category/CategoryService.java
index a3a1e592..d8924e06 100644
--- a/src/main/java/com/iemr/common/service/category/CategoryService.java
+++ b/src/main/java/com/iemr/common/service/category/CategoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.category;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/category/CategoryServiceImpl.java b/src/main/java/com/iemr/common/service/category/CategoryServiceImpl.java
index 13f01e16..0116f220 100644
--- a/src/main/java/com/iemr/common/service/category/CategoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/category/CategoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.category;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/category/SubCategoryService.java b/src/main/java/com/iemr/common/service/category/SubCategoryService.java
index 53f86a91..f550cd32 100644
--- a/src/main/java/com/iemr/common/service/category/SubCategoryService.java
+++ b/src/main/java/com/iemr/common/service/category/SubCategoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.category;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/category/SubCategoryServiceImpl.java b/src/main/java/com/iemr/common/service/category/SubCategoryServiceImpl.java
index bee62fb7..04974c5c 100644
--- a/src/main/java/com/iemr/common/service/category/SubCategoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/category/SubCategoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.category;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/cti/CTIService.java b/src/main/java/com/iemr/common/service/cti/CTIService.java
index 219ad7a8..44781ec1 100644
--- a/src/main/java/com/iemr/common/service/cti/CTIService.java
+++ b/src/main/java/com/iemr/common/service/cti/CTIService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.cti;
 
 import org.json.JSONException;
diff --git a/src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java b/src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java
index 87827aaa..a275bf7b 100644
--- a/src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.cti;
 
 import org.json.JSONException;
diff --git a/src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSync.java b/src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSync.java
new file mode 100644
index 00000000..39ad0094
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSync.java
@@ -0,0 +1,28 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.service.ctiCall;
+
+public interface CallCentreDataSync {
+	public void ctiDataSync();
+	String callUrl(String urlRequest);
+
+}
diff --git a/src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSyncImpl.java b/src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSyncImpl.java
similarity index 85%
rename from src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSyncImpl.java
rename to src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSyncImpl.java
index 62be867d..2f23206e 100644
--- a/src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSyncImpl.java
+++ b/src/main/java/com/iemr/common/service/ctiCall/CallCentreDataSyncImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.ctiCall;
 
 import java.sql.Timestamp;
@@ -30,7 +51,7 @@
 
 @Service
 @PropertySource("classpath:application.properties")
-public class CzentrixDataSyncImpl implements CzentrixDataSync {
+public class CallCentreDataSyncImpl implements CallCentreDataSync {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
@@ -49,7 +70,7 @@ public class CzentrixDataSyncImpl implements CzentrixDataSync {
 	private CTIService ctiService;
 	private static String ctiLoggerURL = ConfigProperties.getPropertyByName("cti-logger_base_url");
 
-	public CzentrixDataSyncImpl() {
+	public CallCentreDataSyncImpl() {
 		if (httpUtils == null) {
 			httpUtils = new HttpUtils();
 		}
diff --git a/src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSync.java b/src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSync.java
deleted file mode 100644
index fb8b7cba..00000000
--- a/src/main/java/com/iemr/common/service/ctiCall/CzentrixDataSync.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.iemr.common.service.ctiCall;
-
-public interface CzentrixDataSync {
-	public void ctiDataSync();
-	String callUrl(String urlRequest);
-
-}
diff --git a/src/main/java/com/iemr/common/service/directory/DirectoryMappingService.java b/src/main/java/com/iemr/common/service/directory/DirectoryMappingService.java
index d1e8f27b..e7c1ae84 100644
--- a/src/main/java/com/iemr/common/service/directory/DirectoryMappingService.java
+++ b/src/main/java/com/iemr/common/service/directory/DirectoryMappingService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/directory/DirectoryMappingServiceImpl.java b/src/main/java/com/iemr/common/service/directory/DirectoryMappingServiceImpl.java
index 1e4f3073..97f61d1d 100644
--- a/src/main/java/com/iemr/common/service/directory/DirectoryMappingServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/directory/DirectoryMappingServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/directory/DirectoryService.java b/src/main/java/com/iemr/common/service/directory/DirectoryService.java
index 4cd25fbb..8c66d7ec 100644
--- a/src/main/java/com/iemr/common/service/directory/DirectoryService.java
+++ b/src/main/java/com/iemr/common/service/directory/DirectoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/directory/DirectoryServiceImpl.java b/src/main/java/com/iemr/common/service/directory/DirectoryServiceImpl.java
index 1146054a..09a76889 100644
--- a/src/main/java/com/iemr/common/service/directory/DirectoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/directory/DirectoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/directory/SubDirectoryService.java b/src/main/java/com/iemr/common/service/directory/SubDirectoryService.java
index 7e4da8f0..8fdcb0ad 100644
--- a/src/main/java/com/iemr/common/service/directory/SubDirectoryService.java
+++ b/src/main/java/com/iemr/common/service/directory/SubDirectoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/directory/SubDirectoryServiceImpl.java b/src/main/java/com/iemr/common/service/directory/SubDirectoryServiceImpl.java
index 0b1f5424..8594591a 100644
--- a/src/main/java/com/iemr/common/service/directory/SubDirectoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/directory/SubDirectoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.directory;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorService.java b/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorService.java
index 5d0b86bd..9163fe05 100644
--- a/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorService.java
+++ b/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.door_to_door_app;
 
 import com.iemr.common.data.door_to_door_app.RequestParser;
diff --git a/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorServiceImpl.java b/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorServiceImpl.java
index 5e73b3ec..39c59578 100644
--- a/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/door_to_door_app/DoorToDoorServiceImpl.java
@@ -1,14 +1,30 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.door_to_door_app;
 
 import java.math.BigInteger;
-import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -211,7 +227,7 @@ public String get_NCD_TB_HRP_Suspected_Status(RequestParser rp) throws Exception
 
 	@Override
 	public void scheduleJobForRegisterAvniBeneficiary() throws Exception {
-	
+
 		RestTemplate restTemplate = new RestTemplate();
 		Integer updateCount = 0;
 		Long id = null;
@@ -220,47 +236,44 @@ public void scheduleJobForRegisterAvniBeneficiary() throws Exception {
 		Long benId = null;
 		Integer count = 0;
 		try {
-		ArrayList<Object[]> list = v_doortodooruserdetailsRepo
-				.getAvniBeneficiary(avniRegistrationLimit !=null ? Integer.parseInt(avniRegistrationLimit) : 10);
-		
-		if(list !=null && list.size()>0)
-		{
-		
-		for (Object[] obj : list) {
-			id = obj[0] != null ? ((BigInteger) obj[0]).longValue() : null;
-			json = obj[1] != null ? obj[1].toString() : null;
-			extId = obj[2] != null ? obj[2].toString() : null;
-			benId = obj[3] != null ? ((BigInteger) obj[3]).longValue() : null;
-			count = v_doortodooruserdetailsRepo.checkIfAvniIdExists(extId);
-			if (count > 0)
-				logger.info("Beneficiary with Avni Id " + extId + " already exists");
-			else {
-				MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
-				headers.add("Content-Type", "application/json");
-				headers.add("AUTHORIZATION", amritUserAuthenticate());
-				HttpEntity<Object> requestReg = new HttpEntity<Object>(json, headers);
-				ResponseEntity<String> response = restTemplate.exchange(everwellRegisterBenficiary, HttpMethod.POST,
-						requestReg, String.class);
-
-				if (response.getStatusCodeValue() == 200 & response.hasBody()) {
-					logger.info("registration api response " + response.getBody());
-					String responseStr = response.getBody();
-					JsonObject jsnOBJ = new JsonObject();
-					JsonParser jsnParser = new JsonParser();
-					JsonElement jsnElmnt = jsnParser.parse(responseStr);
-					jsnOBJ = jsnElmnt.getAsJsonObject();
-					JsonObject jsonData = jsnOBJ.getAsJsonObject("data");
-					benId = Long.parseLong(jsonData.get("beneficiaryID").getAsString());
-					updateCount = v_doortodooruserdetailsRepo.updateAvniBenId(id, benId);
-                    logger.info("Beneficiary Id "+benId+" registered successfully");
+			ArrayList<Object[]> list = v_doortodooruserdetailsRepo
+					.getAvniBeneficiary(avniRegistrationLimit != null ? Integer.parseInt(avniRegistrationLimit) : 10);
+
+			if (list != null && list.size() > 0) {
+
+				for (Object[] obj : list) {
+					id = obj[0] != null ? ((BigInteger) obj[0]).longValue() : null;
+					json = obj[1] != null ? obj[1].toString() : null;
+					extId = obj[2] != null ? obj[2].toString() : null;
+					benId = obj[3] != null ? ((BigInteger) obj[3]).longValue() : null;
+					count = v_doortodooruserdetailsRepo.checkIfAvniIdExists(extId);
+					if (count > 0)
+						logger.info("Beneficiary with Avni Id " + extId + " already exists");
+					else {
+						MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
+						headers.add("Content-Type", "application/json");
+						headers.add("AUTHORIZATION", amritUserAuthenticate());
+						HttpEntity<Object> requestReg = new HttpEntity<Object>(json, headers);
+						ResponseEntity<String> response = restTemplate.exchange(everwellRegisterBenficiary,
+								HttpMethod.POST, requestReg, String.class);
+
+						if (response.getStatusCodeValue() == 200 & response.hasBody()) {
+							logger.info("registration api response " + response.getBody());
+							String responseStr = response.getBody();
+							JsonObject jsnOBJ = new JsonObject();
+							JsonParser jsnParser = new JsonParser();
+							JsonElement jsnElmnt = jsnParser.parse(responseStr);
+							jsnOBJ = jsnElmnt.getAsJsonObject();
+							JsonObject jsonData = jsnOBJ.getAsJsonObject("data");
+							benId = Long.parseLong(jsonData.get("beneficiaryID").getAsString());
+							updateCount = v_doortodooruserdetailsRepo.updateAvniBenId(id, benId);
+							logger.info("Beneficiary Id " + benId + " registered successfully");
+						}
+					}
 				}
-			}
-		}
-		}
-		else
-			logger.info("No new records found");
-		}catch(Exception e)
-		{
+			} else
+				logger.info("No new records found");
+		} catch (Exception e) {
 			logger.error(e.getLocalizedMessage());
 		}
 
@@ -268,13 +281,8 @@ public void scheduleJobForRegisterAvniBeneficiary() throws Exception {
 
 	public String amritUserAuthenticate() {
 		String authorization = "";
-		/*
-		 * StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
-		 * encryptor.setAlgorithm("PBEWithMD5AndDES");
-		 * encryptor.setPassword("dev-env-secret");
-		 */
-		String amritUser = cryptoUtil.decrypt(amritUserName);
-		String amritPass = cryptoUtil.decrypt(amritPassword);
+		String amritUser = amritUserName;
+		String amritPass = amritPassword;
 		LoginRequestModel loginCredentials = new LoginRequestModel(amritUser, amritPass);
 		loginCredentials.setDoLogout(true);
 		MultiValueMap<String, String> headersLogin = new LinkedMultiValueMap<String, String>();
diff --git a/src/main/java/com/iemr/common/service/email/EmailService.java b/src/main/java/com/iemr/common/service/email/EmailService.java
index ffcb657a..4a16646f 100644
--- a/src/main/java/com/iemr/common/service/email/EmailService.java
+++ b/src/main/java/com/iemr/common/service/email/EmailService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.email;
 
 public interface EmailService {
diff --git a/src/main/java/com/iemr/common/service/email/EmailServiceImpl.java b/src/main/java/com/iemr/common/service/email/EmailServiceImpl.java
index 830e5ef4..2bf55a7a 100644
--- a/src/main/java/com/iemr/common/service/email/EmailServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/email/EmailServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.email;
 
 import java.sql.Timestamp;
@@ -423,27 +444,27 @@ public void publishEmail() {
 					} else {
 						dataList = new ArrayList<>();
 						dataList.add(stockAlertData);
-						if(stockAlertData !=null && stockAlertData.getEmailid() !=null)
-						dataMap.put(stockAlertData.getEmailid(), dataList);
+						if (stockAlertData != null && stockAlertData.getEmailid() != null)
+							dataMap.put(stockAlertData.getEmailid(), dataList);
 					}
 				}
 			} else {
 				logger.info("No Alert emails to be sent");
 			}
-            int sendMail=0;
+			int sendMail = 0;
 			for (Entry<String, List<StockAlertData>> entry : dataMap.entrySet()) {
 				logger.info(entry.getKey() + ": key");
 				logger.info(entry.getValue().toString() + ": value");
 				try {
-				byte[] bytes = ExcelHelper.InventoryDataToExcel(entry.getValue());
-				ByteArrayDataSource byteArrayOutputStream = new ByteArrayDataSource(bytes, "application/vnd.ms-excel");
-				sendMail=sendEmailWithAttachment(entry.getKey(),byteArrayOutputStream);
-				if(sendMail ==1)
-					logger.info("Email successfully sent to "+entry.getKey());
-				else
-					logger.info("Error while sending email to "+entry.getKey());
-				}catch(Exception e)
-				{
+					byte[] bytes = ExcelHelper.InventoryDataToExcel(entry.getValue());
+					ByteArrayDataSource byteArrayOutputStream = new ByteArrayDataSource(bytes,
+							"application/vnd.ms-excel");
+					sendMail = sendEmailWithAttachment(entry.getKey(), byteArrayOutputStream);
+					if (sendMail == 1)
+						logger.info("Email successfully sent to " + entry.getKey());
+					else
+						logger.info("Error while sending email to " + entry.getKey());
+				} catch (Exception e) {
 					logger.info(e.getLocalizedMessage());
 				}
 			}
@@ -485,24 +506,24 @@ public void publishEmail() {
 	int sendEmailWithAttachment(String recipient, ByteArrayDataSource attachment) throws Exception {
 		try {
 			// Creating a mime message
-			 JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-	            mailSender.setHost(host);
-	            mailSender.setPort(Integer.parseInt(port));
-	            
-	    		String decryptSender = cryptoUtil.decrypt(sender);
-	    		String decryptPass = cryptoUtil.decrypt(password);
-	    		
-	           mailSender.setUsername(decryptSender);
-	            mailSender.setPassword(decryptPass);
-	           Properties props = mailSender.getJavaMailProperties();
-	            props.put("mail.smtp.auth", "true");
-	            props.put("mail.smtp.starttls.enable", "true");
+			JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+			mailSender.setHost(host);
+			mailSender.setPort(Integer.parseInt(port));
+
+			String decryptSender = sender;
+			String decryptPass = password;
+
+			mailSender.setUsername(decryptSender);
+			mailSender.setPassword(decryptPass);
+			Properties props = mailSender.getJavaMailProperties();
+			props.put("mail.smtp.auth", "true");
+			props.put("mail.smtp.starttls.enable", "true");
 			MimeMessage mimeMessage = mailSender.createMimeMessage();
 			MimeMessageHelper mimeMessageHelper;
 			mimeMessageHelper = new MimeMessageHelper(mimeMessage, true);
 			mimeMessageHelper.setFrom(sender);
 			mimeMessageHelper.setTo(recipient);
-			 mimeMessageHelper.setText("Sample");
+			mimeMessageHelper.setText("Sample");
 			mimeMessageHelper.setSubject(subject);
 			mimeMessageHelper.addAttachment("InventoryStockAlert.xlsx", attachment);
 
@@ -512,7 +533,7 @@ int sendEmailWithAttachment(String recipient, ByteArrayDataSource attachment) th
 		}
 
 		catch (Exception e) {
-			throw new Exception("Error while Sending Mail to "+recipient+" : " + e.getLocalizedMessage());
+			throw new Exception("Error while Sending Mail to " + recipient + " : " + e.getLocalizedMessage());
 		}
 	}
 }
diff --git a/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniService.java b/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniService.java
new file mode 100644
index 00000000..ffdd80fb
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniService.java
@@ -0,0 +1,6 @@
+package com.iemr.common.service.esanjeevani;
+
+public interface ESanjeevaniService {
+
+	public String registerPatient(Long benRegId) throws Exception;
+}
diff --git a/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniServiceImpl.java b/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniServiceImpl.java
new file mode 100644
index 00000000..47def2dc
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/esanjeevani/ESanjeevaniServiceImpl.java
@@ -0,0 +1,328 @@
+package com.iemr.common.service.esanjeevani;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import com.google.gson.Gson;
+import com.iemr.common.model.esanjeevani.ESanjeevaniPatientAddress;
+import com.iemr.common.model.esanjeevani.ESanjeevaniPatientContactDetail;
+import com.iemr.common.model.esanjeevani.ESanjeevaniPatientRegistration;
+import com.iemr.common.model.esanjeevani.ESanjeevaniProviderAuth;
+import com.iemr.common.repo.esanjeevani.ESanjeevaniRepo;
+
+@Service
+public class ESanjeevaniServiceImpl implements ESanjeevaniService {
+
+	@Autowired
+	RestTemplate restTemplate;
+
+	private Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@Autowired
+	ESanjeevaniRepo eSanjeevaniRepo;
+
+	@Value("${eSanjeevani.url}")
+	private String eSanjeevaniUrl;
+
+	@Value("${eSanjeevani.registerPatient}")
+	private String eSanjeevaniRegisterPatient;
+
+	@Value("${eSanjeevani.source}")
+	private String eSanjeevaniSource;
+
+	@Value("${eSanjeevani.salt}")
+	private String eSanjeevaniSalt;
+
+	@Value("${eSanjeevani.userName}")
+	private String eSanjeevaniUserName;
+
+	@Value("${eSanjeevani.password}")
+	private String eSanjeevaniPassword;
+
+	@Value("${eSanjeevani.routeUrl}")
+	private String eSanjeevaniRouteUrl;
+
+	public String getProviderLogin() throws Exception {
+		String token = null;
+
+		try {
+			String encryptedPaasword = encryptSHA512(encryptSHA512(eSanjeevaniPassword)+encryptSHA512(eSanjeevaniSalt));
+	
+			ESanjeevaniProviderAuth reqObj = new ESanjeevaniProviderAuth();
+			reqObj.setUserName(eSanjeevaniUserName);
+			reqObj.setPassword(encryptedPaasword);
+			reqObj.setSalt(eSanjeevaniSalt);
+			reqObj.setSource(eSanjeevaniSource);
+
+			logger.info("E-Sangeevani auth api reqObj - " + reqObj);
+			String response = restTemplate.postForObject(eSanjeevaniUrl, reqObj, String.class);
+			logger.info("E-Sangeevani auth api response - " + response);
+			if (response != null && !StringUtils.isEmpty(response)) {
+				JSONObject obj = new JSONObject(response);
+				if (obj.has("model") && !obj.isNull("model")) {
+					String modelResponse = obj.get("model").toString();
+					JSONObject tokenResponse = new JSONObject(modelResponse);
+					token = tokenResponse.getString("access_token");
+					if (token != null && !StringUtils.isEmpty(token)) {
+						return token;
+					}
+				}
+			}
+		} catch (Exception e) {
+			return ("Error while fetching Authtoken for E-sanjeevani : " + e.getMessage());
+		}
+		return token;
+
+	}
+	private String encryptSHA512(String string) {
+		try {
+			MessageDigest digest = MessageDigest.getInstance("SHA-512");
+			byte[] hashbytes = digest.digest(string.getBytes());
+			StringBuilder hexString = new StringBuilder();
+			for (byte b : hashbytes) {
+				String hex = Integer.toHexString(0xff & b);
+				if(hex.length()==1) {
+					hexString.append('0');
+				}
+				hexString.append(hex);
+			}
+			return hexString.toString();
+		}catch (Exception e) {
+			return null;
+		}
+		
+	}
+
+
+	@Override
+	public String registerPatient(Long benRegId) throws Exception {
+		try {
+			ESanjeevaniPatientRegistration reqObj = new ESanjeevaniPatientRegistration();
+			ArrayList<ESanjeevaniPatientAddress> addressObj = new ArrayList<>();
+			ArrayList<ESanjeevaniPatientContactDetail> contactObj = new ArrayList<>();
+
+			try {
+				List<Object[]> benMappingResponse = eSanjeevaniRepo.getBeneficiaryMappingIds(benRegId);
+				logger.info("Beneficiary mapping details - " + benMappingResponse);
+				List<Object[]> benAbhaDetailsResponse = eSanjeevaniRepo.getBeneficiaryHealthIdDeatils(benRegId);
+				logger.info("Beneficiary HealthId details - " + benAbhaDetailsResponse);
+
+				if (!benAbhaDetailsResponse.isEmpty()) {
+					Object[] benAbhaDetails = benAbhaDetailsResponse.get(0);
+					reqObj.setAbhaAddress(benAbhaDetails[0].toString());
+					reqObj.setAbhaNumber(benAbhaDetails[1].toString());
+				}
+				if (!benMappingResponse.isEmpty()) {
+					Object[] benMappingIds = benMappingResponse.get(0);
+
+					BigInteger benDetailsId = (BigInteger) benMappingIds[0];
+					BigInteger benAddressId = (BigInteger) benMappingIds[1];
+					BigInteger benContactsId = (BigInteger) benMappingIds[2];
+
+					setBeneficiaryDetails(benDetailsId, reqObj);
+					setBeneficiaryAddressDetails(benAddressId, addressObj);
+					setBeneficiaryContactDetails(benContactsId, contactObj);
+
+					if (!ObjectUtils.isEmpty(addressObj))
+						reqObj.setLstPatientAddress(addressObj);
+					if (!ObjectUtils.isEmpty(contactObj))
+						reqObj.setLstPatientContactDetail(contactObj);
+
+				} else {
+					return ("No beneficiary Details found for benRegId : " + benRegId);
+				}
+			} catch (Exception e) {
+				return ("Issue while fetching mapping details : " + e.getMessage());
+			}
+
+			String accessToken = getProviderLogin();
+			logger.info("getProviderLogin response - " + accessToken);
+			if (accessToken != null && !StringUtils.isEmpty(accessToken)) {
+				MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
+				String registryReqObj = new Gson().toJson(reqObj);
+				headers.add("Authorization", "Bearer " + accessToken);
+				headers.add("Content-Type", "application/json");
+				HttpEntity<Object> requestOBJ = new HttpEntity<Object>(registryReqObj, headers);
+
+				logger.info("E-Sangeevani patient registery api request - " + requestOBJ);
+				ResponseEntity<Object> response = restTemplate.exchange(eSanjeevaniRegisterPatient, HttpMethod.POST,
+						requestOBJ, Object.class);
+
+				logger.info("E-Sangeevani patient registery api response - " + response);
+				if (response != null && response.getStatusCode().is2xxSuccessful()) {
+					Object responseBody = response.getBody();
+
+					if (responseBody != null && responseBody instanceof Map) {
+						Map<String, Object> responseObject = (Map<String, Object>) responseBody;
+						if (responseObject.containsKey("success") && (Boolean) responseObject.get("success")) {
+							if (responseObject.containsKey("msgCode") && responseObject.get("msgCode").equals(1)
+									&& responseObject.containsKey("message")
+									&& responseObject.get("message").toString().equalsIgnoreCase("success")) {
+								return eSanjeevaniRouteUrl;
+							} else if (responseObject.containsKey("msgCode")
+									&& responseObject.get("msgCode").equals(43)) {
+								return eSanjeevaniRouteUrl;
+							} else {
+								return ("Unable to register patient in e-sanjeevani " + responseObject.get("message"));
+							}
+						} else {
+							return ("Unable to register patient for routing to E-Sanjeevani due to : "
+									+ response.getBody());
+						}
+					}
+				} else {
+					return ("Empty response from E-sanjeevani Authorization API");
+				}
+			}
+		} catch (Exception e) {
+			throw new Exception("Error while E-Sanjeevani registering patient : " + e.getMessage());
+		}
+		return null;
+
+	}
+
+	private int calculateAge(String dob) {
+
+		LocalDate currentDate = LocalDate.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+		LocalDate date = LocalDate.parse(dob, formatter);
+		Period period = Period.between(date, currentDate);
+		return period.getYears();
+
+	}
+
+	private void setBeneficiaryDetails(BigInteger benDetailsId, ESanjeevaniPatientRegistration reqObj) {
+		List<Object[]> beneficaryDetails = eSanjeevaniRepo.getBeneficiaryDeatils(benDetailsId);
+		if (beneficaryDetails != null) {
+			Object[] beneficaryObj = beneficaryDetails.get(0);
+			logger.info("Beneficiary details - " + beneficaryObj.toString());
+			if (beneficaryObj[0] != null)
+				reqObj.setFirstName(beneficaryObj[0].toString());
+			if (beneficaryObj[1] != null)
+				reqObj.setLastName(beneficaryObj[1].toString());
+			if (beneficaryObj[2] != null)
+				reqObj.setMiddleName(beneficaryObj[2].toString());
+			if (beneficaryObj[3] != null) {
+				reqObj.setGenderDisplay(beneficaryObj[3].toString());
+				if (beneficaryObj[3].toString().equalsIgnoreCase("male"))
+					reqObj.setGenderCode(1);
+				else if (beneficaryObj[3].toString().equalsIgnoreCase("female"))
+					reqObj.setGenderCode(2);
+				else
+					reqObj.setGenderCode(3);
+			}
+			if (beneficaryObj[4] != null) {
+				String s = beneficaryObj[4].toString();
+				String dob = s.split(" ")[0];
+				reqObj.setAge(calculateAge(dob));
+				reqObj.setBirthdate(dob);
+			}
+			reqObj.setBlock(false);
+			reqObj.setSource(eSanjeevaniSource);
+		}
+
+	}
+
+	private void setBeneficiaryAddressDetails(BigInteger benAddressId,
+			ArrayList<ESanjeevaniPatientAddress> addressObjList) {
+		ESanjeevaniPatientAddress addressObj = new ESanjeevaniPatientAddress();
+		if (benAddressId != null) {
+			List<Object[]> beneficiaryAddDetails = eSanjeevaniRepo.getBeneficiaryAddressDetails(benAddressId);
+			if (null != beneficiaryAddDetails) {
+				Integer countryId = 0;
+				Integer stateId = 0;
+				Integer districtId = 0;
+				Integer blockId = 0;
+				Object[] addressDetails = beneficiaryAddDetails.get(0);
+				logger.info("address details fetch for beneficiary - " + addressDetails);
+				if (addressDetails[0] != null)
+					countryId = (int) addressDetails[0];
+				else
+					countryId = 91;
+				if (addressDetails[1] != null)
+					addressObj.setCountryDisplay(addressDetails[1].toString());
+				else
+					addressObj.setCountryDisplay("India");
+				if (addressDetails[2] != null)
+					stateId = (int) addressDetails[2];
+				if (addressDetails[3] != null)
+					addressObj.setStateDisplay(addressDetails[3].toString());
+				if (addressDetails[4] != null)
+					districtId = (int) addressDetails[4];
+				if (addressDetails[5] != null)
+					addressObj.setDistrictDisplay(addressDetails[5].toString());
+				if (addressDetails[6] != null)
+					blockId = (int) addressDetails[6];
+				if (addressDetails[7] != null)
+					addressObj.setBlockDisplay(addressDetails[7].toString());
+				if (addressDetails[8] != null)
+					addressObj.setAddressLine1(addressDetails[8].toString());
+				if (addressDetails[9] != null)
+					addressObj.setPostalCode(addressDetails[9].toString());
+
+				String govCountryCode = eSanjeevaniRepo.getGovCountyId(countryId);
+				Integer govtStateCode = eSanjeevaniRepo.getGovStateId(stateId);
+				Integer govtDistrictCode = eSanjeevaniRepo.getGovDistrictId(districtId);
+				List<Object[]> govBlockCodeObj = eSanjeevaniRepo.getGovSubDistrictId(blockId);
+				
+				Object[] objects = govBlockCodeObj.get(0);
+				Integer govBlockCode = (Integer)objects[0];
+				Integer govVillageID = (Integer)objects[1];
+				String govVillageName = objects[2].toString();
+				
+				if (govVillageID != null)
+					addressObj.setCityCode(govVillageID);
+				if (govVillageName != null)
+					addressObj.setCityDisplay(govVillageName);
+				if (null != govCountryCode)
+					addressObj.setCountryCode(govCountryCode);
+				if (null != govtStateCode)
+					addressObj.setStateCode(govtStateCode);
+				if (null != govtDistrictCode)
+					addressObj.setDistrictCode(govtDistrictCode);
+				if (null != govBlockCode)
+					addressObj.setBlockCode(govBlockCode);
+
+				addressObjList.add(addressObj);
+			}
+		}
+	}
+
+	private void setBeneficiaryContactDetails(BigInteger benContactId,
+			ArrayList<ESanjeevaniPatientContactDetail> contactObjList) {
+		ESanjeevaniPatientContactDetail contactObj = new ESanjeevaniPatientContactDetail();
+		if (benContactId != null) {
+			String beneficiaryContactDetails = eSanjeevaniRepo.getBeneficiaryContactDetails(benContactId);
+			logger.info("contact details fetch for beneficiary - " + beneficiaryContactDetails);
+			if (null != beneficiaryContactDetails) {
+				contactObj.setContactPointStatus(true);
+				contactObj.setContactPointType("phone");
+				contactObj.setContactPointValue(beneficiaryContactDetails);
+				contactObjList.add(contactObj);
+			}
+		}
+
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingService.java b/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingService.java
index a969460e..8bda0096 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingService.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 import java.text.ParseException;
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingServiceImpl.java b/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingServiceImpl.java
index 9958c5c6..b2674a06 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellCallHandlingServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellDataSync.java b/src/main/java/com/iemr/common/service/everwell/EverwellDataSync.java
index 5877a412..00ad40bc 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellDataSync.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellDataSync.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 public interface EverwellDataSync {
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellDataSyncImpl.java b/src/main/java/com/iemr/common/service/everwell/EverwellDataSyncImpl.java
index f2009859..dac19625 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellDataSyncImpl.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellDataSyncImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationService.java b/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationService.java
index 6f6cc118..351b53d8 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationService.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 public interface EverwellRegistrationService {
diff --git a/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationServiceImpl.java b/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationServiceImpl.java
index 7acb7342..be224283 100644
--- a/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/everwell/EverwellRegistrationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwell;
 
 //import static org.mockito.Mockito.mock;
@@ -126,14 +147,13 @@ public void registerBeneficiary() {
 		try {
 
 			// 1097 user authentication
-		
-			String amritUser = cryptoUtil.decrypt(amritUserName);
-			String amritPass = cryptoUtil.decrypt(amritPassword);
+			String amritUser = amritUserName;
+			String amritPass = amritPassword;
 			LoginRequestModel loginCredentials1097 = new LoginRequestModel(amritUser, amritPass);
 
 			MultiValueMap<String, String> headersLogin = new LinkedMultiValueMap<String, String>();
 			headersLogin.add("Content-Type", "application/json");
-			//headersLogin.add("AUTHORIZATION", "");
+			// headersLogin.add("AUTHORIZATION", "");
 
 			logger.info("AMRIT login request OBj " + loginCredentials1097.toString());
 
diff --git a/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordService.java b/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordService.java
index 50e78663..15ab7d76 100644
--- a/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordService.java
+++ b/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwellStoreRecords;
 
 public interface StoreRecordService {
diff --git a/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordServiceImpl.java b/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordServiceImpl.java
index d284e2cb..0115bbf5 100644
--- a/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/everwellStoreRecords/StoreRecordServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.everwellStoreRecords;
 
 public class StoreRecordServiceImpl {
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackRequestService.java b/src/main/java/com/iemr/common/service/feedback/FeedbackRequestService.java
index d85cffb7..395c88ff 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackRequestService.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackRequestService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import com.iemr.common.data.feedback.FeedbackRequest;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackRequestServiceImpl.java b/src/main/java/com/iemr/common/service/feedback/FeedbackRequestServiceImpl.java
index 916ef9b6..3ae8a0ce 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackRequestServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackRequestServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackResponseService.java b/src/main/java/com/iemr/common/service/feedback/FeedbackResponseService.java
index 0304f8d7..f4055c33 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackResponseService.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackResponseService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackResponseServiceImpl.java b/src/main/java/com/iemr/common/service/feedback/FeedbackResponseServiceImpl.java
index afde0637..463f4c47 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackResponseServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackResponseServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackService.java b/src/main/java/com/iemr/common/service/feedback/FeedbackService.java
index 20fd8582..96f79a32 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackService.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.sql.Timestamp;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackServiceImpl.java b/src/main/java/com/iemr/common/service/feedback/FeedbackServiceImpl.java
index 11919ef7..336f3cad 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.math.BigInteger;
@@ -271,6 +292,10 @@ public Integer updateFeedback(String feedbackString) throws Exception {
 	public String saveFeedback(String feedbackDetails) throws Exception {
 		FeedbackDetails[] feedbacks = inputMapper.gson().fromJson(feedbackDetails, FeedbackDetails[].class);
 		for (FeedbackDetails feedback : feedbacks) {
+			if(feedback.getInstituteName() != null) {
+                feedback.setInstiName(feedback.getInstituteName());
+            }
+			
 			if (feedback.getFeedbackStatusID() == null) {
 				getFeedbackStatusID();
 				feedback.setFeedbackStatusID(feedbackStatusID);
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityService.java b/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityService.java
index 758f2a78..5966fe84 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityService.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityServiceImpl.java b/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityServiceImpl.java
index 3f11a020..a5e7e4d2 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackSeverityServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackTypeService.java b/src/main/java/com/iemr/common/service/feedback/FeedbackTypeService.java
index 996eb9ad..bbb47493 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackTypeService.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/feedback/FeedbackTypeServiceImpl.java b/src/main/java/com/iemr/common/service/feedback/FeedbackTypeServiceImpl.java
index cec60530..c999d211 100644
--- a/src/main/java/com/iemr/common/service/feedback/FeedbackTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/feedback/FeedbackTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.feedback;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryService.java b/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryService.java
index 3c0d3e8e..a8ddede6 100644
--- a/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryService.java
+++ b/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.helpline104history;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryServiceImpl.java b/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryServiceImpl.java
index b6cf9b89..d33a3541 100644
--- a/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/helpline104history/H104BenHistoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.helpline104history;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/honeywell/HoneywellService.java b/src/main/java/com/iemr/common/service/honeywell/HoneywellService.java
index 33943663..9d48ffec 100644
--- a/src/main/java/com/iemr/common/service/honeywell/HoneywellService.java
+++ b/src/main/java/com/iemr/common/service/honeywell/HoneywellService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.honeywell;
 
 public interface HoneywellService {
diff --git a/src/main/java/com/iemr/common/service/honeywell/HoneywellServiceImpl.java b/src/main/java/com/iemr/common/service/honeywell/HoneywellServiceImpl.java
index 8ac6aeeb..956193e4 100644
--- a/src/main/java/com/iemr/common/service/honeywell/HoneywellServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/honeywell/HoneywellServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.honeywell;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/service/institute/DesignationService.java b/src/main/java/com/iemr/common/service/institute/DesignationService.java
index 9e82b999..2a8c84a0 100644
--- a/src/main/java/com/iemr/common/service/institute/DesignationService.java
+++ b/src/main/java/com/iemr/common/service/institute/DesignationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/institute/DesignationServiceImpl.java b/src/main/java/com/iemr/common/service/institute/DesignationServiceImpl.java
index e5354719..66e956f3 100644
--- a/src/main/java/com/iemr/common/service/institute/DesignationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/institute/DesignationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/institute/InstituteService.java b/src/main/java/com/iemr/common/service/institute/InstituteService.java
index 3a20fdd6..1df8e5cf 100644
--- a/src/main/java/com/iemr/common/service/institute/InstituteService.java
+++ b/src/main/java/com/iemr/common/service/institute/InstituteService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 
diff --git a/src/main/java/com/iemr/common/service/institute/InstituteServiceImpl.java b/src/main/java/com/iemr/common/service/institute/InstituteServiceImpl.java
index 868d145f..9186cf02 100644
--- a/src/main/java/com/iemr/common/service/institute/InstituteServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/institute/InstituteServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/institute/InstituteTypeService.java b/src/main/java/com/iemr/common/service/institute/InstituteTypeService.java
index 5af8cb70..aa425e36 100644
--- a/src/main/java/com/iemr/common/service/institute/InstituteTypeService.java
+++ b/src/main/java/com/iemr/common/service/institute/InstituteTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/institute/InstituteTypeServiceImpl.java b/src/main/java/com/iemr/common/service/institute/InstituteTypeServiceImpl.java
index 05c4db99..6e06bc84 100644
--- a/src/main/java/com/iemr/common/service/institute/InstituteTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/institute/InstituteTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.institute;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerService.java b/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerService.java
index 9f43ff06..db0a687e 100644
--- a/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerService.java
+++ b/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.kmfilemanager;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerServiceImpl.java b/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerServiceImpl.java
index f3f842cd..348317b6 100644
--- a/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/kmfilemanager/KMFileManagerServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.kmfilemanager;
 
 import java.io.File;
diff --git a/src/main/java/com/iemr/common/service/location/LocationService.java b/src/main/java/com/iemr/common/service/location/LocationService.java
index 8a499e2b..51847893 100644
--- a/src/main/java/com/iemr/common/service/location/LocationService.java
+++ b/src/main/java/com/iemr/common/service/location/LocationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.location;
 
 
diff --git a/src/main/java/com/iemr/common/service/location/LocationServiceImpl.java b/src/main/java/com/iemr/common/service/location/LocationServiceImpl.java
index fbb6ab7e..00def78a 100644
--- a/src/main/java/com/iemr/common/service/location/LocationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/location/LocationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.location;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/service/lonic/LonicService.java b/src/main/java/com/iemr/common/service/lonic/LonicService.java
index 643eef67..5f6aec15 100644
--- a/src/main/java/com/iemr/common/service/lonic/LonicService.java
+++ b/src/main/java/com/iemr/common/service/lonic/LonicService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.lonic;
 
 import com.iemr.common.data.lonic.LonicDescription;
diff --git a/src/main/java/com/iemr/common/service/lonic/LonicServiceImpl.java b/src/main/java/com/iemr/common/service/lonic/LonicServiceImpl.java
index 7f7e0cf6..70b79340 100644
--- a/src/main/java/com/iemr/common/service/lonic/LonicServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/lonic/LonicServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.lonic;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentService.java b/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentService.java
new file mode 100644
index 00000000..7ed527b1
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentService.java
@@ -0,0 +1,38 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.service.lungassessment;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public interface LungAssessmentService {
+
+	public String getLungAssessmentAdminLogin(String email, String password) throws Exception;
+
+	public Boolean verifyCough(MultipartFile file, String authToken, Long patientId) throws Exception;
+
+	String getAssesment(String assesmentId) throws Exception;
+
+	String initiateAssesment(String request, MultipartFile file) throws Exception;
+
+	public String getAssessmentDetails(Long patientId) throws Exception;
+
+}
diff --git a/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentServiceImpl.java b/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentServiceImpl.java
new file mode 100644
index 00000000..8903cd3f
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/lungassessment/LungAssessmentServiceImpl.java
@@ -0,0 +1,380 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.common.service.lungassessment;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.List;
+
+import javax.xml.ws.http.HTTPException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.google.gson.Gson;
+import com.iemr.common.data.lungassessment.LungAssessment;
+import com.iemr.common.data.lungassessment.LungAssessmentResponseDTO;
+import com.iemr.common.data.lungassessment.LungAssessmentAuthenticateResponse;
+import com.iemr.common.data.lungassessment.LungAssessmentValidateCoughReponseDTO;
+import com.iemr.common.repo.lungassessment.LungAssessmentRepository;
+import com.iemr.common.utils.http.HttpUtils;
+import com.iemr.common.utils.mapper.InputMapper;
+
+@Service
+@PropertySource("classpath:application.properties")
+public class LungAssessmentServiceImpl implements LungAssessmentService {
+
+	private static String lungAssessmentToken;
+	private static long authCreatedAt;
+
+	private static HttpUtils httpUtils = new HttpUtils();
+
+	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@Value("${lungAssessmentPath}")
+	private String lungAssessmentPath;
+
+	@Value("${lungAssessmentAdminLogin}")
+	private String lungAssessmentAdminLoginUrl;
+
+	@Value("${lungAssessmentEmail}")
+	private String lungAssessmentEmail;
+
+	@Value("${lungAssessmentPassword}")
+	private String lungAssessmentPassword;
+
+	@Value("${lungAssessmentValidateCough}")
+	private String lungAssessmentValidateCoughUrl;
+
+	@Value("${lungAssessmentStartAssesment}")
+	private String lungAssessmentAssesmentUrl;
+
+	@Value("${lungAssessmentGetAssesment}")
+	private String lungAssessmentGetAssesmentUrl;
+
+	@Autowired
+	private LungAssessmentRepository lungAssessmentRepository;
+
+	@Override
+	public String getLungAssessmentAdminLogin(String email, String password) throws Exception {
+		String lungAssessmentToken = null;
+		try {
+			RestTemplate restTemplate = new RestTemplate();
+			HttpHeaders headers = new HttpHeaders();
+
+			MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<>();
+			bodyMap.add("email", email);
+			bodyMap.add("password", password);
+
+
+			logger.info("Lung assessment authentication request: " + bodyMap.toString());
+
+			HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
+			ResponseEntity<String> responseEntity = restTemplate.exchange(lungAssessmentAdminLoginUrl, HttpMethod.POST,
+					requestEntity, String.class);
+
+			if (responseEntity.getStatusCode() != HttpStatus.OK) {
+
+				throw new RuntimeException("Lung assessment authentication failed, statusCode : "
+						+ responseEntity.getStatusCodeValue() + " response : " + responseEntity.toString());
+			} else {
+				String response = responseEntity.getBody() != null ? responseEntity.getBody() : null;
+				LungAssessmentAuthenticateResponse responseBody = InputMapper.gson().fromJson(response,
+						LungAssessmentAuthenticateResponse.class);
+
+				if (responseBody != null && responseBody.getAccessToken() != null) {
+					lungAssessmentToken = responseBody.getAccessToken();
+
+					authCreatedAt = System.currentTimeMillis();
+				}
+			}
+
+			logger.info("Lung assessment authentication response: " + lungAssessmentToken);
+
+		} catch (HTTPException e) {
+			logger.error("Lung assessment authentication error : " + e.getMessage(), e);
+			throw new RuntimeException("get authentication failed with error", e);
+		} catch (Exception e) {
+			logger.error("Lung assessment authentication error : " + e.getMessage(), e);
+			throw new RuntimeException("get authentication failed with error", e);
+		}
+		return lungAssessmentToken;
+	}
+
+	@Override
+	public Boolean verifyCough(MultipartFile file, String authToken, Long patientId) throws Exception {
+
+		try {
+
+			if (file == null || file.isEmpty())
+				throw new Exception("file is missing,please pass a cough recording file");
+
+			long currTime = System.currentTimeMillis();
+
+			String decryptlungAssessmentEmail = lungAssessmentEmail;
+			String decryptlungAssessmentPassword = lungAssessmentPassword;
+			if (lungAssessmentToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
+				lungAssessmentToken = getLungAssessmentAdminLogin(decryptlungAssessmentEmail, decryptlungAssessmentPassword);
+
+			RestTemplate restTemplate = new RestTemplate();
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+			headers.add("accessToken", authToken);
+
+			byte[] bytes = file.getBytes();
+			String tempFileName = "coughSoundVerify" + patientId + System.currentTimeMillis() + ".wav";
+			BufferedOutputStream stream = new BufferedOutputStream(
+					new FileOutputStream(new File(lungAssessmentPath + tempFileName)));
+			stream.write(bytes);
+			stream.close();
+
+			MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
+			bodyMap.add("coughsoundfile", new FileSystemResource(lungAssessmentPath + tempFileName));
+
+			HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
+
+			logger.info("Lung assessment validate cough quality request : " + requestEntity);
+			ResponseEntity<String> responseEntity = restTemplate.exchange(lungAssessmentValidateCoughUrl, HttpMethod.POST,
+					requestEntity, String.class);
+
+			if (responseEntity.getStatusCode() == HttpStatus.OK) {
+				String responseBody = responseEntity.getBody() != null ? responseEntity.getBody() : null;
+				logger.info("Lung assessment validate cough quality response : " + responseBody);
+				LungAssessmentValidateCoughReponseDTO obj = InputMapper.gson().fromJson(responseBody,
+						LungAssessmentValidateCoughReponseDTO.class);
+
+				Boolean isValidCough;
+				if (obj != null) {
+					isValidCough = (Boolean) obj.getData().get("isValidCough");
+				} else
+					throw new RuntimeException(
+							"cough file validation is failed at lung assessment end : response" + responseBody);
+
+				if (isValidCough != null)
+					return isValidCough;
+				else
+					throw new RuntimeException("cough file validation is failed at lung assessment end : " + obj.getStatus());
+			} else
+				throw new RuntimeException("error from lung assessment validate cough API : " + responseEntity.toString());
+		} catch (Exception e) {
+			logger.error("Lung assessment validate cough quality exception : ", e);
+			throw new RuntimeException("Lung assessment validate cough quality exception : " + e.getMessage());
+		}
+
+	}
+
+	@Override
+	public String initiateAssesment(String request, MultipartFile file) throws Exception {
+		LungAssessment resultSet = new LungAssessment();
+		try {
+			if (file == null || file.isEmpty())
+				throw new Exception("file is missing,please pass a cough recording file");
+
+			LungAssessment lungAssessmentAssessmentRequestObj = InputMapper.gson().fromJson(request, LungAssessment.class);
+			if (lungAssessmentAssessmentRequestObj != null && lungAssessmentAssessmentRequestObj.getSymptoms() != null) {
+				lungAssessmentAssessmentRequestObj
+						.setFrequent_cough(lungAssessmentAssessmentRequestObj.getSymptoms().getFrequent_cough());
+				lungAssessmentAssessmentRequestObj.setSputum(lungAssessmentAssessmentRequestObj.getSymptoms().getSputum());
+				lungAssessmentAssessmentRequestObj
+						.setCough_at_night(lungAssessmentAssessmentRequestObj.getSymptoms().getCough_at_night());
+				lungAssessmentAssessmentRequestObj.setWheezing(lungAssessmentAssessmentRequestObj.getSymptoms().getWheezing());
+				lungAssessmentAssessmentRequestObj
+						.setPain_in_chest(lungAssessmentAssessmentRequestObj.getSymptoms().getPain_in_chest());
+				lungAssessmentAssessmentRequestObj
+						.setShortness_of_breath(lungAssessmentAssessmentRequestObj.getSymptoms().getShortness_of_breath());
+			}
+
+			if (lungAssessmentAssessmentRequestObj.getPatientId() == null)
+				throw new RuntimeException("Missing patient Id, please pass a valid patient Id");
+
+			long currTime = System.currentTimeMillis();
+			String decryptlungAssessmentEmail = lungAssessmentEmail;
+			String decryptlungAssessmentPassword = lungAssessmentPassword;
+			if (lungAssessmentToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
+				lungAssessmentToken = getLungAssessmentAdminLogin(decryptlungAssessmentEmail, decryptlungAssessmentPassword);
+
+			Boolean isCoughValidateSuccess = verifyCough(file, lungAssessmentToken, lungAssessmentAssessmentRequestObj.getPatientId());
+
+			if (isCoughValidateSuccess) {
+				RestTemplate restTemplate = new RestTemplate();
+				HttpHeaders headers = new HttpHeaders();
+				headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+				headers.add("accessToken", lungAssessmentToken);
+
+				lungAssessmentAssessmentRequestObj.setAssessmentId(
+						"pid" + lungAssessmentAssessmentRequestObj.getPatientId() + "salt" + System.currentTimeMillis());
+				resultSet = lungAssessmentRepository.save(lungAssessmentAssessmentRequestObj);
+
+				byte[] bytes = file.getBytes();
+				String tempFileName = "coughSoundAssessment" + lungAssessmentAssessmentRequestObj.getPatientId()
+						+ System.currentTimeMillis() + ".wav";
+				BufferedOutputStream stream = new BufferedOutputStream(
+						new FileOutputStream(new File("lungAssessmentPath" + tempFileName)));
+				stream.write(bytes);
+				stream.close();
+
+				MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
+				bodyMap.add("symptoms", new Gson().toJson(lungAssessmentAssessmentRequestObj.getSymptoms()));
+				bodyMap.add("timestamp", lungAssessmentAssessmentRequestObj.getTimestamp());
+				bodyMap.add("age", lungAssessmentAssessmentRequestObj.getAge());
+				bodyMap.add("gender", lungAssessmentAssessmentRequestObj.getGender());
+				bodyMap.add("assessmentId", lungAssessmentAssessmentRequestObj.getAssessmentId());
+				bodyMap.add("patientId", lungAssessmentAssessmentRequestObj.getPatientId());
+				bodyMap.add("coughsoundfile", new FileSystemResource("swaasaPath" + tempFileName));
+
+				HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
+
+				logger.info("Lung assessment API request: " + requestEntity);
+
+				ResponseEntity<String> responseEntity = restTemplate.exchange(lungAssessmentAssesmentUrl, HttpMethod.POST,
+						requestEntity, String.class);
+
+				LungAssessmentResponseDTO lungAssessmentAssessmentResponseDTO;
+				if (responseEntity.getStatusCode() == HttpStatus.OK) {
+					String responseBody = responseEntity.getBody() != null ? responseEntity.getBody().toString() : null;
+					lungAssessmentAssessmentResponseDTO = InputMapper.gson().fromJson(responseBody,
+							LungAssessmentResponseDTO.class);
+				} else
+					throw new RuntimeException(
+							"Lung assessment start assesment API exception. statusCode = " + responseEntity.getStatusCodeValue()
+									+ " and response body from Lung assessment: " + responseEntity.getBody().toString());
+
+				logger.info("start assesment success response: " + responseEntity.getBody());
+				if (resultSet != null && resultSet.getId() != null && lungAssessmentAssessmentResponseDTO != null
+						&& lungAssessmentAssessmentResponseDTO.getStatus().equalsIgnoreCase("SUCCESS")) {
+					resultSet.setRecord_duration(lungAssessmentAssessmentResponseDTO.getData().getRecord_duration());
+					resultSet.setStatus(lungAssessmentAssessmentResponseDTO.getData().getStatus());
+					resultSet.setRisk(lungAssessmentAssessmentResponseDTO.getData().getRisk());
+					resultSet.setCough_severity_score(lungAssessmentAssessmentResponseDTO.getData().getCough_severity_score());
+					resultSet.setCough_pattern(lungAssessmentAssessmentResponseDTO.getData().getCough_pattern());
+					resultSet.setDry_cough_count(lungAssessmentAssessmentResponseDTO.getData().getDry_cough_count());
+					resultSet.setWet_cough_count(lungAssessmentAssessmentResponseDTO.getData().getWet_cough_count());
+					resultSet.setSeverity(lungAssessmentAssessmentResponseDTO.getData().getSeverity());
+
+					lungAssessmentRepository.save(resultSet);
+				} else
+					throw new RuntimeException("status from Lung assessment : " + lungAssessmentAssessmentResponseDTO.getStatus()
+							+ " message from Lung assessment : " + lungAssessmentAssessmentResponseDTO.getData().getMessage());
+
+			} else
+				throw new RuntimeException("cough file validation is failed at lung assessment end");
+		} catch (Exception e) {
+			logger.error("Lung assessment API exception: " + e.getMessage());
+			throw new RuntimeException("Lung assessment API exception : " + e.getMessage());
+		}
+		return new Gson().toJson(resultSet);
+	}
+
+	@Override
+	public String getAssesment(String assessmentId) throws Exception {
+		LungAssessmentResponseDTO lungAssessmentAssessmentResponseDTO = new LungAssessmentResponseDTO();
+		LungAssessment lungAssessmentEntity = new LungAssessment();
+		try {
+			List<LungAssessment> assessmentResults = lungAssessmentRepository.findByAssessmentId(assessmentId);
+			if (assessmentResults != null && assessmentResults.size() > 0) {
+				if (assessmentResults.get(assessmentResults.size() - 1).getStatus() != null && assessmentResults
+						.get(assessmentResults.size() - 1).getStatus().equalsIgnoreCase("SUCCESS")) {
+					lungAssessmentEntity = assessmentResults.get(assessmentResults.size() - 1);
+					return new Gson().toJson(lungAssessmentEntity);
+				} else {
+					long currTime = System.currentTimeMillis();
+
+					String decryptlungAssessmentEmail = lungAssessmentEmail;
+					String decryptlungAssessmentPassword = lungAssessmentPassword;
+					if (lungAssessmentToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
+						lungAssessmentToken = getLungAssessmentAdminLogin(decryptlungAssessmentEmail, decryptlungAssessmentPassword);
+
+					RestTemplate restTemplate = new RestTemplate();
+					HttpHeaders headers = new HttpHeaders();
+					headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+					headers.add("accessToken", lungAssessmentToken);
+
+					logger.info("Lung assessment get assesment API - assessmentId =  " + assessmentId);
+
+					MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
+					bodyMap.add("assessmentId", assessmentId);
+
+					HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
+					logger.info("Lung assessment get assesment result request : " + requestEntity);
+					ResponseEntity<String> responseEntity = restTemplate.exchange(lungAssessmentGetAssesmentUrl, HttpMethod.GET,
+							requestEntity, String.class);
+
+
+					if (responseEntity.getStatusCode() == HttpStatus.OK) {
+						String responseBody = responseEntity.getBody() != null ? responseEntity.getBody().toString()
+								: "";
+						lungAssessmentAssessmentResponseDTO = InputMapper.gson().fromJson(responseBody,
+								LungAssessmentResponseDTO.class);
+
+						if (lungAssessmentEntity.getId() != null) {
+							lungAssessmentEntity.setRecord_duration(lungAssessmentAssessmentResponseDTO.getData().getRecord_duration());
+							lungAssessmentEntity.setStatus(lungAssessmentAssessmentResponseDTO.getData().getStatus());
+							lungAssessmentEntity.setRisk(lungAssessmentAssessmentResponseDTO.getData().getRisk());
+							lungAssessmentEntity.setCough_severity_score(
+									lungAssessmentAssessmentResponseDTO.getData().getCough_severity_score());
+							lungAssessmentEntity.setCough_pattern(lungAssessmentAssessmentResponseDTO.getData().getCough_pattern());
+							lungAssessmentEntity.setDry_cough_count(lungAssessmentAssessmentResponseDTO.getData().getDry_cough_count());
+							lungAssessmentEntity.setWet_cough_count(lungAssessmentAssessmentResponseDTO.getData().getWet_cough_count());
+							lungAssessmentEntity.setSeverity(lungAssessmentAssessmentResponseDTO.getData().getSeverity());
+
+							lungAssessmentRepository.save(lungAssessmentEntity);
+						}
+
+					} else
+						throw new RuntimeException("Lung assessment get assesment API call failed with status code "
+								+ responseEntity.getStatusCodeValue() + " and response : " + responseEntity);
+
+					return new Gson().toJson(lungAssessmentEntity);
+
+				}
+			} else
+				throw new Exception("Invalid assessment id, please pass correct assessment id");
+
+		} catch (Exception e) {
+			logger.error("get assesment API failed with error " + e.getMessage());
+			throw new Exception("get assesment API failed with error : " + e.getLocalizedMessage());
+		}
+
+	}
+
+	public String getAssessmentDetails(Long patientId) throws Exception {
+		List<LungAssessment> resultSet = lungAssessmentRepository.findByPatientId(patientId);
+		return new Gson().toJson(resultSet);
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryService.java b/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryService.java
index 1ba09a72..4b9c54fd 100644
--- a/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryService.java
+++ b/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.mctshistory;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryServiceImpl.java b/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryServiceImpl.java
index 5efb4d30..9df69564 100644
--- a/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/mctshistory/OutboundHistoryServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.mctshistory;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDataService.java b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDataService.java
new file mode 100644
index 00000000..5b782c47
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDataService.java
@@ -0,0 +1,9 @@
+package com.iemr.common.service.nhm_dashboard;
+
+import java.io.IOException;
+
+public interface NHM_AgentRealTimeDataService {
+
+	String getData() throws IOException;
+
+}
diff --git a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDatacServiceImpl.java b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDatacServiceImpl.java
new file mode 100644
index 00000000..82cd6299
--- /dev/null
+++ b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_AgentRealTimeDatacServiceImpl.java
@@ -0,0 +1,101 @@
+package com.iemr.common.service.nhm_dashboard;
+
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.iemr.common.constant.Constants;
+import com.iemr.common.data.nhm_dashboard.AgentRealTimeData;
+import com.iemr.common.data.nhm_dashboard.NHMAgentRequest;
+import com.iemr.common.repository.nhm_dashboard.NHMAgentRealTimeDataRepo;
+
+
+@Service
+public class NHM_AgentRealTimeDatacServiceImpl implements NHM_AgentRealTimeDataService {
+	private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+	
+	@Value("${nhm.agent.real.time.data.url}")
+	private String czUrl;
+	@Autowired
+	NHMAgentRealTimeDataRepo agentRealTimeDataRepo;
+
+	@Override
+	public String getData() throws IOException {
+		RestTemplate restTemplate = new RestTemplate();
+		ArrayList<AgentRealTimeData> arrayList = new ArrayList<AgentRealTimeData>();
+		NHMAgentRequest nhmAgentRequest = new NHMAgentRequest();
+		nhmAgentRequest.setCampaign_name("all");
+		String json = new Gson().toJson(nhmAgentRequest);
+		MultiValueMap<String, String> headersLogin = new LinkedMultiValueMap<String, String>();
+		headersLogin.add("Content-Type", "application/json");
+		
+		HttpEntity<Object> request = new HttpEntity<Object>(json, headersLogin);
+		String resp = null;
+		try {
+			ResponseEntity<String> exchange = restTemplate.exchange(czUrl, HttpMethod.POST, request, String.class);
+			resp = exchange.getBody();
+		} catch (Exception e) {
+			log.error("Error While callin CZ Url : " + czUrl + " Error Message " + e.getMessage());
+		}
+		ObjectMapper mapper = new ObjectMapper();
+		if (null != resp && resp.startsWith("[") && resp.endsWith("]")) {
+			ArrayList<HashMap<String, Object>> readValue = mapper.readValue(resp, ArrayList.class);
+			for (HashMap<String, Object> object : readValue) {
+				HashMap convertValue = mapper.convertValue(object, HashMap.class);
+				for (String key : object.keySet()) {
+					AgentRealTimeData agentRealTimeData = new AgentRealTimeData();
+					HashMap<String, Integer> object2 = (HashMap<String, Integer>) convertValue.get(key);
+					agentRealTimeData.setCampaignName(key);
+					agentRealTimeData.setCreatedBy("default");
+					agentRealTimeData.setModifiedBy("default");
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+					String DateToStoreInDataBase = sdf.format(new Date());
+					Timestamp ts = Timestamp.valueOf(DateToStoreInDataBase);
+					agentRealTimeData.setCreatedDate(ts);
+					agentRealTimeData.setModifiedDate(ts);
+					for (String key1 : object2.keySet()) {
+						if (key1.equalsIgnoreCase(Constants.LOGGED_IN))
+							agentRealTimeData.setLoggedIn(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.FREE))
+							agentRealTimeData.setFree(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.IN_CALL))
+							agentRealTimeData.setInCall(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.AWT))
+							agentRealTimeData.setAwt(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.HOLD))
+							agentRealTimeData.setHold(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.NOT_READY))
+							agentRealTimeData.setNotReady(object2.get(key1));
+						if (key1.equalsIgnoreCase(Constants.AUX))
+							agentRealTimeData.setAux(object2.get(key1));
+					}
+					arrayList.add(agentRealTimeData);
+				}
+			}
+		}
+		if(null != arrayList && !ObjectUtils.isEmpty(arrayList)) {
+			agentRealTimeDataRepo.deleteAll();
+			agentRealTimeDataRepo.save(arrayList);
+		}
+		return resp;
+	}
+
+}
diff --git a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardService.java b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardService.java
index 43f5de62..76027d64 100644
--- a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardService.java
+++ b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.nhm_dashboard;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java
index 26d258a3..a248170a 100644
--- a/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/nhm_dashboard/NHM_DashboardServiceImpl.java
@@ -1,9 +1,32 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.nhm_dashboard;
 
 import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -177,24 +200,31 @@ public String saveDetailedCallReport(List<DetailedCallReport> detailedCallReport
 
 	public List<AgentSummaryReport> callAgentSummaryReportCTI_API() throws IEMRException {
 		List<AgentSummaryReport> agentSummaryReportList = new ArrayList<AgentSummaryReport>();
-		String job = ConfigProperties.getPropertyByName("get-agent-summary-report-job");
+//		String job = ConfigProperties.getPropertyByName("get-agent-summary-report-job");
 
 		String endDate = null;
 		String fromDate = null;
-		if (job != null && job.toLowerCase().contains("hour")) {
-			String jobVal = job.split(" ")[0];
-			LocalDateTime nowTime = LocalDateTime.now();
-			endDate = nowTime.toString().replace("T", " ");
-			String[] arr = endDate.split("\\.");
-			endDate = arr[0];
-
-			LocalDateTime nowTime_hrs = nowTime.minusHours(Integer.valueOf(jobVal));
-			fromDate = nowTime_hrs.toString().replace("T", " ");
-			String[] arr1 = fromDate.split("\\.");
-			fromDate = arr1[0];
-
-		} else
-			throw new IEMRException("Please pass correct period for schedular - in hours");
+		
+		LocalDateTime date = null;
+		date = LocalDateTime.now().minusDays(1);
+		String[] dateArr = date.toString().split("T");
+		endDate = dateArr[0].concat(" 23:59:59");
+		fromDate = dateArr[0].concat(" 00:00:01");
+		
+//		if (job != null && job.toLowerCase().contains("hour")) {
+//			String jobVal = job.split(" ")[0];
+//			LocalDateTime nowTime = LocalDateTime.now();
+//			endDate = nowTime.toString().replace("T", " ");
+//			String[] arr = endDate.split("\\.");
+//			endDate = arr[0];
+//
+//			LocalDateTime nowTime_hrs = nowTime.minusHours(Integer.valueOf(jobVal));
+//			fromDate = nowTime_hrs.toString().replace("T", " ");
+//			String[] arr1 = fromDate.split("\\.");
+//			fromDate = arr1[0];
+//
+//		} else
+//			throw new IEMRException("Please pass correct period for schedular - in hours");
 
 		String ctiURI = ConfigProperties.getPropertyByName("get-agent-summary-report-URL");
 		String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
@@ -215,24 +245,31 @@ else if (response.toLowerCase().contains("no data"))
 
 	public List<DetailedCallReport> callDetailedCallReportCTI_API() throws IEMRException {
 		List<DetailedCallReport> detailedCallReportList = new ArrayList<DetailedCallReport>();
-		String job = ConfigProperties.getPropertyByName("get-details-call-report-job");
+//		String job = ConfigProperties.getPropertyByName("get-details-call-report-job");
 
 		String endDate = null;
 		String fromDate = null;
-		if (job != null && job.toLowerCase().contains("hour")) {
-			String jobVal = job.split(" ")[0];
-			LocalDateTime nowTime = LocalDateTime.now();
-			endDate = nowTime.toString().replace("T", " ");
-			String[] arr = endDate.split("\\.");
-			endDate = arr[0];
-
-			LocalDateTime nowTime_hrs = nowTime.minusHours(Integer.valueOf(jobVal));
-			fromDate = nowTime_hrs.toString().replace("T", " ");
-			String[] arr1 = fromDate.split("\\.");
-			fromDate = arr1[0];
-
-		} else
-			throw new IEMRException("Please pass correct period for schedular - in hours");
+		
+		LocalDateTime date = null;
+		date = LocalDateTime.now().minusDays(1); 
+		String[] dateArr = date.toString().split("T");
+		endDate = dateArr[0].concat(" 23:59:59");
+		fromDate = dateArr[0].concat(" 00:00:01");
+		
+//		if (job != null && job.toLowerCase().contains("hour")) {
+//			String jobVal = job.split(" ")[0];
+//			LocalDateTime nowTime = LocalDateTime.now();
+//			endDate = nowTime.toString().replace("T", " ");
+//			String[] arr = endDate.split("\\.");
+//			endDate = arr[0];
+//
+//			LocalDateTime nowTime_hrs = nowTime.minusHours(Integer.valueOf(jobVal));
+//			fromDate = nowTime_hrs.toString().replace("T", " ");
+//			String[] arr1 = fromDate.split("\\.");
+//			fromDate = arr1[0];
+//
+//		} else
+//			throw new IEMRException("Please pass correct period for schedular - in hours");
 
 		String ctiURI = ConfigProperties.getPropertyByName("get-details-call-report-URL");
 		String serverURL = ConfigProperties.getPropertyByName("cti-server-ip");
diff --git a/src/main/java/com/iemr/common/service/notification/NotificationService.java b/src/main/java/com/iemr/common/service/notification/NotificationService.java
index aa03c727..b9a3f338 100644
--- a/src/main/java/com/iemr/common/service/notification/NotificationService.java
+++ b/src/main/java/com/iemr/common/service/notification/NotificationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.notification;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/service/notification/NotificationServiceImpl.java b/src/main/java/com/iemr/common/service/notification/NotificationServiceImpl.java
index 0831e87e..5d674c7c 100644
--- a/src/main/java/com/iemr/common/service/notification/NotificationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/notification/NotificationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.notification;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/service/otp/OTPHandler.java b/src/main/java/com/iemr/common/service/otp/OTPHandler.java
index 14fa47d6..efcbb122 100644
--- a/src/main/java/com/iemr/common/service/otp/OTPHandler.java
+++ b/src/main/java/com/iemr/common/service/otp/OTPHandler.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.otp;
 
 import org.json.JSONObject;
diff --git a/src/main/java/com/iemr/common/service/otp/OTPHandlerImpl.java b/src/main/java/com/iemr/common/service/otp/OTPHandlerImpl.java
index 6cad3416..17e6e9a2 100644
--- a/src/main/java/com/iemr/common/service/otp/OTPHandlerImpl.java
+++ b/src/main/java/com/iemr/common/service/otp/OTPHandlerImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.otp;
 
 import java.security.MessageDigest;
@@ -138,11 +159,11 @@ private String getEncryptedOTP(int otp) throws Exception {
 	// send SMS to user
 	private void sendSMS(int otp, String phoneNo, String msgText) throws Exception {
 		// Boolean doSendSMS = ConfigProperties.getBoolean("send-sms");
-		
+
 		String sendSMSURL = ConfigProperties.getPropertyByName("send-message-url");
 		String sendSMSAPI = OTPHandlerImpl.SMS_GATEWAY_URL + "/" + sendSMSURL;
-		String senderName = cryptoUtil.decrypt(ConfigProperties.getPropertyByName("sms-username"));
-		String senderPassword = cryptoUtil.decrypt(ConfigProperties.getPropertyByName("sms-password"));
+		String senderName = ConfigProperties.getPropertyByName("sms-username");
+		String senderPassword = ConfigProperties.getPropertyByName("sms-password");
 		String senderNumber = ConfigProperties.getPropertyByName("sms-sender-number");
 
 		sendSMSAPI = sendSMSAPI.replace("USERNAME", senderName).replace("PASSWORD", senderPassword)
diff --git a/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeService.java b/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeService.java
index 71274b66..3b8d928d 100644
--- a/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeService.java
+++ b/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.questionconfig;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeServiceImpl.java b/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeServiceImpl.java
index 8cd22b31..d625a385 100644
--- a/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/questionconfig/QuestionTypeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.questionconfig;
 
 import java.util.Arrays;
diff --git a/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireService.java b/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireService.java
index 68aa0c0f..25c3cf36 100644
--- a/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireService.java
+++ b/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.questionconfig;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireServiceImpl.java b/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireServiceImpl.java
index 78ddb06f..6f6d7a3f 100644
--- a/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/questionconfig/QuestionnaireServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.questionconfig;
 
 import java.util.Arrays;
diff --git a/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportService.java b/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportService.java
index 3c7860db..a6ddfbfe 100644
--- a/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportService.java
+++ b/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.reportSecondary;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportServiceImpl.java b/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportServiceImpl.java
index ef64d842..af70a1d7 100644
--- a/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.reportSecondary;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/main/java/com/iemr/common/service/reports/CallReportsService.java b/src/main/java/com/iemr/common/service/reports/CallReportsService.java
index e35cc1cb..97b30c84 100644
--- a/src/main/java/com/iemr/common/service/reports/CallReportsService.java
+++ b/src/main/java/com/iemr/common/service/reports/CallReportsService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.reports;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/reports/CallReportsServiceImpl.java b/src/main/java/com/iemr/common/service/reports/CallReportsServiceImpl.java
index b5e73c40..d635d005 100644
--- a/src/main/java/com/iemr/common/service/reports/CallReportsServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/reports/CallReportsServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.reports;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/service/scheme/SchemeService.java b/src/main/java/com/iemr/common/service/scheme/SchemeService.java
index 5d23df8e..437db6f0 100644
--- a/src/main/java/com/iemr/common/service/scheme/SchemeService.java
+++ b/src/main/java/com/iemr/common/service/scheme/SchemeService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.scheme;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/scheme/SchemeServiceImpl.java b/src/main/java/com/iemr/common/service/scheme/SchemeServiceImpl.java
index 38f4bf7d..1a968dec 100644
--- a/src/main/java/com/iemr/common/service/scheme/SchemeServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/scheme/SchemeServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.scheme;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/service/services/CommonService.java b/src/main/java/com/iemr/common/service/services/CommonService.java
index 8dd5d8c7..3b068f49 100644
--- a/src/main/java/com/iemr/common/service/services/CommonService.java
+++ b/src/main/java/com/iemr/common/service/services/CommonService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.services;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/services/CommonServiceImpl.java b/src/main/java/com/iemr/common/service/services/CommonServiceImpl.java
index 455730d9..058113dd 100644
--- a/src/main/java/com/iemr/common/service/services/CommonServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/services/CommonServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.services;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/services/Services.java b/src/main/java/com/iemr/common/service/services/Services.java
index d3631f36..33bd31dd 100644
--- a/src/main/java/com/iemr/common/service/services/Services.java
+++ b/src/main/java/com/iemr/common/service/services/Services.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.services;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/services/ServicesImpl.java b/src/main/java/com/iemr/common/service/services/ServicesImpl.java
index 6c9829f8..05dba6e5 100644
--- a/src/main/java/com/iemr/common/service/services/ServicesImpl.java
+++ b/src/main/java/com/iemr/common/service/services/ServicesImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.services;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/sms/SMSService.java b/src/main/java/com/iemr/common/service/sms/SMSService.java
index f7194585..9b443542 100644
--- a/src/main/java/com/iemr/common/service/sms/SMSService.java
+++ b/src/main/java/com/iemr/common/service/sms/SMSService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.sms;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
index 3b7400d5..4afa0400 100644
--- a/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/sms/SMSServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.sms;
 
 import java.lang.reflect.InvocationTargetException;
@@ -7,6 +28,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -19,9 +41,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import com.iemr.common.data.feedback.FeedbackDetails;
 import com.iemr.common.data.feedback.FeedbackRequest;
@@ -57,6 +84,7 @@
 import com.iemr.common.model.sms.SMSRequest;
 import com.iemr.common.model.sms.SMSTemplateResponse;
 import com.iemr.common.model.sms.SMSTypeModel;
+import com.iemr.common.model.sms.SmsAPIRequestModel;
 import com.iemr.common.model.sms.UpdateSMSRequest;
 import com.iemr.common.repository.callhandling.TCRequestModelRepo;
 import com.iemr.common.repository.feedback.FeedbackRepository;
@@ -610,7 +638,7 @@ private SMSNotification prepareSMS(
 					variableValue = getFeedbackData(className, methodName, request, authToken);
 					break;
 				case "Prescription":
-					variableValue = getPrescriptionData(className, methodName, request);
+					variableValue = getPrescriptionData(className, methodName, request, beneficiary);
 					break;
 				case "Blood on Call":
 					variableValue = getBloodOnCallData(className, methodName, request, beneficiary);
@@ -677,7 +705,7 @@ private SMSNotification prepareSMS(
 		if (request.getBenPhoneNo() != null) {
 			sms.setPhoneNo(request.getBenPhoneNo());
 		}
-		
+
 //		if(smsTemplate.getSmsTypeID() == 24)
 //		{
 //			if(TMsms!="" && TMsms!=null)
@@ -874,18 +902,21 @@ private String getInstituteData(String className, String methodName, SMSRequest
 	@Async
 	@Override
 	public void publishSMS() {
+		RestTemplate restTemplateLogin = new RestTemplate();
 		if (!SMSServiceImpl.publishingSMS) {
 			try {
-				
 				SMSServiceImpl.publishingSMS = true;
 				Boolean doSendSMS = ConfigProperties.getBoolean("send-sms");
 				String sendSMSURL = ConfigProperties.getPropertyByName("send-message-url");
-				String sendSMSAPI = SMSServiceImpl.SMS_GATEWAY_URL + "/" + sendSMSURL;
-				String senderName = cryptoUtil.decrypt(ConfigProperties.getPropertyByName("sms-username"));
-				String senderPassword = cryptoUtil.decrypt(ConfigProperties.getPropertyByName("sms-password"));
-				String senderNumber = ConfigProperties.getPropertyByName("sms-sender-number");
-				sendSMSAPI = sendSMSAPI.replace("USERNAME", senderName).replace("PASSWORD", senderPassword)
-						.replace("SENDER_NUMBER", senderNumber);
+//				String sendSMSAPI = SMSServiceImpl.SMS_GATEWAY_URL + "/" + sendSMSURL;
+				String senderName = ConfigProperties.getPropertyByName("sms-username");
+				String senderPassword = ConfigProperties.getPropertyByName("sms-password");
+//				String senderNumber = ConfigProperties.getPropertyByName("sms-sender-number");
+				String sourceAddress = ConfigProperties.getPropertyByName("source-address");
+				String smsMessageType = ConfigProperties.getPropertyByName("sms-message-type");
+				String smsEntityID = ConfigProperties.getPropertyByName("sms-entityid");
+//				sendSMSAPI = sendSMSAPI.replace("USERNAME", senderName).replace("PASSWORD", senderPassword)
+//						.replace("SENDER_NUMBER", senderNumber);
 				java.util.Date date = new java.util.Date();
 				java.sql.Date sqlDate = new java.sql.Date(date.getTime());
 				String text = sqlDate.toString();
@@ -900,59 +931,55 @@ public void publishSMS() {
 
 				StringBuffer phoneNo = new StringBuffer();
 				for (SMSNotification sms : smsNotificationsToSend) {
-					String smsPublishURL = sendSMSAPI;
+//					String smsPublishURL = sendSMSAPI;
 
 					try {
 
-						// smsPublishURL = smsPublishURL.replace("SMS_TEXT",
-						// URLEncoder.encode(sms.getSms(), "UTF-8"))
-
 						if (sms.getPhoneNo() != null && sms.getPhoneNo().length() > 10)
 							phoneNo = new StringBuffer(sms.getPhoneNo().substring(sms.getPhoneNo().length() - 10));
 						else
 							phoneNo = new StringBuffer(sms.getPhoneNo());
 
-						smsPublishURL = smsPublishURL.replace("SMS_TEXT", sms.getSms()).replace("RECEIVER_NUMBER",
-								phoneNo);
+						// for fetching dltTemplateId
+						String dltTemplateId = smsTemplateRepository.findDLTTemplateID(sms.getSmsTemplateID());
+						if(dltTemplateId == null)
+							throw new Exception("No dltTemplateId template ID mapped");
+
+						SmsAPIRequestModel smsAPICredentials104 = new SmsAPIRequestModel(senderName, phoneNo,
+								sms.getSms(), sourceAddress, smsMessageType, dltTemplateId, smsEntityID);
+
+						MultiValueMap<String, String> headersLogin = new LinkedMultiValueMap<String, String>();
+						headersLogin.add("Content-Type", "application/json");
+						String auth=senderName + ":" + senderPassword;
+						headersLogin.add("Authorization", "Basic "+Base64.getEncoder().encodeToString(auth.getBytes()));
+						// smsPublishURL = smsPublishURL.replace("SMS_TEXT",
+						// URLEncoder.encode(sms.getSms(), "UTF-8"))
+
+						logger.info("SMS API login request OBj " + smsAPICredentials104.toString());
+
 						sms.setSmsStatus(SMSNotification.IN_PROGRESS);
 						sms = smsNotification.save(sms);
-//						logger.info("Calling API to send SMS " + smsPublishURL);
-						ResponseEntity<String> response = httpUtils.getV1(smsPublishURL);
-						if (response.getStatusCodeValue() == 200) {
-							String smsResponse = response.getBody();
+
+						HttpEntity<Object> requestLogin = new HttpEntity<Object>(smsAPICredentials104, headersLogin);
+						ResponseEntity<String> responseLogin = restTemplateLogin.exchange(sendSMSURL, HttpMethod.POST,
+								requestLogin, String.class);
+						if (responseLogin.getStatusCodeValue() == 200 & responseLogin.hasBody()) {
+							String smsResponse = responseLogin.getBody();
 							JSONObject obj = new JSONObject(smsResponse);
-							String jobID = obj.getString("JobId");
-							switch (smsResponse) {
-							case "0x200 - Invalid Username or Password":
-							case "0x201 - Account suspended due to one of several defined reasons":
-							case "0x202 - Invalid Source Address/Sender ID. As per GSM standard, the sender ID should "
-									+ "be within 11 characters":
-							case "0x203 - Message length exceeded (more than 160 characters) if concat is set to 0":
-							case "0x204 - Message length exceeded (more than 459 characters) in concat is set to 1":
-							case "0x205 - DRL URL is not set":
-							case "0x206 - Only the subscribed service type can be accessed – "
-									+ "make sure of the service type you are trying to connect with":
-							case "0x207 - Invalid Source IP – kindly check if the IP is responding":
-							case "0x208 - Account deactivated/expired":
-							case "0x209 - Invalid message length (less than 160 characters) if concat is set to 1":
-							case "0x210 - Invalid Parameter values":
-							case "0x211 - Invalid Message Length (more than 280 characters)":
-							case "0x212 - Invalid Message Length":
-							case "0x213 - Invalid Destination Number":
-								throw new Exception(smsResponse);
-							default:
-//								logger.info("SMS Sent successfully by calling API " + smsPublishURL);
-								sms.setTransactionError(null);
-								sms.setTransactionID(jobID);
-								sms.setIsTransactionError(false);
-								sms.setSmsSentDate(new Timestamp(Calendar.getInstance().getTime().getTime()));
-								sms.setSmsStatus(SMSNotification.SENT);
-								sms = smsNotification.save(sms);
-								break;
-							}
+							String messageRequestId = null;
+                            if(obj !=null)
+                            messageRequestId = obj.getString("messageRequestId");
+//							String messageRequestId = obj.getString("MessageRequestId");
+//							logger.info("SMS Sent successfully by calling API " + smsPublishURL);
+							sms.setTransactionError(null);
+							sms.setTransactionID(messageRequestId);
+							sms.setIsTransactionError(false);
+							sms.setSmsSentDate(new Timestamp(Calendar.getInstance().getTime().getTime()));
+							sms.setSmsStatus(SMSNotification.SENT);
+							sms = smsNotification.save(sms);
 						} else {
-							throw new Exception(response.getStatusCodeValue() + " and error "
-									+ response.getStatusCode().toString());
+							throw new Exception(responseLogin.getStatusCodeValue() + " and error "
+									+ responseLogin.getStatusCode().toString());
 						}
 					} catch (Exception e) {
 						logger.error("Failed to send sms on phone no/benRegID: " + sms.getPhoneNo() + "/"
@@ -964,6 +991,63 @@ public void publishSMS() {
 						sms = smsNotification.save(sms);
 					}
 
+//						if (sms.getPhoneNo() != null && sms.getPhoneNo().length() > 10)
+//							phoneNo = new StringBuffer(sms.getPhoneNo().substring(sms.getPhoneNo().length() - 10));
+//						else
+//							phoneNo = new StringBuffer(sms.getPhoneNo());
+
+//						smsPublishURL = smsPublishURL.replace("SMS_TEXT", sms.getSms()).replace("RECEIVER_NUMBER",
+//								phoneNo);
+//						sms.setSmsStatus(SMSNotification.IN_PROGRESS);
+//						sms = smsNotification.save(sms);
+//						logger.info("Calling API to send SMS " + smsPublishURL);
+//						ResponseEntity<String> response = httpUtils.getV1(smsPublishURL);
+//						if (response.getStatusCodeValue() == 200) {
+//							String smsResponse = response.getBody();
+//							JSONObject obj = new JSONObject(smsResponse);
+//							String jobID = obj.getString("JobId");
+//							switch (smsResponse) {
+//							case "0x200 - Invalid Username or Password":
+//							case "0x201 - Account suspended due to one of several defined reasons":
+//							case "0x202 - Invalid Source Address/Sender ID. As per GSM standard, the sender ID should "
+//									+ "be within 11 characters":
+//							case "0x203 - Message length exceeded (more than 160 characters) if concat is set to 0":
+//							case "0x204 - Message length exceeded (more than 459 characters) in concat is set to 1":
+//							case "0x205 - DRL URL is not set":
+//							case "0x206 - Only the subscribed service type can be accessed – "
+//									+ "make sure of the service type you are trying to connect with":
+//							case "0x207 - Invalid Source IP – kindly check if the IP is responding":
+//							case "0x208 - Account deactivated/expired":
+//							case "0x209 - Invalid message length (less than 160 characters) if concat is set to 1":
+//							case "0x210 - Invalid Parameter values":
+//							case "0x211 - Invalid Message Length (more than 280 characters)":
+//							case "0x212 - Invalid Message Length":
+//							case "0x213 - Invalid Destination Number":
+//								throw new Exception(smsResponse);
+//							default:
+////								logger.info("SMS Sent successfully by calling API " + smsPublishURL);
+//								sms.setTransactionError(null);
+//								sms.setTransactionID(jobID);
+//								sms.setIsTransactionError(false);
+//								sms.setSmsSentDate(new Timestamp(Calendar.getInstance().getTime().getTime()));
+//								sms.setSmsStatus(SMSNotification.SENT);
+//								sms = smsNotification.save(sms);
+//								break;
+//							}
+//						} else {
+//							throw new Exception(response.getStatusCodeValue() + " and error "
+//									+ response.getStatusCode().toString());
+//						}
+//					} catch (Exception e) {
+//						logger.error("Failed to send sms on phone no/benRegID: " + sms.getPhoneNo() + "/"
+//								+ sms.getBeneficiaryRegID() + " with error " + e.getMessage(), e);
+//						sms.setTransactionError(e.getMessage());
+//						sms.setIsTransactionError(true);
+//						sms.setTransactionID(null);
+//						sms.setSmsStatus(SMSNotification.NOT_SENT);
+//						sms = smsNotification.save(sms);
+//					}
+
 				}
 			} catch (Exception e) {
 				logger.error("publishSMS failed with error " + e.getMessage());
@@ -981,12 +1065,22 @@ public String getFullSMSTemplate(SMSRequest smsRequest) throws Exception {
 		return OutputMapper.gsonWithoutExposeRestriction().toJson(smsTemplateResponse);
 	}
 
-	private String getPrescriptionData(String className, String methodName, SMSRequest request)
-			throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
-			InvocationTargetException, ClassNotFoundException {
+	private String getPrescriptionData(String className, String methodName, SMSRequest request,
+			BeneficiaryModel beneficiary) throws NoSuchMethodException, SecurityException, IllegalAccessException,
+			IllegalArgumentException, InvocationTargetException, ClassNotFoundException {
 		PrescribedDrug prescribedDrug = prescribedDrugRepository.findOne(request.getPrescribedDrugID());
 		String variableValue = "";
 		switch (methodName.toLowerCase()) {
+		case "name":
+			String fname = beneficiary.getFirstName() != null ? beneficiary.getFirstName() + " " : "";
+			String mname = beneficiary.getMiddleName() != null ? beneficiary.getMiddleName() + " " : "";
+			String lname = beneficiary.getLastName() != null ? beneficiary.getLastName() + " " : "";
+			variableValue = fname + mname + lname;
+			break;
+		case "callerid":
+			String beneficiaryID = beneficiary.getBeneficiaryID() != null ? beneficiary.getBeneficiaryID() + " " : "";
+			variableValue = beneficiaryID;
+			break;
 		case "prescriptionid":
 			String prescriptionid = prescribedDrug.getPrescriptionID() != null
 					? prescribedDrug.getPrescriptionID() + " "
@@ -1009,13 +1103,23 @@ private String getPrescriptionData(String className, String methodName, SMSReque
 			String dosage = prescribedDrug.getDosage() != null ? prescribedDrug.getDosage() + " " : "";
 			variableValue = dosage;
 			break;
-		case "dosageinstruction":
+//		case "dosageinstruction":
+//			String drugForm = prescribedDrug.getM_104drugmapping().getRemarks() != null
+//					? prescribedDrug.getM_104drugmapping().getRemarks() + " "
+//					: "";
+//			variableValue = drugForm;
+//			break;
+		case "usage":
 			String drugForm = prescribedDrug.getM_104drugmapping().getRemarks() != null
 					? prescribedDrug.getM_104drugmapping().getRemarks() + " "
 					: "";
 			variableValue = drugForm;
 			break;
-		case "frequency":
+//		case "frequency":
+//			String frequency = prescribedDrug.getFrequency() != null ? prescribedDrug.getFrequency() + " " : "";
+//			variableValue = frequency;
+//			break;
+		case "timeToConsume":
 			String frequency = prescribedDrug.getFrequency() != null ? prescribedDrug.getFrequency() + " " : "";
 			variableValue = frequency;
 			break;
@@ -1023,6 +1127,10 @@ private String getPrescriptionData(String className, String methodName, SMSReque
 			String quantity = prescribedDrug.getNoOfDays() != null ? prescribedDrug.getNoOfDays() + " " : "";
 			variableValue = quantity;
 			break;
+		case "by":
+			String createdBy = prescribedDrug.getCreatedBy() != null ? prescribedDrug.getCreatedBy() + " " : "";
+			variableValue = createdBy;
+			break;
 		default:
 			break;
 		}
@@ -1444,9 +1552,9 @@ private String getCOVIDData(String className, String methodName, SMSRequest requ
 		}
 		return variableValue;
 	}
-	
+
 	public String getUptsuData(String className, String methodName, SMSRequest request) throws NoSuchMethodException,
-	SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+			SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		String variableValue = null;
 		Method method = null;
 		switch (methodName) {
@@ -1495,6 +1603,5 @@ public String getUptsuData(String className, String methodName, SMSRequest reque
 		}
 		return variableValue;
 	}
-	
-	
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/service/snomedct/SnomedService.java b/src/main/java/com/iemr/common/service/snomedct/SnomedService.java
index 7c2dea39..92a258ed 100644
--- a/src/main/java/com/iemr/common/service/snomedct/SnomedService.java
+++ b/src/main/java/com/iemr/common/service/snomedct/SnomedService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.snomedct;
 
 import com.iemr.common.data.snomedct.SCTDescription;
diff --git a/src/main/java/com/iemr/common/service/snomedct/SnomedServiceImpl.java b/src/main/java/com/iemr/common/service/snomedct/SnomedServiceImpl.java
index 6f9bb119..8759d47b 100644
--- a/src/main/java/com/iemr/common/service/snomedct/SnomedServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/snomedct/SnomedServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.snomedct;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/iemr/common/service/swaasa/SwaasaService.java b/src/main/java/com/iemr/common/service/swaasa/SwaasaService.java
deleted file mode 100644
index 83b7f8ce..00000000
--- a/src/main/java/com/iemr/common/service/swaasa/SwaasaService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iemr.common.service.swaasa;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public interface SwaasaService {
-
-	public String getSwaasaAdminLogin(String email, String password) throws Exception;
-
-	public Boolean verifyCough(MultipartFile file, String authToken, Long patientId) throws Exception;
-
-	String getAssesment(String assesmentId) throws Exception;
-
-	String initiateAssesment(String request, MultipartFile file) throws Exception;
-
-	public String getAssessmentDetails(Long patientId) throws Exception;
-
-}
diff --git a/src/main/java/com/iemr/common/service/swaasa/SwassaServiceImpl.java b/src/main/java/com/iemr/common/service/swaasa/SwassaServiceImpl.java
deleted file mode 100644
index 4b84453f..00000000
--- a/src/main/java/com/iemr/common/service/swaasa/SwassaServiceImpl.java
+++ /dev/null
@@ -1,390 +0,0 @@
-package com.iemr.common.service.swaasa;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
-import javax.xml.ws.http.HTTPException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.google.gson.Gson;
-import com.iemr.common.data.swaasa.Swaasa;
-import com.iemr.common.data.swaasa.SwaasaAssessmentResponseDTO;
-import com.iemr.common.data.swaasa.SwaasaAuthenticateResponse;
-import com.iemr.common.data.swaasa.SwaasaValidateCoughReponseDTO;
-import com.iemr.common.repo.swaasa.SwaasaRepository;
-import com.iemr.common.utils.CryptoUtil;
-import com.iemr.common.utils.http.HttpUtils;
-import com.iemr.common.utils.mapper.InputMapper;
-
-@Service
-@PropertySource("classpath:application.properties")
-public class SwassaServiceImpl implements SwaasaService {
-
-	private static String swaasaToken;
-	private static long authCreatedAt;
-
-	private static HttpUtils httpUtils = new HttpUtils();
-	
-	@Autowired
-	private CryptoUtil cryptoUtil;
-
-	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
-
-	@Value("${swaasaPath}")
-	private String swaasaPath;
-
-	@Value("${swaasaAdminLogin}")
-	private String swaasaAdminLoginUrl;
-
-	@Value("${swaasaEmail}")
-	private String swassaEmail;
-
-	@Value("${swaasaPassword}")
-	private String swaasaPassword;
-
-	@Value("${swaasaValidateCough}")
-	private String swaasaValidateCoughUrl;
-
-	@Value("${swaasaStartAssesment}")
-	private String swassaAssesmentUrl;
-
-	@Value("${swaasaGetAssesment}")
-	private String swaasaGetAssesmentUrl;
-
-	@Autowired
-	private SwaasaRepository swaasaRepository;
-
-	@Override
-	public String getSwaasaAdminLogin(String email, String password) throws Exception {
-		String swaasaToken = null;
-		try {
-			// Calling Swassa API to authenticate the user and get the access token
-			RestTemplate restTemplate = new RestTemplate();
-			HttpHeaders headers = new HttpHeaders();
-//			headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-
-			MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<>();
-			bodyMap.add("email", email);
-			bodyMap.add("password", password);
-
-//			SwaasaAuthenticate authRequest = new SwaasaAuthenticate();
-//			authRequest.setEmail(email);
-//			authRequest.setPassword(password);
-
-			logger.info("swaasa authentication request: " + bodyMap.toString());
-
-			HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
-			// HttpEntity<Object> requestEntity = new HttpEntity<Object>(authRequest,
-			// headers);
-			ResponseEntity<String> responseEntity = restTemplate.exchange(swaasaAdminLoginUrl, HttpMethod.POST,
-					requestEntity, String.class);
-
-			// Check if the response is successful
-			if (responseEntity.getStatusCode() != HttpStatus.OK) {
-				// API call failed, throw an exception
-
-				throw new RuntimeException("swaasa authentication failed, statusCode : "
-						+ responseEntity.getStatusCodeValue() + " response : " + responseEntity.toString());
-			} else {
-				String response = responseEntity.getBody() != null ? responseEntity.getBody() : null;
-				SwaasaAuthenticateResponse responseBody = InputMapper.gson().fromJson(response,
-						SwaasaAuthenticateResponse.class);
-
-				if (responseBody != null && responseBody.getAccessToken() != null) {
-					swaasaToken = responseBody.getAccessToken();
-
-					authCreatedAt = System.currentTimeMillis();
-				}
-			}
-
-			logger.info("swaasa authentication response: " + swaasaToken);
-
-		} catch (HTTPException e) {
-			logger.error("swaasa authentication error : " + e.getMessage(), e);
-			throw new RuntimeException("get authentication failed with error", e);
-		} catch (Exception e) {
-			logger.error("swaasa authentication error : " + e.getMessage(), e);
-			throw new RuntimeException("get authentication failed with error", e);
-		}
-		return swaasaToken;
-	}
-
-	@Override
-	public Boolean verifyCough(MultipartFile file, String authToken, Long patientId) throws Exception {
-
-		try {
-
-			if (file == null || file.isEmpty())
-				throw new Exception("file is missing,please pass a cough recording file");
-
-			long currTime = System.currentTimeMillis();
-			
-			String decryptswaasaEmail = cryptoUtil.decrypt(swassaEmail);
-			String decryptswaasaPassword = cryptoUtil.decrypt(swaasaPassword);
-			if (swaasaToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
-				swaasaToken = getSwaasaAdminLogin(decryptswaasaEmail, decryptswaasaPassword);
-
-			// Calling verify cough API to validate the cough quality
-			RestTemplate restTemplate = new RestTemplate();
-			HttpHeaders headers = new HttpHeaders();
-			headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-			headers.add("accessToken", authToken);
-
-			byte[] bytes = file.getBytes();
-			String tempFileName = "coughSoundVerify" + patientId + System.currentTimeMillis() + ".wav";
-			BufferedOutputStream stream = new BufferedOutputStream(
-					new FileOutputStream(new File(swaasaPath + tempFileName)));
-			stream.write(bytes);
-			stream.close();
-
-			MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
-			bodyMap.add("coughsoundfile", new FileSystemResource(swaasaPath + tempFileName));
-
-			HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
-
-			logger.info("swaasa validate cough quality request : " + requestEntity);
-			ResponseEntity<String> responseEntity = restTemplate.exchange(swaasaValidateCoughUrl, HttpMethod.POST,
-					requestEntity, String.class);
-
-			// Check if the response is successful
-			if (responseEntity.getStatusCode() == HttpStatus.OK) {
-				// API call failed, throw an exception
-				String responseBody = responseEntity.getBody() != null ? responseEntity.getBody() : null;
-				logger.info("swaasa validate cough quality response : " + responseBody);
-				SwaasaValidateCoughReponseDTO obj = InputMapper.gson().fromJson(responseBody,
-						SwaasaValidateCoughReponseDTO.class);
-
-				Boolean isValidCough;
-				if (obj != null) {
-					isValidCough = (Boolean) obj.getData().get("isValidCough");
-				} else
-					throw new RuntimeException(
-							"cough file validation is failed at swaasa end : response" + responseBody);
-
-				if (isValidCough != null)
-					return isValidCough;
-				else
-					throw new RuntimeException("cough file validation is failed at swaasa end : " + obj.getStatus());
-			} else
-				throw new RuntimeException("error from swaasa validate cough API : " + responseEntity.toString());
-		} catch (Exception e) {
-			logger.error("swaasa validate cough quality exception : ", e);
-			throw new RuntimeException("swaasa validate cough quality exception : " + e.getMessage());
-		}
-
-	}
-
-	@Override
-	public String initiateAssesment(String request, MultipartFile file) throws Exception {
-		Swaasa resultSet = new Swaasa();
-		try {
-			if (file == null || file.isEmpty())
-				throw new Exception("file is missing,please pass a cough recording file");
-
-			// map symptoms object to main entity
-			Swaasa swaasaAssessmentRequestObj = InputMapper.gson().fromJson(request, Swaasa.class);
-			if (swaasaAssessmentRequestObj != null && swaasaAssessmentRequestObj.getSymptoms() != null) {
-				swaasaAssessmentRequestObj
-						.setFrequent_cough(swaasaAssessmentRequestObj.getSymptoms().getFrequent_cough());
-				swaasaAssessmentRequestObj.setSputum(swaasaAssessmentRequestObj.getSymptoms().getSputum());
-				swaasaAssessmentRequestObj
-						.setCough_at_night(swaasaAssessmentRequestObj.getSymptoms().getCough_at_night());
-				swaasaAssessmentRequestObj.setWheezing(swaasaAssessmentRequestObj.getSymptoms().getWheezing());
-				swaasaAssessmentRequestObj
-						.setPain_in_chest(swaasaAssessmentRequestObj.getSymptoms().getPain_in_chest());
-				swaasaAssessmentRequestObj
-						.setShortness_of_breath(swaasaAssessmentRequestObj.getSymptoms().getShortness_of_breath());
-			}
-
-			if (swaasaAssessmentRequestObj.getPatientId() == null)
-				throw new RuntimeException("Missing patient Id, please pass a valid patient Id");
-
-			// check if swaasa session is active
-			long currTime = System.currentTimeMillis();
-			String decryptswaasaEmail = cryptoUtil.decrypt(swassaEmail);
-			String decryptswaasaPassword = cryptoUtil.decrypt(swaasaPassword);
-			if (swaasaToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
-				swaasaToken = getSwaasaAdminLogin(decryptswaasaEmail, decryptswaasaPassword);
-
-			// call swaasa verify cough API
-			Boolean isCoughValidateSuccess = verifyCough(file, swaasaToken, swaasaAssessmentRequestObj.getPatientId());
-
-			// Calling Swassa API to create the assessment, if validate cough is
-			// success/true
-			if (isCoughValidateSuccess) {
-				RestTemplate restTemplate = new RestTemplate();
-				HttpHeaders headers = new HttpHeaders();
-				headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-				headers.add("accessToken", swaasaToken);
-
-				// create a random AssessmentId
-				swaasaAssessmentRequestObj.setAssessmentId(
-						"pid" + swaasaAssessmentRequestObj.getPatientId() + "salt" + System.currentTimeMillis());
-				// save the request to DB
-				resultSet = swaasaRepository.save(swaasaAssessmentRequestObj);
-
-				// create file to system, share the path with swaasa API
-				byte[] bytes = file.getBytes();
-				String tempFileName = "coughSoundAssessment" + swaasaAssessmentRequestObj.getPatientId()
-						+ System.currentTimeMillis() + ".wav";
-				BufferedOutputStream stream = new BufferedOutputStream(
-						new FileOutputStream(new File("swaasaPath" + tempFileName)));
-				stream.write(bytes);
-				stream.close();
-
-				MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
-//				bodyMap.add("coughsoundfile", new FileSystemResource("D:\\swaasa_audio\\" + tempFileName));
-				bodyMap.add("symptoms", new Gson().toJson(swaasaAssessmentRequestObj.getSymptoms()));
-				bodyMap.add("timestamp", swaasaAssessmentRequestObj.getTimestamp());
-				bodyMap.add("age", swaasaAssessmentRequestObj.getAge());
-				bodyMap.add("gender", swaasaAssessmentRequestObj.getGender());
-				bodyMap.add("assessmentId", swaasaAssessmentRequestObj.getAssessmentId());
-				bodyMap.add("patientId", swaasaAssessmentRequestObj.getPatientId());
-				bodyMap.add("coughsoundfile", new FileSystemResource("swaasaPath" + tempFileName));
-
-				HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
-
-				logger.info("swaasa assessment API request: " + requestEntity);
-
-				ResponseEntity<String> responseEntity = restTemplate.exchange(swassaAssesmentUrl, HttpMethod.POST,
-						requestEntity, String.class);
-
-				// Check if the response is successful
-				SwaasaAssessmentResponseDTO swaasaAssessmentResponseDTO;
-				if (responseEntity.getStatusCode() == HttpStatus.OK) {
-					// API call failed, throw an exception
-					String responseBody = responseEntity.getBody() != null ? responseEntity.getBody().toString() : null;
-					swaasaAssessmentResponseDTO = InputMapper.gson().fromJson(responseBody,
-							SwaasaAssessmentResponseDTO.class);
-				} else
-					throw new RuntimeException(
-							"swaasa start assesment API exception. statusCode = " + responseEntity.getStatusCodeValue()
-									+ " and response body from Swaasa: " + responseEntity.getBody().toString());
-
-				logger.info("start assesment success response: " + responseEntity.getBody());
-				if (resultSet != null && resultSet.getId() != null && swaasaAssessmentResponseDTO != null
-						&& swaasaAssessmentResponseDTO.getStatus().equalsIgnoreCase("SUCCESS")) {
-					resultSet.setRecord_duration(swaasaAssessmentResponseDTO.getData().getRecord_duration());
-					resultSet.setStatus(swaasaAssessmentResponseDTO.getData().getStatus());
-					resultSet.setRisk(swaasaAssessmentResponseDTO.getData().getRisk());
-					resultSet.setCough_severity_score(swaasaAssessmentResponseDTO.getData().getCough_severity_score());
-					resultSet.setCough_pattern(swaasaAssessmentResponseDTO.getData().getCough_pattern());
-					resultSet.setDry_cough_count(swaasaAssessmentResponseDTO.getData().getDry_cough_count());
-					resultSet.setWet_cough_count(swaasaAssessmentResponseDTO.getData().getWet_cough_count());
-					resultSet.setSeverity(swaasaAssessmentResponseDTO.getData().getSeverity());
-
-					// update the result in DB
-					swaasaRepository.save(resultSet);
-				} else
-					throw new RuntimeException("status from Swaasa : " + swaasaAssessmentResponseDTO.getStatus()
-							+ " message from Swaasa : " + swaasaAssessmentResponseDTO.getData().getMessage());
-
-			} else
-				throw new RuntimeException("cough file validation is failed at swaasa end");
-		} catch (Exception e) {
-			logger.error("swaasa assessment API exception: " + e.getMessage());
-			throw new RuntimeException("swaasa assessment API exception : " + e.getMessage());
-		}
-		return new Gson().toJson(resultSet);
-	}
-
-	@Override
-	public String getAssesment(String assessmentId) throws Exception {
-		SwaasaAssessmentResponseDTO swaasaAssessmentResponseDTO = new SwaasaAssessmentResponseDTO();
-		Swaasa swaasaEntity = new Swaasa();
-		try {
-			List<Swaasa> assessmentResults = swaasaRepository.findByAssessmentId(assessmentId);
-			if (assessmentResults != null && assessmentResults.size() > 0) {
-				if (assessmentResults.get(assessmentResults.size() - 1).getStatus() != null && assessmentResults
-						.get(assessmentResults.size() - 1).getStatus().equalsIgnoreCase("SUCCESS")) {
-					swaasaEntity = assessmentResults.get(assessmentResults.size() - 1);
-					return new Gson().toJson(swaasaEntity);
-				} else {
-					long currTime = System.currentTimeMillis();
-					
-					String decryptswaasaEmail = cryptoUtil.decrypt(swassaEmail);
-					String decryptswaasaPassword = cryptoUtil.decrypt(swaasaPassword);
-					if (swaasaToken == null || (((currTime - authCreatedAt) / (60 * 1000))) > 110)
-						swaasaToken = getSwaasaAdminLogin(decryptswaasaEmail, decryptswaasaPassword);
-
-					// Calling Swassa API to get the assessment result
-					RestTemplate restTemplate = new RestTemplate();
-					HttpHeaders headers = new HttpHeaders();
-					headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-					headers.add("accessToken", swaasaToken);
-
-					logger.info("swaasa get assesment API - assessmentId =  " + assessmentId);
-
-					MultiValueMap<String, Object> bodyMap = new LinkedMultiValueMap<String, Object>();
-					bodyMap.add("assessmentId", assessmentId);
-
-					HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(bodyMap, headers);
-					logger.info("swaasa get assesment result request : " + requestEntity);
-					ResponseEntity<String> responseEntity = restTemplate.exchange(swaasaGetAssesmentUrl, HttpMethod.GET,
-							requestEntity, String.class);
-
-					// Check if the response is successful
-
-					if (responseEntity.getStatusCode() == HttpStatus.OK) {
-						// API call failed, throw an exception
-						String responseBody = responseEntity.getBody() != null ? responseEntity.getBody().toString()
-								: "";
-						swaasaAssessmentResponseDTO = InputMapper.gson().fromJson(responseBody,
-								SwaasaAssessmentResponseDTO.class);
-
-						if (swaasaEntity.getId() != null) {
-							swaasaEntity.setRecord_duration(swaasaAssessmentResponseDTO.getData().getRecord_duration());
-							swaasaEntity.setStatus(swaasaAssessmentResponseDTO.getData().getStatus());
-							swaasaEntity.setRisk(swaasaAssessmentResponseDTO.getData().getRisk());
-							swaasaEntity.setCough_severity_score(
-									swaasaAssessmentResponseDTO.getData().getCough_severity_score());
-							swaasaEntity.setCough_pattern(swaasaAssessmentResponseDTO.getData().getCough_pattern());
-							swaasaEntity.setDry_cough_count(swaasaAssessmentResponseDTO.getData().getDry_cough_count());
-							swaasaEntity.setWet_cough_count(swaasaAssessmentResponseDTO.getData().getWet_cough_count());
-							swaasaEntity.setSeverity(swaasaAssessmentResponseDTO.getData().getSeverity());
-
-							swaasaRepository.save(swaasaEntity);
-						}
-
-					} else
-						throw new RuntimeException("Swassa get assesment API call failed with status code "
-								+ responseEntity.getStatusCodeValue() + " and response : " + responseEntity);
-
-					return new Gson().toJson(swaasaEntity);
-
-				}
-			} else
-				throw new Exception("Invalid assessment id, please pass correct assessment id");
-
-		} catch (Exception e) {
-			logger.error("get assesment API failed with error " + e.getMessage());
-			throw new Exception("get assesment API failed with error : " + e.getLocalizedMessage());
-		}
-
-	}
-
-	public String getAssessmentDetails(Long patientId) throws Exception {
-		List<Swaasa> resultSet = swaasaRepository.findByPatientId(patientId);
-		return new Gson().toJson(resultSet);
-	}
-
-}
diff --git a/src/main/java/com/iemr/common/service/uptsu/UptsuService.java b/src/main/java/com/iemr/common/service/uptsu/UptsuService.java
index b73d4af4..c8c44e22 100644
--- a/src/main/java/com/iemr/common/service/uptsu/UptsuService.java
+++ b/src/main/java/com/iemr/common/service/uptsu/UptsuService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.uptsu;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/service/uptsu/UptsuServiceImpl.java b/src/main/java/com/iemr/common/service/uptsu/UptsuServiceImpl.java
index 683f04aa..68bc2d60 100644
--- a/src/main/java/com/iemr/common/service/uptsu/UptsuServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/uptsu/UptsuServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.uptsu;
 
 import java.math.BigInteger;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityService.java
index 89a0d83d..3a9dbad6 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityServiceImpl.java
index 2bd10545..11357cef 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/CommunityServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationService.java
index a615dd12..0c3d0455 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationServiceImpl.java
index 0b5599bc..5d4d358f 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/EducationServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderService.java
index 137af28d..e2107687 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderServiceImpl.java
index b16eeff1..ae9ef32b 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/GenderServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageService.java
index ebae3d5f..84280dae 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageServiceImpl.java
index 8d37c03d..bf1d3152 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/LanguageServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusService.java
index 7374a0f5..5d16a86d 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusServiceImpl.java
index bb78c1dc..c6983504 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/MaritalStatusServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionService.java
index 43760a04..45cf8321 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionServiceImpl.java
index 15a6f374..1f951604 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/RelegionServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusService.java
index f28c5b98..415eb140 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusServiceImpl.java
index b5042f38..0626f9f4 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/StatusServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleService.java
index 3d072e14..151fb0fc 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleServiceImpl.java
index bb2f7504..3ddae82d 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/TitleServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataService.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataService.java
index 67928cf7..e388ad31 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataService.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.List;
diff --git a/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataServiceImpl.java b/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataServiceImpl.java
index 36071a9b..a6c3d177 100644
--- a/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/userbeneficiarydata/UserBeneficiaryDataServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.userbeneficiarydata;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/iemr/common/service/users/EmployeeSignatureService.java b/src/main/java/com/iemr/common/service/users/EmployeeSignatureService.java
index 07623c7a..a38aa39a 100644
--- a/src/main/java/com/iemr/common/service/users/EmployeeSignatureService.java
+++ b/src/main/java/com/iemr/common/service/users/EmployeeSignatureService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.users;
 
 import com.iemr.common.data.users.EmployeeSignature;
diff --git a/src/main/java/com/iemr/common/service/users/EmployeeSignatureServiceImpl.java b/src/main/java/com/iemr/common/service/users/EmployeeSignatureServiceImpl.java
index 792b1e79..dd2d61ed 100644
--- a/src/main/java/com/iemr/common/service/users/EmployeeSignatureServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/users/EmployeeSignatureServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.users;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
index a7e4dd86..c6cf704d 100644
--- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
+++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.users;
 
 import java.security.NoSuchAlgorithmException;
@@ -93,6 +114,8 @@ public List<ServiceRoleScreenMapping> getUserServiceRoleMappingForProvider(Integ
 
 	String generateTransactionIdForPasswordChange(User user) throws Exception;
 
+	
+
 
 	
 }
diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
index ff303ab2..d54d1d90 100644
--- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
@@ -1,7 +1,31 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.service.users;
 
+import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,6 +36,9 @@
 import java.util.Set;
 import java.util.UUID;
 
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -65,10 +92,10 @@
 import com.iemr.common.repository.users.VanServicepointMappingRepo;
 import com.iemr.common.service.cti.CTIService;
 import com.iemr.common.utils.config.ConfigProperties;
+import com.iemr.common.utils.encryption.AESUtil;
 import com.iemr.common.utils.exception.IEMRException;
 import com.iemr.common.utils.mapper.InputMapper;
 import com.iemr.common.utils.mapper.OutputMapper;
-import com.iemr.common.utils.redis.RedisSessionException;
 import com.iemr.common.utils.response.OutputResponse;
 import com.iemr.common.utils.rsa.RSAUtil;
 import com.iemr.common.utils.sessionobject.SessionObject;
@@ -92,6 +119,8 @@ public class IEMRAdminUserServiceImpl implements IEMRAdminUserService {
 
 	@Autowired
 	private RoleMapper roleMapper;
+	@Autowired
+	private AESUtil aesUtil;
 
 	@Autowired
 	private SessionObject sessionObject;
@@ -206,7 +235,27 @@ else if (users.get(0).getStatusID() > 2)
 			failedAttempt = 5;
 		User user = users.get(0);
 		try {
-			if (!securePassword.validatePassword(password, user.getPassword())) {
+			int validatePassword;
+			validatePassword = securePassword.validatePassword(password, user.getPassword());
+			if (validatePassword == 1) {
+				int iterations = 1001;
+				char[] chars = password.toCharArray();
+				byte[] salt = getSalt();
+
+				PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 512);
+				SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+				byte[] hash = skf.generateSecret(spec).getEncoded();
+				String updatedPassword = iterations + ":" + toHex(salt) + ":" + toHex(hash);
+				// save operation
+				user.setPassword(updatedPassword);
+				iEMRUserRepositoryCustom.save(user);
+
+			} else if (validatePassword == 2) {
+				iEMRUserRepositoryCustom.save(user);
+
+			} else if (validatePassword == 3) {
+				iEMRUserRepositoryCustom.save(user);
+			} else if (validatePassword == 0) {
 				if (user.getFailedAttempt() + 1 >= failedAttempt) {
 					user.setFailedAttempt(user.getFailedAttempt() + 1);
 					user.setDeleted(true);
@@ -222,8 +271,6 @@ else if (users.get(0).getStatusID() > 2)
 							+ (ConfigProperties.getInteger("failedLoginAttempt") - user.getFailedAttempt())
 							+ " more attempt left.");
 				}
-
-				// throw new IEMRException("User login failed due to incorrect username/password");
 			} else {
 				if (user.getFailedAttempt() != 0) {
 					user.setFailedAttempt(0);
@@ -258,13 +305,61 @@ public User superUserAuthenticate(String userName, String password) throws Excep
 
 		if (users.size() != 1) {
 			throw new IEMRException("User login failed due to incorrect username/password");
+		} else {
+			if (users.get(0).getDeleted())
+				throw new IEMRException("Your account is locked or de-activated. Please contact administrator");
+			else if (users.get(0).getStatusID() > 2)
+				throw new IEMRException("Your account is not active. Please contact administrator");
 		}
+		int failedAttempt = 0;
+		if (failedLoginAttempt != null)
+			failedAttempt = Integer.parseInt(failedLoginAttempt);
+		else
+			failedAttempt = 5;
+		User user = users.get(0);
 		try {
-			if (!securePassword.validatePassword(password, users.get(0).getPassword())) {
-				throw new IEMRException("User login failed due to incorrect username/password");
+			int validatePassword;
+			validatePassword = securePassword.validatePassword(password, user.getPassword());
+			if (validatePassword == 1) {
+				int iterations = 1001;
+				char[] chars = password.toCharArray();
+				byte[] salt = getSalt();
+
+				PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 512);
+				SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+				byte[] hash = skf.generateSecret(spec).getEncoded();
+				String updatedPassword = iterations + ":" + toHex(salt) + ":" + toHex(hash);
+				// save operation
+				user.setPassword(updatedPassword);
+				iEMRUserRepositoryCustom.save(user);
+
+			} else if (validatePassword == 2) {
+				iEMRUserRepositoryCustom.save(user);
+
+			} else if (validatePassword == 0) {
+				if (user.getFailedAttempt() + 1 >= failedAttempt) {
+					user.setFailedAttempt(user.getFailedAttempt() + 1);
+					user.setDeleted(true);
+					user = iEMRUserRepositoryCustom.save(user);
+					throw new IEMRException(
+							"User login failed due to incorrect username/password. Your account is locked due to "
+									+ ConfigProperties.getInteger("failedLoginAttempt")
+									+ " failed attempts. Please contact administrator.");
+				} else {
+					user.setFailedAttempt(user.getFailedAttempt() + 1);
+					user = iEMRUserRepositoryCustom.save(user);
+					throw new IEMRException("User login failed due to incorrect username/password. "
+							+ (ConfigProperties.getInteger("failedLoginAttempt") - user.getFailedAttempt())
+							+ " more attempt left.");
+				}
+			} else {
+				if (user.getFailedAttempt() != 0) {
+					user.setFailedAttempt(0);
+					user = iEMRUserRepositoryCustom.save(user);
+				}
 			}
 		} catch (Exception e) {
-			throw new IEMRException("User login failed due to incorrect username/password");
+			throw new IEMRException(e.getMessage());
 		}
 		return users.get(0);
 	}
@@ -277,7 +372,7 @@ public LoginResponseModel userAuthenticateV1(LoginRequestModel loginRequest, Str
 		if (users.size() == 1) {
 			User user = users.get(0);
 			try {
-				if (!securePassword.validatePassword(loginRequest.getPassword(), user.getPassword())) {
+				if (!securePassword.validatePasswordExisting(loginRequest.getPassword(), user.getPassword())) {
 					throw new IEMRException("User login failed due to incorrect username/password");
 				}
 			} catch (Exception e) {
@@ -329,30 +424,31 @@ public List<UserSecurityQMapping> userSecurityQuestion(Long userId) {
 	}
 
 	@Override
-	public int setForgetPassword(User user, String loginpass, String transactionId, Boolean isAdmin) throws IEMRException {
+	public int setForgetPassword(User user, String loginpass, String transactionId, Boolean isAdmin)
+			throws IEMRException {
 
 		int count = 0;
 		try {
-			if(isAdmin !=null && isAdmin == true) {
-				updateCTIPasswordForUserV1(user.getUserID(), loginpass);
-				loginpass = securePassword.generateStrongPassword(loginpass);
-				count = iEMRUserRepositoryCustom.updateSetForgetPassword(user.getUserID(), loginpass);
-			} else {
-			String tokenFromRedis = sessionObject
-					.getSessionObjectForChangePassword((user.getUserID().toString() + user.getUserName()));
-			if (tokenFromRedis.equalsIgnoreCase(transactionId)) {
-
+			if (isAdmin != null && isAdmin == true) {
 				updateCTIPasswordForUserV1(user.getUserID(), loginpass);
 				loginpass = securePassword.generateStrongPassword(loginpass);
 				count = iEMRUserRepositoryCustom.updateSetForgetPassword(user.getUserID(), loginpass);
-				// Deleting transaction Id
-				if (count > 0)
-					sessionObject.deleteSessionObject((user.getUserID().toString() + user.getUserName()));
-				else
-					throw new IEMRException("error while updating new password");
 			} else {
-				throw new IEMRException("Unable to fetch transaction Id or transaction Id is expired");
-			}
+				String tokenFromRedis = sessionObject
+						.getSessionObjectForChangePassword((user.getUserID().toString() + user.getUserName()));
+				if (tokenFromRedis.equalsIgnoreCase(transactionId)) {
+
+					updateCTIPasswordForUserV1(user.getUserID(), loginpass);
+					loginpass = securePassword.generateStrongPassword(loginpass);
+					count = iEMRUserRepositoryCustom.updateSetForgetPassword(user.getUserID(), loginpass);
+					// Deleting transaction Id
+					if (count > 0)
+						sessionObject.deleteSessionObject((user.getUserID().toString() + user.getUserName()));
+					else
+						throw new IEMRException("error while updating new password");
+				} else {
+					throw new IEMRException("Unable to fetch transaction Id or transaction Id is expired");
+				}
 			}
 		} catch (Exception e) {
 			logger.error("Error while changing the password: " + e.getMessage(), e);
@@ -374,8 +470,8 @@ public void updateCTIPasswordForUser(Long userID, String password) {
 								.initializeUserRoleMappingObjs((Long) object[0], (Long) object[1], (Integer) object[2],
 										(Role) object[3], (Integer) object[4],
 										getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5],
-										(Boolean) object[6], (Boolean) object[7], (String) object[8],
-										(Integer) object[9], (ProviderServiceAddressMapping) object[10]);
+										(Boolean) object[6], (Boolean) object[7], (Boolean) object[8], (String) object[9],
+										(Integer) object[10], (ProviderServiceAddressMapping) object[11]);
 						userRoles.add(userServiceRoleMapping);
 					}
 				}
@@ -571,8 +667,8 @@ private List<UserServiceRoleMapping> getUserServiceRoleMapping(Long userID) thro
 				UserServiceRoleMapping userServiceRoleMapping = UserServiceRoleMapping.initializeUserRoleMappingObjs(
 						(Long) object[0], (Long) object[1], (Integer) object[2], (Role) object[3], (Integer) object[4],
 						getUserProviderServiceRoleMapping((Integer) object[4]), (String) object[5], (Boolean) object[6],
-						(Boolean) object[7], (String) object[8], (Integer) object[9],
-						(ProviderServiceAddressMapping) object[10]);
+						(Boolean) object[7], (Boolean) object[8], (String) object[9], (Integer) object[10], 
+						(ProviderServiceAddressMapping) object[11]);
 				List<ServiceRoleScreenMapping> serviceRoleScreenMappings = getActiveScreenMappings(
 						userServiceRoleMapping.getProviderServiceMapID(), userServiceRoleMapping.getRoleID());
 				userServiceRoleMapping.getM_Role().setServiceRoleScreenMappings(serviceRoleScreenMappings);
@@ -777,14 +873,14 @@ public JSONObject generateKeyAndValidateIP(JSONObject responseObj, String ipAddr
 	/**
 	 * SH20094090,19-04-2022
 	 * 
-	 * @param     responseObj,key
-	 * @param key Function to set new session object whenever a user logs in
+	 * @param responseObj,key
+	 * @param key             Function to set new session object whenever a user
+	 *                        logs in
 	 */
 	public void setConcurrentCheckSessionObject(JSONObject responseObj, String key) {
 		try {
-			if ((responseObj.get("userName")) != null && (responseObj.get("userName").toString()) != null)
-			{
-				logger.info("setting key:"+(responseObj.get("userName").toString().trim().toLowerCase()));
+			if ((responseObj.get("userName")) != null && (responseObj.get("userName").toString()) != null) {
+				logger.info("setting key:" + (responseObj.get("userName").toString().trim().toLowerCase()));
 				sessionObject.setSessionObject((responseObj.get("userName").toString().trim().toLowerCase()), key);
 			}
 		} catch (Exception e) {
@@ -855,7 +951,7 @@ public void userForceLogout(ForceLogoutRequestModel request) throws Exception {
 			throw new Exception("Force logout failed due to incorrect username");
 		}
 		try {
-			if (!securePassword.validatePassword(request.getPassword(), users.get(0).getPassword())) {
+			if (!securePassword.validatePasswordExisting(request.getPassword(), users.get(0).getPassword())) {
 				throw new Exception("Force logout failed due to incorrect password");
 			}
 		} catch (Exception e) {
@@ -950,7 +1046,7 @@ public List<User> userAuthenticateByEncryption(String req) throws Exception {
 		}
 		User user = users.get(0);
 		try {
-			if (!securePassword.validatePassword(m_user.getPassword(), user.getPassword())) {
+			if (!securePassword.validatePasswordExisting(m_user.getPassword(), user.getPassword())) {
 				throw new IEMRException("User login failed due to incorrect username/password");
 			}
 		} catch (Exception e) {
@@ -1036,7 +1132,36 @@ public String validateQuestionAndAnswersForPasswordChange(JsonObject request) th
 		}
 
 	}
-	
+
 	
 
+	public String generateStrongPasswordForExistingUser(String password)
+			throws NoSuchAlgorithmException, InvalidKeySpecException {
+		int iterations = 1000;
+		char[] chars = password.toCharArray();
+		byte[] salt = getSalt();
+
+		PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 512);
+		SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
+		byte[] hash = skf.generateSecret(spec).getEncoded();
+		return iterations + ":" + toHex(salt) + ":" + toHex(hash);
+	}
+
+	private byte[] getSalt() throws NoSuchAlgorithmException {
+		SecureRandom sr = SecureRandom.getInstance("SHA1PRNG");
+		byte[] salt = new byte[16];
+		sr.nextBytes(salt);
+		return salt;
+	}
+
+	private String toHex(byte[] array) throws NoSuchAlgorithmException {
+		BigInteger bi = new BigInteger(1, array);
+		String hex = bi.toString(16);
+		int paddingLength = array.length * 2 - hex.length();
+		if (paddingLength > 0) {
+			return String.format(new StringBuilder().append("%0").append(paddingLength).append("d").toString(),
+					new Object[] { Integer.valueOf(0) }) + hex;
+		}
+		return hex;
+	}
 }
diff --git a/src/main/java/com/iemr/common/utils/CommonMain.java b/src/main/java/com/iemr/common/utils/CommonMain.java
index 9f1f98af..bdd83191 100644
--- a/src/main/java/com/iemr/common/utils/CommonMain.java
+++ b/src/main/java/com/iemr/common/utils/CommonMain.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils;
 
 import java.util.concurrent.Executor;
diff --git a/src/main/java/com/iemr/common/utils/IEMRApplBeans.java b/src/main/java/com/iemr/common/utils/IEMRApplBeans.java
index ae8719c9..92d3c339 100644
--- a/src/main/java/com/iemr/common/utils/IEMRApplBeans.java
+++ b/src/main/java/com/iemr/common/utils/IEMRApplBeans.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils;
 
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
index a77e29ed..5063fcda 100644
--- a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
+++ b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.config;
 
 import java.io.IOException;
diff --git a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java
index 534a25ac..43a9bacd 100644
--- a/src/main/java/com/iemr/common/utils/encryption/AESUtil.java
+++ b/src/main/java/com/iemr/common/utils/encryption/AESUtil.java
@@ -1,3 +1,25 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+
 package com.iemr.common.utils.encryption;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
@@ -31,8 +53,11 @@ public enum DataType {
     }
 
     private static final Logger logger = LoggerFactory.getLogger(AESUtil.class);
-    private static final String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding";
-    private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA1";
+
+    private static final String CIPHER_ALGORITHM = "AES/CBC/ISO10126Padding";
+    private static final String SECRET_KEY_ALGORITHM = "PBKDF2WithHmacSHA512";
+
+
     private static final String KEY_ALGORITHM = "AES";
 
     private final int IV_SIZE = 128;
@@ -138,4 +163,64 @@ private static byte[] generateRandom(int length) {
         random.nextBytes(randomBytes);
         return randomBytes;
     }
+    
+    public String decryptExistingPwd(String passPhrase, String cipherText) {
+        try {
+        	String salt = cipherText.substring(0, saltLength);
+            int ivLength = IV_SIZE / 4;
+            String iv = cipherText.substring(saltLength, saltLength + ivLength);
+            String ct = cipherText.substring(saltLength + ivLength);
+            return decryptExistingPwd(salt, iv, passPhrase, ct);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+    
+    public String decryptExistingPwd(String salt, String iv, String passPhrase, String cipherText) {
+        try {
+        	SecretKey key = generateKeyForExistingUser(salt, passPhrase);
+            byte[] encrypted;
+            if (dataType.equals(DataType.HEX)) {
+                encrypted = fromHex(cipherText);
+            } else {
+                encrypted = fromBase64(cipherText);
+            }
+            byte[] decrypted = doFinal(Cipher.DECRYPT_MODE, key, iv, encrypted);
+            return new String(Objects.requireNonNull(decrypted), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+    
+    private SecretKey generateKeyForExistingUser(String salt, String passPhrase) {
+        try {
+            SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+            KeySpec keySpec = new PBEKeySpec(passPhrase.toCharArray(), fromHex(salt), iterationCount, keySize);
+            return new SecretKeySpec(secretKeyFactory.generateSecret(keySpec).getEncoded(), KEY_ALGORITHM);
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+        	logger.info(e.getMessage());
+        }
+        return null;
+    }
+    
+    public String decryptExistingPwdNew(String passPhrase, String password) {
+    	
+    	try {
+    		String[] parts = password.split(":");
+    		int iterations = Integer.parseInt(parts[0]);
+    		String salt = parts[1];
+    		String hash = parts[2];
+    		SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+    		PBEKeySpec keySpec = new PBEKeySpec(passPhrase.toCharArray(), fromHex(salt), iterationCount, hash.length() * 4);
+    		SecretKey key = secretKeyFactory.generateSecret(keySpec);
+    		
+    		byte[] decryptedHash = key.getEncoded();
+    		return toHex(decryptedHash);
+    	} catch (Exception e) {
+    		throw new RuntimeException("Error decrypting password : " + e.getLocalizedMessage());
+    	}
+    }
+    
+   
+
 }
diff --git a/src/main/java/com/iemr/common/utils/exception/IEMRException.java b/src/main/java/com/iemr/common/utils/exception/IEMRException.java
index 482e0a35..ea0aa486 100644
--- a/src/main/java/com/iemr/common/utils/exception/IEMRException.java
+++ b/src/main/java/com/iemr/common/utils/exception/IEMRException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.exception;
 
 public class IEMRException extends Exception
diff --git a/src/main/java/com/iemr/common/utils/gateway/email/EmailService.java b/src/main/java/com/iemr/common/utils/gateway/email/EmailService.java
index 42ed27fe..c08f5274 100644
--- a/src/main/java/com/iemr/common/utils/gateway/email/EmailService.java
+++ b/src/main/java/com/iemr/common/utils/gateway/email/EmailService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.gateway.email;
 
 public interface EmailService
diff --git a/src/main/java/com/iemr/common/utils/gateway/email/GenericEmailServiceImpl.java b/src/main/java/com/iemr/common/utils/gateway/email/GenericEmailServiceImpl.java
index 1c9fe51f..90ffd982 100644
--- a/src/main/java/com/iemr/common/utils/gateway/email/GenericEmailServiceImpl.java
+++ b/src/main/java/com/iemr/common/utils/gateway/email/GenericEmailServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.gateway.email;
 
 import org.json.JSONObject;
diff --git a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
index 0a853c55..7ec70dcd 100644
--- a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.http;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/iemr/common/utils/http/HttpUtils.java b/src/main/java/com/iemr/common/utils/http/HttpUtils.java
index 7e63e1e8..efd65a79 100644
--- a/src/main/java/com/iemr/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/iemr/common/utils/http/HttpUtils.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.http;
 
 import java.io.FileInputStream;
diff --git a/src/main/java/com/iemr/common/utils/km/KMService.java b/src/main/java/com/iemr/common/utils/km/KMService.java
index e545d4d4..461d7c00 100644
--- a/src/main/java/com/iemr/common/utils/km/KMService.java
+++ b/src/main/java/com/iemr/common/utils/km/KMService.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.km;
 
 public interface KMService
diff --git a/src/main/java/com/iemr/common/utils/km/openkm/OpenKMConnector.java b/src/main/java/com/iemr/common/utils/km/openkm/OpenKMConnector.java
index 2daed5d3..a0bb48cf 100644
--- a/src/main/java/com/iemr/common/utils/km/openkm/OpenKMConnector.java
+++ b/src/main/java/com/iemr/common/utils/km/openkm/OpenKMConnector.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.km.openkm;
 
 import com.openkm.sdk4j.OKMWebservices;
diff --git a/src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java b/src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java
index 3f60508e..93489801 100644
--- a/src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java
+++ b/src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.km.openkm;
 
 import java.io.FileInputStream;
diff --git a/src/main/java/com/iemr/common/utils/mapper/InputMapper.java b/src/main/java/com/iemr/common/utils/mapper/InputMapper.java
index 48bfb8c5..fba94d62 100644
--- a/src/main/java/com/iemr/common/utils/mapper/InputMapper.java
+++ b/src/main/java/com/iemr/common/utils/mapper/InputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.mapper;
 
 import org.slf4j.Logger;
@@ -6,44 +27,25 @@
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.GsonBuilder;
-import com.iemr.common.utils.exception.IEMRException;
 
-/**
- * @author VI314759
- *
- */
 @Service
-public class InputMapper
-{
+public class InputMapper {
 	static GsonBuilder builder;
 	ExclusionStrategy strategy;
 	Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
-	public InputMapper()
-	{
-		if (builder == null)
-		{
+	public InputMapper() {
+		if (builder == null) {
 			builder = new GsonBuilder();
 			builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
 		}
 	}
 
-	/**
-	 * @return
-	 */
-	public static InputMapper gson()
-	{
+	public static InputMapper gson() {
 		return new InputMapper();
 	}
 
-	/**
-	 * @param json
-	 * @param classOfT
-	 * @return
-	 * @throws IEMRException
-	 */
-	public <T> T fromJson(String json, Class<T> classOfT)
-	{
+	public <T> T fromJson(String json, Class<T> classOfT) {
 		return builder.create().fromJson(json, classOfT);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/iemr/common/utils/mapper/OutputMapper.java b/src/main/java/com/iemr/common/utils/mapper/OutputMapper.java
index 2743f20d..8349447a 100644
--- a/src/main/java/com/iemr/common/utils/mapper/OutputMapper.java
+++ b/src/main/java/com/iemr/common/utils/mapper/OutputMapper.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.mapper;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/com/iemr/common/utils/redis/RedisConnection.java b/src/main/java/com/iemr/common/utils/redis/RedisConnection.java
index 282ef5aa..0c86a019 100644
--- a/src/main/java/com/iemr/common/utils/redis/RedisConnection.java
+++ b/src/main/java/com/iemr/common/utils/redis/RedisConnection.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.redis;
 
 public class RedisConnection {
diff --git a/src/main/java/com/iemr/common/utils/redis/RedisSessionException.java b/src/main/java/com/iemr/common/utils/redis/RedisSessionException.java
index 33582513..700ec666 100644
--- a/src/main/java/com/iemr/common/utils/redis/RedisSessionException.java
+++ b/src/main/java/com/iemr/common/utils/redis/RedisSessionException.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.redis;
 
 import com.iemr.common.utils.exception.IEMRException;
diff --git a/src/main/java/com/iemr/common/utils/redis/RedisStorage.java b/src/main/java/com/iemr/common/utils/redis/RedisStorage.java
index c40ac804..6f7558d0 100644
--- a/src/main/java/com/iemr/common/utils/redis/RedisStorage.java
+++ b/src/main/java/com/iemr/common/utils/redis/RedisStorage.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.redis;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/utils/response/OutputResponse.java b/src/main/java/com/iemr/common/utils/response/OutputResponse.java
index fdd53ca8..a4edb8d1 100644
--- a/src/main/java/com/iemr/common/utils/response/OutputResponse.java
+++ b/src/main/java/com/iemr/common/utils/response/OutputResponse.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.response;
 
 import java.util.Calendar;
diff --git a/src/main/java/com/iemr/common/utils/rsa/RSAKeyPairGenerator.java b/src/main/java/com/iemr/common/utils/rsa/RSAKeyPairGenerator.java
index 68a3d854..7d88f487 100644
--- a/src/main/java/com/iemr/common/utils/rsa/RSAKeyPairGenerator.java
+++ b/src/main/java/com/iemr/common/utils/rsa/RSAKeyPairGenerator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.rsa;
 
 import java.io.File;
diff --git a/src/main/java/com/iemr/common/utils/rsa/RSAUtil.java b/src/main/java/com/iemr/common/utils/rsa/RSAUtil.java
index 0a744bfd..55eedc1d 100644
--- a/src/main/java/com/iemr/common/utils/rsa/RSAUtil.java
+++ b/src/main/java/com/iemr/common/utils/rsa/RSAUtil.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.rsa;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -54,13 +75,15 @@ public static PrivateKey getPrivateKey(String base64PrivateKey){
     }
 
     public static byte[] encrypt(String data, String publicKey) throws BadPaddingException, IllegalBlockSizeException, InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException {
-        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+        Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
         cipher.init(Cipher.ENCRYPT_MODE, getPublicKey(publicKey));
         return cipher.doFinal(data.getBytes());
     }
 
     public static String decrypt(byte[] data, PrivateKey privateKey) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
-        Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+
+        Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+
         cipher.init(Cipher.DECRYPT_MODE, privateKey);
         return new String(cipher.doFinal(data));
     }
diff --git a/src/main/java/com/iemr/common/utils/sessionobject/SessionObject.java b/src/main/java/com/iemr/common/utils/sessionobject/SessionObject.java
index 342501ee..ad8da60b 100644
--- a/src/main/java/com/iemr/common/utils/sessionobject/SessionObject.java
+++ b/src/main/java/com/iemr/common/utils/sessionobject/SessionObject.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.sessionobject;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/iemr/common/utils/validator/Validator.java b/src/main/java/com/iemr/common/utils/validator/Validator.java
index 9d5629cd..7ba9b818 100644
--- a/src/main/java/com/iemr/common/utils/validator/Validator.java
+++ b/src/main/java/com/iemr/common/utils/validator/Validator.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.validator;
 
 import org.json.JSONException;
diff --git a/src/main/java/common/iemr/common/secondary/data/report/SecondaryCallReport.java b/src/main/java/common/iemr/common/secondary/data/report/SecondaryCallReport.java
index 51ee0abd..046688f8 100644
--- a/src/main/java/common/iemr/common/secondary/data/report/SecondaryCallReport.java
+++ b/src/main/java/common/iemr/common/secondary/data/report/SecondaryCallReport.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package common.iemr.common.secondary.data.report;
 
 import java.io.Serializable;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8e026dfc..b623c8c7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@ spring.http.multipart.max-file-size=1000MB
 
 ##sms details for CHO
 CHOSmsTemplate= CHO UPTSU SMS
-sendSMSUrl= http://10.208.122.38:8080/commonapi-v1.0/sms/sendSMS
+sendSMSUrl= <Enter SMS URL here>
 #sendSMSUrl = http://localhost:8080/sms/sendSMS
 
 ##sms details for beneficiary
@@ -41,7 +41,7 @@ km-guest-password=guest
 ## Path where the files would be stored before uploading to KM server
 tempFilePath=c:/temp/
 ## swaasa file path
-swaasaPath=c:/swaasa_audio/
+lungAssessmentPath=c:/swaasa_audio/
 
 ## CTI Configurations
 #### Standard APIs
@@ -108,8 +108,8 @@ cron-scheduler-unblock=0 0 0 * * ? *
 
 spring.mail.host=smtp.gmail.com
 spring.mail.port=587
-spring.mail.username=aaHXGrs9rQvATAgeH/7GDf7sXkJqElxGvEHYCxA25iLwWtMPFRrP9brLluxLBhd5
-spring.mail.password=K9QfHpyJYHkY5UruzThjhvBa0w8VGs/1usuW7EsGF3nwWtMPFRrP9brLluxLBhd5
+spring.mail.username=<Enter mail username>
+spring.mail.password=<Enter mail password>
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 mail-subject=Inventory alert!!
@@ -160,17 +160,19 @@ logging.logback.rollingpolicy.max-file-size=20KB
 logging.logback.rollingpolicy.max-history=1
 
 ### SMS Gateway URL details
-sms-gateway-url=http://sms.smsjosh.com
-sms-username=cQXj/cvwruBg24NQd8Bv0/Ba0w8VGs/1usuW7EsGF3k=
-sms-password=5o4ctqHfM1DNYxG3+WNYVvBa0w8VGs/1usuW7EsGF3k=
-send-message-url=api/mt/SendSMS?user=USERNAME&password=PASSWORD&senderid=iAMRIT&channel=Trans&DCS=0&flashsms=0&number=91RECEIVER_NUMBER&text=SMS_TEXT&route=9
-sms-sender-number=DOCTOR
+sms-username=<Enter SMS username>
+sms-password=<Enter SMS password>
+send-message-url=<Enter SMS sending URL here>
+source-address=AIDSHL
+sms-message-type=SERVICE_EXPLICIT
+sms-entityid=1201161708885589464
+
 
 ### Email Gateway URL details
-email-gateway-url=https://api.unicel.in
-send-email-url=SendSMS/sendmsg.php?uname=USERNAME&pass=PASSWORD&send=SENDER_ID&dest=91RECEIVER_ID&msg=EMAIL_TEXT
-email-username=AMRIT
-email-password=Psmri@12
+email-gateway-url=<Enter email gateway URL here>
+send-email-url=<Enter email sending URL here>
+email-username=<Enter AMRIT email username>
+email-password=<Enter AMRIT email password>
 email-sender-number=DOCTOR
 
 ### generate Beneficiary IDs URL
@@ -185,10 +187,11 @@ max-pool-size=2
 queue-capacity=500
 
 ## everwell variables
-everwellUserName = Demo_API_SVA
-everwellPassword = Demo_API_SVA
-amritUserName = oLRC5amRa12f2l4um4BXQfBa0w8VGs/1usuW7EsGF3k=
-amritPassword = qLr/xepKic9bbwXt8atLjfBa0w8VGs/1usuW7EsGF3k=
+everwellUserName = <Enter everwell username>
+everwellPassword = <Enter everwell password>
+amritUserName = <Enter AMRIT username>
+amritPassword = <Enter AMRIT password>
+
 everwellVanID = 1
 everwellProviderServiceMapID = 1761
 everwellgovtIdentityNo = 2
@@ -207,15 +210,30 @@ everwell1097userAuthenticate =  http://10.208.122.38:8080/commonapi-v1.0/user/us
 everwelluserAuthenticate =  https://beta-hub.everwell.org/token
 everwellRegisterBenficiary = http://10.208.122.38:8080/commonapi-v1.0/beneficiary/create
 
-## SWAASA credentials 
-swaasaEmail = nbfJjsrz8Uz1+AbBpX4fOFiJiNXbfZ98WCsKjvCFvk/wWtMPFRrP9brLluxLBhd5
-swaasaPassword = 4HOXNVjATlzYZuQObN36svBa0w8VGs/1usuW7EsGF3k=
+
+## LungAssessment credentials 
+lungAssessmentEmail = <Enter SWAASA email id>
+lungAssessmentPassword = <Enter SWAASA password>
+
 
 ## SWASSA APIs 
-swaasaAdminLogin = http://swaasa.sandbox.swaasa.ai/api/adminLogin
-swaasaValidateCough =  http://swaasa.sandbox.swaasa.ai/api/verifycough
-swaasaStartAssesment =  http://swaasa.sandbox.swaasa.ai/api/assessment
-swaasaGetAssesment = http://swaasa.sandbox.swaasa.ai/api/getAssessment
+lungAssessmentAdminLogin = http://swaasa.sandbox.swaasa.ai/api/adminLogin
+lungAssessmentValidateCough =  http://swaasa.sandbox.swaasa.ai/api/verifycough
+lungAssessmentStartAssesment =  http://swaasa.sandbox.swaasa.ai/api/assessment
+lungAssessmentGetAssesment = http://swaasa.sandbox.swaasa.ai/api/getAssessment
+
+#E- Sanjeevani user authenticate creds
+eSanjeevani.url: https://preprod.esanjeevaniopd.xyz/uat/aus/api/ThirdPartyAuth/providerLogin
+eSanjeevani.userName: <Enter e-sanjeevani username>
+eSanjeevani.password: <Enter e-sanjeevani password>
+eSanjeevani.salt: 123456
+eSanjeevani.source: 11001
+eSanjeevani.registerPatient: https://preprod.esanjeevaniopd.xyz/uat/ps/api/v1/Patient
+eSanjeevani.routeUrl: https://uat.esanjeevani.in/user/signin
+
+biometric.discover.url = http://127.0.0.1:port/
+biometric.deviceInfo.url = http://127.0.0.1:port/rd/info
+biometric.capture.url = http://127.0.0.1:port/rd/capture
 
 quality-Audit-PageSize=5
 
@@ -223,112 +241,3 @@ quality-Audit-PageSize=5
 failedLoginAttempt=5
 
 # always press enter after last line
-
-
-
-
-# Test env 
-# DB Connections 
-spring.jpa.database=default
-
-##--------------------------------------------## Primary db-------------------------------------------------------------------
-
-
-encDbUserName=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
-encDbPass=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
-spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_iemr?autoReconnect=true&useSSL=false
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-
-
-encDbUserNameSec=zFlYsp9Z0s+lRvLM15A3g/Ba0w8VGs/1usuW7EsGF3k=
-encDbPassSec=JGGAGn5wTlrbTLUHY+5BzfBa0w8VGs/1usuW7EsGF3k=
-secondary.datasource.url=jdbc:mysql://10.208.122.38:3306/db_reporting?autoReconnect=true&useSSL=false
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-##-------------------------------------------------------------# KM config--------------------------------------------------
-
-km-base-url=http://10.208.122.38:8084/OpenKM
-km-base-path=10.208.122.38:8084/OpenKM
-##----------------------------------------------# CTI Config-----------------------------------------------------------------
-
-cti-server-ip=10.208.122.99
-cti-logger_base_url=http://10.208.122.99/logger
-##-------------------------------------------------#### Identity Config--------------------------------------------------------------
-
-identity-api-url=http://10.208.122.38:8080/identity-0.0.1
-identity-1097-api-url=http://10.208.122.38:8080/1097identityapi-v1.0
-
-### generate Beneficiary Config
-genben-api=http://10.208.122.38:8080/bengenapi-v1.0
-
-##---------------------------------------------#### SMS Configuration------------------------------------------------------------------
-
-send-sms=false
-
-###SMS Scheduler configurations
-start-sms-scheduler=false
-cron-scheduler-sms=0 0/1 * * * ? *
-##----------------------------------------------#### Email Configuration-----------------------------------------------------------------
-
-send-email=false
-
-###Email Scheduler configurations
-start-email-scheduler=false
-cron-scheduler-email=0 0/1 * * * ? *
-##-------------------------------###cti data sync Scheduler configurations------------------------------------------------------
-
-start-ctidatasync-scheduler=false
-cron-scheduler-ctidatasync=0 00 01 * * ? *
-##---------------------------------#### Registration schedular for Avni------------------------------------------------------------------------------
-
-start-avni-scheduler=false
-cron-avni-registration=0 0/1 * * * ? *
-##------------------------------------------------#### Everwell Regsitration Scheduler---------------------------------------------------------------
-
-start-registration-scheduler=false
-cron-scheduler-registration=0 34 19 * * ? *
-##----------------------------------------------------#everwell data sync-----------------------------------------------------------
-
-start-everwelldatasync-scheduler=false
-cron-scheduler-everwelldatasync=0 0/5 * * * ? *
-##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
-#run in every 2 hrs
-start-nhmdashboard-scheduler=true
-cron-scheduler-nhmdashboard=0 0 0/2 * * ? *
-
-
-## how much old data it should fetch
-## n day / n hour // n min
-get-agent-summary-report-job=2 hour
-## n day / n hour // n min
-get-details-call-report-job=2 hour
-##-------------------------------------------------### Redis IP--------------------------------------------------------------
-
-spring.redis.host=localhost
-
-##---------------------------------------------------------------------------------------------------------------
-###CTI data sync schedular
-cz-duration=40
-##---------------------------------------------------------------------------------------------------------------
-## prescription template
-TMprescriptionTemplate=TMPrescription
-##---------------------------------------------------------------------------------------------------------------
-##duration for everwell calender
-everwellCalendarDuration=15
- ##---------------------------------------------------------------------------------------------------------------
-##lonic variables
-lonicPageSize=10
- ##---------------------------------------------------------------------------------------------------------------
-#snomedcti
-snomedCTPageSize=10
-##---------------------------------------------------------------------------------------------------------------
-#call retry count
-callRetryConfiguration=3
-##---------------------------------------------------------------------------------------------------------------
-#avni registration Duration
-avniRegistrationLimit=7
-
-
-
-
-
diff --git a/src/test/java/com/iemr/common/CommonApplicationTests.java b/src/test/java/com/iemr/common/CommonApplicationTests.java
index 84e0cb12..a5e06bc9 100644
--- a/src/test/java/com/iemr/common/CommonApplicationTests.java
+++ b/src/test/java/com/iemr/common/CommonApplicationTests.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common;
 
 import org.junit.Test;
diff --git a/src/test/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationControllerTest.java b/src/test/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationControllerTest.java
index dc3b832b..6246e4dc 100644
--- a/src/test/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationControllerTest.java
+++ b/src/test/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationControllerTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.controller.beneficiary;
 
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/iemr/common/cti/CTIControllerTest.java b/src/test/java/com/iemr/common/cti/CTIControllerTest.java
index abcb1a85..ce9fa49d 100644
--- a/src/test/java/com/iemr/common/cti/CTIControllerTest.java
+++ b/src/test/java/com/iemr/common/cti/CTIControllerTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 import static org.assertj.core.api.Assertions.fail;
@@ -14,7 +35,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.iemr.common.controller.cti.CTIController;
+import com.iemr.common.controller.cti.ComputerTelephonyIntegrationController;
 import com.iemr.common.service.cti.CTIService;
 import com.iemr.common.service.cti.CTIServiceImpl;
 import com.iemr.common.utils.mapper.InputMapper;
@@ -22,10 +43,9 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class CTIControllerTest
-{
+public class CTIControllerTest {
 	@InjectMocks
-	private CTIController controllerMock = spy(CTIController.class);
+	private ComputerTelephonyIntegrationController controllerMock = spy(ComputerTelephonyIntegrationController.class);
 
 	private CTIService ctiServiceSpy = spy(new CTIServiceImpl());
 
@@ -33,142 +53,14 @@ public class CTIControllerTest
 	MockHttpServletRequest requestNoIP = new MockHttpServletRequest();
 
 	@Before
-	public void initailize()
-	{
+	public void initailize() {
 		request.setRemoteAddr(Constants.REQUESTOR_IP);
 		requestNoIP.setRemoteAddr("");
 	}
 
 	@Test
-	public void addUpdateAgentSkillsSuccess01()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseSuccess1, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestSuccess1, Constants.REQUESTOR_IP);
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestSuccess1, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills success 1 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseSuccess1));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills success 1 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void addUpdateAgentSkillsSuccess02()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseSuccess2, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestSuccess2, Constants.REQUESTOR_IP);
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestSuccess2, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills success 2 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseSuccess2));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills success 2 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void addUpdateAgentSkillsFailure01()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseFailure1, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure1, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure1, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills failure 1 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseFailure1));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills failure 1 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void addUpdateAgentSkillsFailure02()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseFailure2, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure2, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure2, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills failure 2 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseFailure2));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills failure 2 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void addUpdateAgentSkillsFailure03()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseFailure3, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure3, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure3, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills failure 3 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseFailure3));
-
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills failure 3 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void addUpdateAgentSkillsFailure04()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ContantAddUpdateAgentSkills.responseFailure4, OutputResponse.class))
-					.when(ctiServiceSpy)
-					.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure4, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.addUpdateAgentSkills(ContantAddUpdateAgentSkills.requestFailure4, request)
-					.toString();
-			assertTrue("addUpdateAgentSkills failure 4 ",
-					response.equals(ContantAddUpdateAgentSkills.controllerResponseFailure4));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("addUpdateAgentSkills failure 4 failed with " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void getCampaignSkillsSuccess01()
-	{
-		try
-		{
+	public void getCampaignSkillsSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignSkills.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignSkills(ConstantCampaignSkills.successRequest1, Constants.REQUESTOR_IP);
@@ -176,18 +68,15 @@ public void getCampaignSkillsSuccess01()
 			response = controllerMock.getCampaignSkills(ConstantCampaignSkills.successRequest1, request).toString();
 			assertTrue("getCampaignSkills success 1 ",
 					response.equals(ConstantCampaignSkills.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignSkills success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignSkillsFailure01()
-	{
-		try
-		{
+	public void getCampaignSkillsFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignSkills.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignSkills(ConstantCampaignSkills.failureRequest1, Constants.REQUESTOR_IP);
@@ -196,18 +85,15 @@ public void getCampaignSkillsFailure01()
 			response = controllerMock.getCampaignSkills(ConstantCampaignSkills.failureRequest1, request).toString();
 			assertTrue("getCampaignSkills failure 1 ",
 					response.equals(ConstantCampaignSkills.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignSkills failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignSkillsFailure02()
-	{
-		try
-		{
+	public void getCampaignSkillsFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignSkills.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignSkills(ConstantCampaignSkills.failureRequest2, Constants.REQUESTOR_IP);
@@ -216,550 +102,398 @@ public void getCampaignSkillsFailure02()
 			response = controllerMock.getCampaignSkills(ConstantCampaignSkills.failureRequest2, request).toString();
 			assertTrue("getCampaignSkills failure 2 ",
 					response.equals(ConstantCampaignSkills.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignSkills failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateSuccess01()
-	{
-		try
-		{
+	public void getAgentStateSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.successRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.successRequest1, request).toString();
 			assertTrue("getAgentState success 1 ", response.equals(ConstantAgentState.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateSuccess02()
-	{
-		try
-		{
+	public void getAgentStateSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.successRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.successRequest2, request).toString();
 			assertTrue("getAgentState success 2 ", response.equals(ConstantAgentState.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateSuccess03()
-	{
-		try
-		{
+	public void getAgentStateSuccess03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.successResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.successRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.successRequest3, request).toString();
 			assertTrue("getAgentState success 3 ", response.equals(ConstantAgentState.controllerSuccessResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState success 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateFailure01()
-	{
-		try
-		{
+	public void getAgentStateFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.failureRequest1, request).toString();
 			assertTrue("getAgentState failure 1 ", response.equals(ConstantAgentState.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateFailure02()
-	{
-		try
-		{
+	public void getAgentStateFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.failureRequest2, "");
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.failureRequest2, requestNoIP).toString();
 			assertTrue("getAgentState failure 2 ", response.equals(ConstantAgentState.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentStateFailure03()
-	{
-		try
-		{
+	public void getAgentStateFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentState.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentState(ConstantAgentState.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentState(ConstantAgentState.failureRequest3, request).toString();
 			assertTrue("getAgentState failure 3 ", response.equals(ConstantAgentState.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentState failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsSuccess01()
-	{
-		try
-		{
+	public void getAgentCallStatsSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.successRequest1, request).toString();
 			assertTrue("getAgentCallStats success 1 ", response.equals(ConstantAgentStatus.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsSuccess02()
-	{
-		try
-		{
+	public void getAgentCallStatsSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.successRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.successRequest2, request).toString();
 			assertTrue("getAgentCallStats success 2 ", response.equals(ConstantAgentStatus.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsFailure01()
-	{
-		try
-		{
+	public void getAgentCallStatsFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.failureRequest1, request).toString();
 			assertTrue("getAgentCallStats failure 1 ", response.equals(ConstantAgentStatus.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsFailure02()
-	{
-		try
-		{
+	public void getAgentCallStatsFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.failureRequest2, "");
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.failureRequest2, requestNoIP).toString();
 			assertTrue("getAgentCallStats failure 2 ", response.equals(ConstantAgentStatus.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesSuccess01()
-	{
-		try
-		{
+	public void getCampaignNamesSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.successRequest1, "");
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.successRequest1, requestNoIP).toString();
 			assertTrue("getCampaignNames success 1 ", response.equals(ConstantCampaignName.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesSuccess02()
-	{
-		try
-		{
+	public void getCampaignNamesSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.successRequest2, "");
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.successRequest2, requestNoIP).toString();
 			assertTrue("getCampaignNames success 2 ", response.equals(ConstantCampaignName.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesSuccess03()
-	{
-		try
-		{
+	public void getCampaignNamesSuccess03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.successResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.successRequest3, "");
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.successRequest3, requestNoIP).toString();
 			assertTrue("getCampaignNames success 3 ", response.equals(ConstantCampaignName.controllerSuccessResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames success 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesSuccess04()
-	{
-		try
-		{
+	public void getCampaignNamesSuccess04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.successResponse4, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.successRequest4, "");
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.successRequest4, requestNoIP).toString();
 			assertTrue("getCampaignNames success 4 ", response.equals(ConstantCampaignName.controllerSuccessResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames success 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesFailure01()
-	{
-		try
-		{
+	public void getCampaignNamesFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.failureRequest1, "");
 
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.failureRequest1, requestNoIP).toString();
 			assertTrue("getCampaignNames failure 1 ", response.equals(ConstantCampaignName.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesFailure02()
-	{
-		try
-		{
+	public void getCampaignNamesFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.failureRequest2, "");
 
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.failureRequest2, requestNoIP).toString();
 			assertTrue("getCampaignNames failure 2 ", response.equals(ConstantCampaignName.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignNamesFailure03()
-	{
-		try
-		{
+	public void getCampaignNamesFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignName.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).getCampaignNames(ConstantCampaignName.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getCampaignNames(ConstantCampaignName.failureRequest3, request).toString();
 			assertTrue("getCampaignNames failure 3 ", response.equals(ConstantCampaignName.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignNames failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void doAgentLoginSuccess01()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ConstantAgentLogin.successResponse1, OutputResponse.class))
-					.when(ctiServiceSpy).doAgentLogin(ConstantAgentLogin.successRequest1, Constants.REQUESTOR_IP);
-			String response = "";
-			response = controllerMock.doAgentLogin(ConstantAgentLogin.successRequest1, request).toString();
-			assertTrue("doAgentLogin success 1 ", response.equals(ConstantAgentLogin.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("doAgentLogin success 1 failed with error " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void doAgentLoginFailure01()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ConstantAgentLogin.failureResponse1, OutputResponse.class))
-					.when(ctiServiceSpy).doAgentLogin(ConstantAgentLogin.failureRequest1, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.doAgentLogin(ConstantAgentLogin.failureRequest1, request).toString();
-			assertTrue("doAgentLogin failure 1 ", response.equals(ConstantAgentLogin.controllerFailureResponse1));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("doAgentLogin failure 1 failed with error " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void doAgentLoginFailure02()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ConstantAgentLogin.failureResponse2, OutputResponse.class))
-					.when(ctiServiceSpy).doAgentLogin(ConstantAgentLogin.failureRequest2, Constants.REQUESTOR_IP);
-
-			String response = "";
-			response = controllerMock.doAgentLogin(ConstantAgentLogin.failureRequest2, request).toString();
-			assertTrue("doAgentLogin failure 2 ", response.equals(ConstantAgentLogin.controllerFailureResponse2));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("doAgentLogin failure 2 failed with error " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void doAgentLoginFailure03()
-	{
-		try
-		{
-			doReturn(InputMapper.gson().fromJson(ConstantAgentLogin.failureResponse3, OutputResponse.class))
-					.when(ctiServiceSpy).doAgentLogin(ConstantAgentLogin.failureRequest3, "");
-
-			String response = "";
-			response = controllerMock.doAgentLogin(ConstantAgentLogin.failureRequest3, requestNoIP).toString();
-			assertTrue("doAgentLogin failure 3 ", response.equals(ConstantAgentLogin.controllerFailureResponse3));
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			fail("doAgentLogin failure 3 failed with error " + e.getMessage(), e);
-		}
-	}
-
-	@Test
-	public void getLoginKeySuccess01()
-	{
-		try
-		{
+	public void getLoginKeySuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantUserLogin.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getLoginKey(ConstantUserLogin.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.getLoginKey(ConstantUserLogin.successRequest1, request).toString();
 			assertTrue("getLoginKey success 1 ", response.equals(ConstantUserLogin.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getLoginKey success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getLoginKeyFailure01()
-	{
-		try
-		{
+	public void getLoginKeyFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantUserLogin.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getLoginKey(ConstantUserLogin.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getLoginKey(ConstantUserLogin.failureRequest1, request).toString();
 			assertTrue("getLoginKey failure 1 ", response.equals(ConstantUserLogin.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getLoginKey failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void doAgentLogoutSuccess01()
-	{
-		try
-		{
+	public void doAgentLogoutSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentLogout.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).agentLogout(ConstantAgentLogout.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.doAgentLogout(ConstantAgentLogout.successRequest1, request).toString();
 			assertTrue("doAgentLogout success 1 ", response.equals(ConstantAgentLogout.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("doAgentLogout success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void doAgentLogoutFailure01()
-	{
-		try
-		{
+	public void doAgentLogoutFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentLogout.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).agentLogout(ConstantAgentLogout.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.doAgentLogout(ConstantAgentLogout.failureRequest1, request).toString();
 			assertTrue("doAgentLogout failure 1 ", response.equals(ConstantAgentLogout.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("doAgentLogout failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void doAgentLogoutFailure02()
-	{
-		try
-		{
+	public void doAgentLogoutFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentLogout.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).agentLogout(ConstantAgentLogout.failureRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.doAgentLogout(ConstantAgentLogout.failureRequest2, request).toString();
 			assertTrue("doAgentLogout failure 2 ", response.equals(ConstantAgentLogout.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("doAgentLogout failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void doAgentLogoutFailure03()
-	{
-		try
-		{
+	public void doAgentLogoutFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentLogout.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).agentLogout(ConstantAgentLogout.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.doAgentLogout(ConstantAgentLogout.failureRequest3, request).toString();
 			assertTrue("doAgentLogout failure 3 ", response.equals(ConstantAgentLogout.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("doAgentLogout failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getOnlineAgentsFailure01()
-	{
-		try
-		{
+	public void getOnlineAgentsFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantFreeAgents.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantFreeAgents.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantFreeAgents.failureRequest1, request).toString();
 			assertTrue("getAgentCallStats failure 1 ", response.equals(ConstantFreeAgents.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getOnlineAgentsFailure02()
-	{
-		try
-		{
+	public void getOnlineAgentsFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantFreeAgents.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantFreeAgents.failureRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantFreeAgents.failureRequest2, request).toString();
 			assertTrue("getAgentCallStats failure 2 ", response.equals(ConstantFreeAgents.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getOnlineAgentsFailure03()
-	{
-		try
-		{
+	public void getOnlineAgentsFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantFreeAgents.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantFreeAgents.failureRequest3, "");
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantFreeAgents.failureRequest3, requestNoIP).toString();
 			assertTrue("getAgentCallStats failure 3 ", response.equals(ConstantFreeAgents.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiarySuccess01()
-	{
-		try
-		{
+	public void callBeneficiarySuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.callBeneficiary(ConstantCallBeneficiary.successRequest1, Constants.REQUESTOR_IP);
@@ -767,18 +501,15 @@ public void callBeneficiarySuccess01()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.successRequest1, request).toString();
 			assertTrue("callBeneficiary success 1 ",
 					response.equals(ConstantCallBeneficiary.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure01()
-	{
-		try
-		{
+	public void callBeneficiaryFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.callBeneficiary(ConstantCallBeneficiary.failureRequest1, Constants.REQUESTOR_IP);
@@ -787,18 +518,15 @@ public void callBeneficiaryFailure01()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest1, request).toString();
 			assertTrue("callBeneficiary failure 1 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure02()
-	{
-		try
-		{
+	public void callBeneficiaryFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.callBeneficiary(ConstantCallBeneficiary.failureRequest2, Constants.REQUESTOR_IP);
@@ -807,18 +535,15 @@ public void callBeneficiaryFailure02()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest2, request).toString();
 			assertTrue("callBeneficiary failure 2 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure03()
-	{
-		try
-		{
+	public void callBeneficiaryFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).callBeneficiary(ConstantCallBeneficiary.failureRequest3, "");
 
@@ -826,18 +551,15 @@ public void callBeneficiaryFailure03()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest3, requestNoIP).toString();
 			assertTrue("callBeneficiary failure 3 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure04()
-	{
-		try
-		{
+	public void callBeneficiaryFailure04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse4, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.callBeneficiary(ConstantCallBeneficiary.failureRequest4, Constants.REQUESTOR_IP);
@@ -846,18 +568,15 @@ public void callBeneficiaryFailure04()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest4, request).toString();
 			assertTrue("callBeneficiary failure 4 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure05()
-	{
-		try
-		{
+	public void callBeneficiaryFailure05() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse5, OutputResponse.class))
 					.when(ctiServiceSpy).callBeneficiary(ConstantCallBeneficiary.failureRequest5, "");
 
@@ -865,18 +584,15 @@ public void callBeneficiaryFailure05()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest5, requestNoIP).toString();
 			assertTrue("callBeneficiary failure 5 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse5));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 5 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure06()
-	{
-		try
-		{
+	public void callBeneficiaryFailure06() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse6, OutputResponse.class))
 					.when(ctiServiceSpy).callBeneficiary(ConstantCallBeneficiary.failureRequest6, "");
 
@@ -884,18 +600,15 @@ public void callBeneficiaryFailure06()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest6, requestNoIP).toString();
 			assertTrue("callBeneficiary failure 6 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse6));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 6 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void callBeneficiaryFailure07()
-	{
-		try
-		{
+	public void callBeneficiaryFailure07() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallBeneficiary.failureResponse7, OutputResponse.class))
 					.when(ctiServiceSpy).callBeneficiary(ConstantCallBeneficiary.failureRequest7, "");
 
@@ -903,18 +616,15 @@ public void callBeneficiaryFailure07()
 			response = controllerMock.callBeneficiary(ConstantCallBeneficiary.failureRequest7, requestNoIP).toString();
 			assertTrue("callBeneficiary failure 7 ",
 					response.equals(ConstantCallBeneficiary.controllerFailureResponse7));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("callBeneficiary failure 7 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataSuccess01()
-	{
-		try
-		{
+	public void addUpdateUserDataSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.successRequest1, Constants.REQUESTOR_IP);
@@ -922,18 +632,15 @@ public void addUpdateUserDataSuccess01()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.successRequest1, request).toString();
 			assertTrue("addUpdateUserData success 1 ",
 					response.equals(ConstantAddUpdateUser.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataSuccess02()
-	{
-		try
-		{
+	public void addUpdateUserDataSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.successRequest2, Constants.REQUESTOR_IP);
@@ -941,18 +648,15 @@ public void addUpdateUserDataSuccess02()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.successRequest2, request).toString();
 			assertTrue("addUpdateUserData success 2 ",
 					response.equals(ConstantAddUpdateUser.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataSuccess03()
-	{
-		try
-		{
+	public void addUpdateUserDataSuccess03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.successResponse3, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.successRequest3, Constants.REQUESTOR_IP);
@@ -960,18 +664,15 @@ public void addUpdateUserDataSuccess03()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.successRequest3, request).toString();
 			assertTrue("addUpdateUserData success 3 ",
 					response.equals(ConstantAddUpdateUser.controllerSuccessResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData success 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataFailure01()
-	{
-		try
-		{
+	public void addUpdateUserDataFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.failureRequest1, Constants.REQUESTOR_IP);
@@ -980,18 +681,15 @@ public void addUpdateUserDataFailure01()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.failureRequest1, request).toString();
 			assertTrue("addUpdateUserData failure 1 ",
 					response.equals(ConstantAddUpdateUser.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataFailure02()
-	{
-		try
-		{
+	public void addUpdateUserDataFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.failureRequest2, Constants.REQUESTOR_IP);
@@ -1000,18 +698,15 @@ public void addUpdateUserDataFailure02()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.failureRequest2, request).toString();
 			assertTrue("addUpdateUserData failure 2 ",
 					response.equals(ConstantAddUpdateUser.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void addUpdateUserDataFailure03()
-	{
-		try
-		{
+	public void addUpdateUserDataFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAddUpdateUser.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.addUpdateUserData(ConstantAddUpdateUser.failureRequest3, Constants.REQUESTOR_IP);
@@ -1020,17 +715,14 @@ public void addUpdateUserDataFailure03()
 			response = controllerMock.addUpdateUserData(ConstantAddUpdateUser.failureRequest3, request).toString();
 			assertTrue("addUpdateUserData failure 3 ",
 					response.equals(ConstantAddUpdateUser.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("addUpdateUserData failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
-	public void getTransferCampaignsSuccess01()
-	{
-		try
-		{
+	public void getTransferCampaignsSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetTransferCampaigns.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getTransferCampaigns(ConstantGetTransferCampaigns.successRequest1, Constants.REQUESTOR_IP);
@@ -1039,18 +731,15 @@ public void getTransferCampaignsSuccess01()
 					.toString();
 			assertTrue("getTransferCampaigns success 1 ",
 					response.equals(ConstantGetTransferCampaigns.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getTransferCampaigns success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getTransferCampaignsSuccess02()
-	{
-		try
-		{
+	public void getTransferCampaignsSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetTransferCampaigns.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getTransferCampaigns(ConstantGetTransferCampaigns.successRequest2, Constants.REQUESTOR_IP);
@@ -1059,18 +748,15 @@ public void getTransferCampaignsSuccess02()
 					.toString();
 			assertTrue("getTransferCampaigns success 2 ",
 					response.equals(ConstantGetTransferCampaigns.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getTransferCampaigns success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getTransferCampaignsFailure01()
-	{
-		try
-		{
+	public void getTransferCampaignsFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetTransferCampaigns.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getTransferCampaigns(ConstantGetTransferCampaigns.failureRequest1, Constants.REQUESTOR_IP);
@@ -1080,18 +766,15 @@ public void getTransferCampaignsFailure01()
 					.toString();
 			assertTrue("getTransferCampaigns failure 1 ",
 					response.equals(ConstantGetTransferCampaigns.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getTransferCampaigns failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getTransferCampaignsFailure02()
-	{
-		try
-		{
+	public void getTransferCampaignsFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetTransferCampaigns.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getTransferCampaigns(ConstantGetTransferCampaigns.failureRequest2, Constants.REQUESTOR_IP);
@@ -1101,18 +784,15 @@ public void getTransferCampaignsFailure02()
 					.toString();
 			assertTrue("getTransferCampaigns failure 2 ",
 					response.equals(ConstantGetTransferCampaigns.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getTransferCampaigns failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignRolesSuccess01()
-	{
-		try
-		{
+	public void getCampaignRolesSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignRoles.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignRoles(ConstantCampaignRoles.successRequest1, Constants.REQUESTOR_IP);
@@ -1120,18 +800,15 @@ public void getCampaignRolesSuccess01()
 			response = controllerMock.getCampaignRoles(ConstantCampaignRoles.successRequest1, request).toString();
 			assertTrue("getCampaignRoles success 1 ",
 					response.equals(ConstantCampaignRoles.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignRoles success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignRolesFailure01()
-	{
-		try
-		{
+	public void getCampaignRolesFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignRoles.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignRoles(ConstantCampaignRoles.failureRequest1, Constants.REQUESTOR_IP);
@@ -1140,18 +817,15 @@ public void getCampaignRolesFailure01()
 			response = controllerMock.getCampaignRoles(ConstantCampaignRoles.failureRequest1, request).toString();
 			assertTrue("getCampaignRoles failure 1 ",
 					response.equals(ConstantCampaignRoles.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignRoles failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getCampaignRolesFailure02()
-	{
-		try
-		{
+	public void getCampaignRolesFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCampaignRoles.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getCampaignRoles(ConstantCampaignRoles.failureRequest2, Constants.REQUESTOR_IP);
@@ -1160,18 +834,15 @@ public void getCampaignRolesFailure02()
 			response = controllerMock.getCampaignRoles(ConstantCampaignRoles.failureRequest2, request).toString();
 			assertTrue("getCampaignRoles failure 2 ",
 					response.equals(ConstantCampaignRoles.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getCampaignRoles failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionSuccess01()
-	{
-		try
-		{
+	public void setCallDispositionSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.successRequest1, Constants.REQUESTOR_IP);
@@ -1180,18 +851,15 @@ public void setCallDispositionSuccess01()
 					.toString();
 			assertTrue("setCallDisposition success 1 ",
 					response.equals(ConstantSetCallDisposition.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionSuccess02()
-	{
-		try
-		{
+	public void setCallDispositionSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.successRequest2, Constants.REQUESTOR_IP);
@@ -1200,18 +868,15 @@ public void setCallDispositionSuccess02()
 					.toString();
 			assertTrue("setCallDisposition success 2 ",
 					response.equals(ConstantSetCallDisposition.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionSuccess03()
-	{
-		try
-		{
+	public void setCallDispositionSuccess03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.successResponse3, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.successRequest3, Constants.REQUESTOR_IP);
@@ -1220,18 +885,15 @@ public void setCallDispositionSuccess03()
 					.toString();
 			assertTrue("setCallDisposition success 3 ",
 					response.equals(ConstantSetCallDisposition.controllerSuccessResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition success 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionSuccess04()
-	{
-		try
-		{
+	public void setCallDispositionSuccess04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.successResponse4, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.successRequest4, Constants.REQUESTOR_IP);
@@ -1240,18 +902,15 @@ public void setCallDispositionSuccess04()
 					.toString();
 			assertTrue("setCallDisposition success 4 ",
 					response.equals(ConstantSetCallDisposition.controllerSuccessResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition success 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionFailure01()
-	{
-		try
-		{
+	public void setCallDispositionFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.failureRequest1, Constants.REQUESTOR_IP);
@@ -1261,18 +920,15 @@ public void setCallDispositionFailure01()
 					.toString();
 			assertTrue("setCallDisposition failure 1 ",
 					response.equals(ConstantSetCallDisposition.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void setCallDispositionFailure02()
-	{
-		try
-		{
+	public void setCallDispositionFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSetCallDisposition.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.setCallDisposition(ConstantSetCallDisposition.failureRequest2, Constants.REQUESTOR_IP);
@@ -1282,18 +938,15 @@ public void setCallDispositionFailure02()
 					.toString();
 			assertTrue("setCallDisposition failure 2 ",
 					response.equals(ConstantSetCallDisposition.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("setCallDisposition failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void createVoiceFileSuccess01()
-	{
-		try
-		{
+	public void createVoiceFileSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCreateVoiceFile.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.createVoiceFile(ConstantCreateVoiceFile.successRequest1, Constants.REQUESTOR_IP);
@@ -1301,18 +954,15 @@ public void createVoiceFileSuccess01()
 			response = controllerMock.createVoiceFile(ConstantCreateVoiceFile.successRequest1, request).toString();
 			assertTrue("createVoiceFile success 1 ",
 					response.equals(ConstantCreateVoiceFile.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("createVoiceFile success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void createVoiceFileSuccess02()
-	{
-		try
-		{
+	public void createVoiceFileSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCreateVoiceFile.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.createVoiceFile(ConstantCreateVoiceFile.successRequest2, Constants.REQUESTOR_IP);
@@ -1320,18 +970,15 @@ public void createVoiceFileSuccess02()
 			response = controllerMock.createVoiceFile(ConstantCreateVoiceFile.successRequest2, request).toString();
 			assertTrue("createVoiceFile success 2 ",
 					response.equals(ConstantCreateVoiceFile.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("createVoiceFile success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void createVoiceFileFailure01()
-	{
-		try
-		{
+	public void createVoiceFileFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCreateVoiceFile.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.createVoiceFile(ConstantCreateVoiceFile.failureRequest1, Constants.REQUESTOR_IP);
@@ -1340,248 +987,206 @@ public void createVoiceFileFailure01()
 			response = controllerMock.createVoiceFile(ConstantCreateVoiceFile.failureRequest1, request).toString();
 			assertTrue("createVoiceFile failure 1 ",
 					response.equals(ConstantCreateVoiceFile.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("createVoiceFile failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getVoiceFileSuccess01()
-	{
-		try
-		{
+	public void getVoiceFileSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetVoiceFile.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getVoiceFile(ConstantGetVoiceFile.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.getVoiceFile(ConstantGetVoiceFile.successRequest1, request).toString();
 			assertTrue("getVoiceFile success 1 ", response.equals(ConstantGetVoiceFile.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getVoiceFile success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getVoiceFileFailure01()
-	{
-		try
-		{
+	public void getVoiceFileFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetVoiceFile.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getVoiceFile(ConstantGetVoiceFile.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getVoiceFile(ConstantGetVoiceFile.failureRequest1, request).toString();
 			assertTrue("getVoiceFile failure 1 ", response.equals(ConstantGetVoiceFile.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getVoiceFile failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getVoiceFileFailure02()
-	{
-		try
-		{
+	public void getVoiceFileFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantGetVoiceFile.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).getVoiceFile(ConstantGetVoiceFile.failureRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getVoiceFile(ConstantGetVoiceFile.failureRequest2, request).toString();
 			assertTrue("getVoiceFile failure 2 ", response.equals(ConstantGetVoiceFile.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getVoiceFile failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void disconnectCallSuccess01()
-	{
-		try
-		{
+	public void disconnectCallSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallDisconnect.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).disconnectCall(ConstantCallDisconnect.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.disconnectCall(ConstantCallDisconnect.successRequest1, request).toString();
 			assertTrue("disconnectCall success 1 ", response.equals(ConstantCallDisconnect.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("disconnectCall success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void disconnectCallFailure01()
-	{
-		try
-		{
+	public void disconnectCallFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallDisconnect.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).disconnectCall(ConstantCallDisconnect.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.disconnectCall(ConstantCallDisconnect.failureRequest1, request).toString();
 			assertTrue("disconnectCall failure 1 ", response.equals(ConstantCallDisconnect.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("disconnectCall failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void disconnectCallFailure02()
-	{
-		try
-		{
+	public void disconnectCallFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallDisconnect.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).disconnectCall(ConstantCallDisconnect.failureRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.disconnectCall(ConstantCallDisconnect.failureRequest2, request).toString();
 			assertTrue("disconnectCall failure 2 ", response.equals(ConstantCallDisconnect.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("disconnectCall failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void disconnectCallFailure03()
-	{
-		try
-		{
+	public void disconnectCallFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantCallDisconnect.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).disconnectCall(ConstantCallDisconnect.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.disconnectCall(ConstantCallDisconnect.failureRequest3, request).toString();
 			assertTrue("disconnectCall failure 3 ", response.equals(ConstantCallDisconnect.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("disconnectCall failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundSuccess01()
-	{
-		try
-		{
+	public void switchToInboundSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.successRequest1, request).toString();
 			assertTrue("switchToInbound success 1 ", response.equals(ConstantSwitchInbound.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundSuccess02()
-	{
-		try
-		{
+	public void switchToInboundSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.successRequest2, "");
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.successRequest2, requestNoIP).toString();
 			assertTrue("switchToInbound success 2 ", response.equals(ConstantSwitchInbound.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundFailure01()
-	{
-		try
-		{
+	public void switchToInboundFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.failureRequest1, request).toString();
 			assertTrue("switchToInbound failure 1 ", response.equals(ConstantSwitchInbound.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundFailure02()
-	{
-		try
-		{
+	public void switchToInboundFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.failureRequest2, "");
 
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.failureRequest2, requestNoIP).toString();
 			assertTrue("switchToInbound failure 2 ", response.equals(ConstantSwitchInbound.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundFailure03()
-	{
-		try
-		{
+	public void switchToInboundFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.failureRequest3, request).toString();
 			assertTrue("switchToInbound failure 3 ", response.equals(ConstantSwitchInbound.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToInboundFailure04()
-	{
-		try
-		{
+	public void switchToInboundFailure04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchInbound.failureResponse4, OutputResponse.class))
 					.when(ctiServiceSpy).switchToInbound(ConstantSwitchInbound.failureRequest4, "");
 
 			String response = "";
 			response = controllerMock.switchToInbound(ConstantSwitchInbound.failureRequest4, requestNoIP).toString();
 			assertTrue("switchToInbound failure 4 ", response.equals(ConstantSwitchInbound.controllerFailureResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToInbound failure 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundSuccess01()
-	{
-		try
-		{
+	public void switchToOutboundSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.switchToOutbound(ConstantSwitchOutbound.successRequest1, Constants.REQUESTOR_IP);
@@ -1589,36 +1194,30 @@ public void switchToOutboundSuccess01()
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.successRequest1, request).toString();
 			assertTrue("switchToOutbound success 1 ",
 					response.equals(ConstantSwitchOutbound.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundSuccess02()
-	{
-		try
-		{
+	public void switchToOutboundSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).switchToOutbound(ConstantSwitchOutbound.successRequest2, "");
 			String response = "";
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.successRequest2, requestNoIP).toString();
 			assertTrue("switchToOutbound success 2 ",
 					response.equals(ConstantSwitchOutbound.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundFailure01()
-	{
-		try
-		{
+	public void switchToOutboundFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.switchToOutbound(ConstantSwitchOutbound.failureRequest1, Constants.REQUESTOR_IP);
@@ -1627,18 +1226,15 @@ public void switchToOutboundFailure01()
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.failureRequest1, request).toString();
 			assertTrue("switchToOutbound failure 1 ",
 					response.equals(ConstantSwitchOutbound.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundFailure02()
-	{
-		try
-		{
+	public void switchToOutboundFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).switchToOutbound(ConstantSwitchOutbound.failureRequest2, "");
 
@@ -1646,18 +1242,15 @@ public void switchToOutboundFailure02()
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.failureRequest2, requestNoIP).toString();
 			assertTrue("switchToOutbound failure 2 ",
 					response.equals(ConstantSwitchOutbound.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundFailure03()
-	{
-		try
-		{
+	public void switchToOutboundFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.switchToOutbound(ConstantSwitchOutbound.failureRequest3, Constants.REQUESTOR_IP);
@@ -1666,18 +1259,15 @@ public void switchToOutboundFailure03()
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.failureRequest3, request).toString();
 			assertTrue("switchToOutbound failure 3 ",
 					response.equals(ConstantSwitchOutbound.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void switchToOutboundFailure04()
-	{
-		try
-		{
+	public void switchToOutboundFailure04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantSwitchOutbound.failureResponse4, OutputResponse.class))
 					.when(ctiServiceSpy).switchToOutbound(ConstantSwitchOutbound.failureRequest4, "");
 
@@ -1685,18 +1275,15 @@ public void switchToOutboundFailure04()
 			response = controllerMock.switchToOutbound(ConstantSwitchOutbound.failureRequest4, requestNoIP).toString();
 			assertTrue("switchToOutbound failure 4 ",
 					response.equals(ConstantSwitchOutbound.controllerFailureResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("switchToOutbound failure 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentIPAddressSuccess01()
-	{
-		try
-		{
+	public void getAgentIPAddressSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentIPAddress.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getAgentIPAddress(ConstantAgentIPAddress.successRequest1, Constants.REQUESTOR_IP);
@@ -1704,18 +1291,15 @@ public void getAgentIPAddressSuccess01()
 			response = controllerMock.getAgentIPAddress(ConstantAgentIPAddress.successRequest1, request).toString();
 			assertTrue("getAgentIPAddress success 1 ",
 					response.equals(ConstantAgentIPAddress.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentIPAddress success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentIPAddressFailure01()
-	{
-		try
-		{
+	public void getAgentIPAddressFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentIPAddress.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy)
 					.getAgentIPAddress(ConstantAgentIPAddress.failureRequest1, Constants.REQUESTOR_IP);
@@ -1724,182 +1308,151 @@ public void getAgentIPAddressFailure01()
 			response = controllerMock.getAgentIPAddress(ConstantAgentIPAddress.failureRequest1, request).toString();
 			assertTrue("getAgentIPAddress failure 1 ",
 					response.equals(ConstantAgentIPAddress.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentIPAddress failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallSuccess01()
-	{
-		try
-		{
+	public void transferCallSuccess01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.successRequest1, request).toString();
 			assertTrue("transferCall success 1 ", response.equals(ConstantTransferCall.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallSuccess02()
-	{
-		try
-		{
+	public void transferCallSuccess02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.successResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.successRequest2, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.successRequest2, request).toString();
 			assertTrue("transferCall success 2 ", response.equals(ConstantTransferCall.controllerSuccessResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall success 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallSuccess03()
-	{
-		try
-		{
+	public void transferCallSuccess03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.successResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.successRequest3, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.successRequest3, request).toString();
 			assertTrue("transferCall success 3 ", response.equals(ConstantTransferCall.controllerSuccessResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall success 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallSuccess04()
-	{
-		try
-		{
+	public void transferCallSuccess04() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.successResponse4, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.successRequest4, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.successRequest4, request).toString();
 			assertTrue("transferCall success 4 ", response.equals(ConstantTransferCall.controllerSuccessResponse4));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall success 4 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallSuccess05()
-	{
-		try
-		{
+	public void transferCallSuccess05() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.successResponse5, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.successRequest5, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.successRequest5, request).toString();
 			assertTrue("transferCall success 5 ", response.equals(ConstantTransferCall.controllerSuccessResponse5));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallFailure01()
-	{
-		try
-		{
+	public void transferCallFailure01() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.failureRequest1, request).toString();
 			assertTrue("transferCall failure 1 ", response.equals(ConstantTransferCall.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall failure 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallFailure02()
-	{
-		try
-		{
+	public void transferCallFailure02() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.failureResponse2, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.failureRequest2, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.failureRequest2, request).toString();
 			assertTrue("transferCall failure 2 ", response.equals(ConstantTransferCall.controllerFailureResponse2));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall failure 2 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void transferCallFailure03()
-	{
-		try
-		{
+	public void transferCallFailure03() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantTransferCall.failureResponse3, OutputResponse.class))
 					.when(ctiServiceSpy).transferCall(ConstantTransferCall.failureRequest3, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.transferCall(ConstantTransferCall.failureRequest3, request).toString();
 			assertTrue("transferCall failure 3 ", response.equals(ConstantTransferCall.controllerFailureResponse3));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("transferCall failure 3 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsSuccess1()
-	{
-		try
-		{
+	public void getAgentCallStatsSuccess1() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.successResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.successRequest1, Constants.REQUESTOR_IP);
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.successRequest1, request).toString();
 			assertTrue("getAgentCallStats success 1 ", response.equals(ConstantAgentStatus.controllerSuccessResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats success 1 failed with error " + e.getMessage(), e);
 		}
 	}
 
 	@Test
-	public void getAgentCallStatsFailure1()
-	{
-		try
-		{
+	public void getAgentCallStatsFailure1() {
+		try {
 			doReturn(InputMapper.gson().fromJson(ConstantAgentStatus.failureResponse1, OutputResponse.class))
 					.when(ctiServiceSpy).getAgentCallStats(ConstantAgentStatus.failureRequest1, Constants.REQUESTOR_IP);
 
 			String response = "";
 			response = controllerMock.getAgentCallStats(ConstantAgentStatus.failureRequest1, request).toString();
 			assertTrue("getAgentCallStats failure 1 ", response.equals(ConstantAgentStatus.controllerFailureResponse1));
-		} catch (Exception e)
-		{
+		} catch (Exception e) {
 			e.printStackTrace();
 			fail("getAgentCallStats failure 1 failed with error " + e.getMessage(), e);
 		}
diff --git a/src/test/java/com/iemr/common/cti/CTIServiceTest.java b/src/test/java/com/iemr/common/cti/CTIServiceTest.java
index 7aceebf8..a91db2fa 100644
--- a/src/test/java/com/iemr/common/cti/CTIServiceTest.java
+++ b/src/test/java/com/iemr/common/cti/CTIServiceTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/iemr/common/cti/ConstantAddUpdateUser.java b/src/test/java/com/iemr/common/cti/ConstantAddUpdateUser.java
index 7beb3c79..5513c8bb 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAddUpdateUser.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAddUpdateUser.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAddUpdateUser extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAgentIPAddress.java b/src/test/java/com/iemr/common/cti/ConstantAgentIPAddress.java
index 09f70909..cd2b861d 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAgentIPAddress.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAgentIPAddress.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAgentIPAddress extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAgentLogin.java b/src/test/java/com/iemr/common/cti/ConstantAgentLogin.java
index 2c700fdd..e6297af5 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAgentLogin.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAgentLogin.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAgentLogin extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAgentLogout.java b/src/test/java/com/iemr/common/cti/ConstantAgentLogout.java
index 3fa84e39..728472df 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAgentLogout.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAgentLogout.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAgentLogout extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAgentState.java b/src/test/java/com/iemr/common/cti/ConstantAgentState.java
index 922ce740..039c2299 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAgentState.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAgentState.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAgentState extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAgentStatus.java b/src/test/java/com/iemr/common/cti/ConstantAgentStatus.java
index a19b7ef2..06b38ac4 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAgentStatus.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAgentStatus.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAgentStatus extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantAvailableAgents.java b/src/test/java/com/iemr/common/cti/ConstantAvailableAgents.java
index 1754ce23..7b23efe1 100644
--- a/src/test/java/com/iemr/common/cti/ConstantAvailableAgents.java
+++ b/src/test/java/com/iemr/common/cti/ConstantAvailableAgents.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantAvailableAgents extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantBlockNumber.java b/src/test/java/com/iemr/common/cti/ConstantBlockNumber.java
index f85f9412..42b60ac8 100644
--- a/src/test/java/com/iemr/common/cti/ConstantBlockNumber.java
+++ b/src/test/java/com/iemr/common/cti/ConstantBlockNumber.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantBlockNumber extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCallBeneficiary.java b/src/test/java/com/iemr/common/cti/ConstantCallBeneficiary.java
index 5da2f20c..aa75492d 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCallBeneficiary.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCallBeneficiary.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCallBeneficiary extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCallDisconnect.java b/src/test/java/com/iemr/common/cti/ConstantCallDisconnect.java
index edd1e659..094dc383 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCallDisconnect.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCallDisconnect.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCallDisconnect extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCampaignName.java b/src/test/java/com/iemr/common/cti/ConstantCampaignName.java
index 6e741f5d..66bcb39b 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCampaignName.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCampaignName.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCampaignName extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCampaignRoles.java b/src/test/java/com/iemr/common/cti/ConstantCampaignRoles.java
index effd8729..48edcc7c 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCampaignRoles.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCampaignRoles.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCampaignRoles extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCampaignSkills.java b/src/test/java/com/iemr/common/cti/ConstantCampaignSkills.java
index 3de46f23..fb9e0abc 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCampaignSkills.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCampaignSkills.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCampaignSkills extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantCreateVoiceFile.java b/src/test/java/com/iemr/common/cti/ConstantCreateVoiceFile.java
index 3373b26e..8b0820d6 100644
--- a/src/test/java/com/iemr/common/cti/ConstantCreateVoiceFile.java
+++ b/src/test/java/com/iemr/common/cti/ConstantCreateVoiceFile.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantCreateVoiceFile extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantFreeAgents.java b/src/test/java/com/iemr/common/cti/ConstantFreeAgents.java
index d35b7cd2..fe9af93d 100644
--- a/src/test/java/com/iemr/common/cti/ConstantFreeAgents.java
+++ b/src/test/java/com/iemr/common/cti/ConstantFreeAgents.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantFreeAgents extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantGetTransferCampaigns.java b/src/test/java/com/iemr/common/cti/ConstantGetTransferCampaigns.java
index b016c1ac..0f76bf33 100644
--- a/src/test/java/com/iemr/common/cti/ConstantGetTransferCampaigns.java
+++ b/src/test/java/com/iemr/common/cti/ConstantGetTransferCampaigns.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantGetTransferCampaigns extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantGetVoiceFile.java b/src/test/java/com/iemr/common/cti/ConstantGetVoiceFile.java
index 7fd75969..8d1e32aa 100644
--- a/src/test/java/com/iemr/common/cti/ConstantGetVoiceFile.java
+++ b/src/test/java/com/iemr/common/cti/ConstantGetVoiceFile.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantGetVoiceFile extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantSetCallDisposition.java b/src/test/java/com/iemr/common/cti/ConstantSetCallDisposition.java
index 84887c81..db020244 100644
--- a/src/test/java/com/iemr/common/cti/ConstantSetCallDisposition.java
+++ b/src/test/java/com/iemr/common/cti/ConstantSetCallDisposition.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantSetCallDisposition extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantSwitchInbound.java b/src/test/java/com/iemr/common/cti/ConstantSwitchInbound.java
index f4c4cee3..ab3a306c 100644
--- a/src/test/java/com/iemr/common/cti/ConstantSwitchInbound.java
+++ b/src/test/java/com/iemr/common/cti/ConstantSwitchInbound.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantSwitchInbound extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantSwitchOutbound.java b/src/test/java/com/iemr/common/cti/ConstantSwitchOutbound.java
index d057cab3..723b97f9 100644
--- a/src/test/java/com/iemr/common/cti/ConstantSwitchOutbound.java
+++ b/src/test/java/com/iemr/common/cti/ConstantSwitchOutbound.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantSwitchOutbound extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantTransferCall.java b/src/test/java/com/iemr/common/cti/ConstantTransferCall.java
index f236bf3c..3edc15ca 100644
--- a/src/test/java/com/iemr/common/cti/ConstantTransferCall.java
+++ b/src/test/java/com/iemr/common/cti/ConstantTransferCall.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantTransferCall extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantUnblockNumber.java b/src/test/java/com/iemr/common/cti/ConstantUnblockNumber.java
index 7cde5d9d..41c5833d 100644
--- a/src/test/java/com/iemr/common/cti/ConstantUnblockNumber.java
+++ b/src/test/java/com/iemr/common/cti/ConstantUnblockNumber.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantUnblockNumber extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ConstantUserLogin.java b/src/test/java/com/iemr/common/cti/ConstantUserLogin.java
index fda0fee0..908dbac4 100644
--- a/src/test/java/com/iemr/common/cti/ConstantUserLogin.java
+++ b/src/test/java/com/iemr/common/cti/ConstantUserLogin.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ConstantUserLogin extends Constants
diff --git a/src/test/java/com/iemr/common/cti/Constants.java b/src/test/java/com/iemr/common/cti/Constants.java
index 3cc17777..0a1044de 100644
--- a/src/test/java/com/iemr/common/cti/Constants.java
+++ b/src/test/java/com/iemr/common/cti/Constants.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface Constants
diff --git a/src/test/java/com/iemr/common/cti/ContantAddUpdateAgentSkills.java b/src/test/java/com/iemr/common/cti/ContantAddUpdateAgentSkills.java
index 0dfbd29a..47dd5f58 100644
--- a/src/test/java/com/iemr/common/cti/ContantAddUpdateAgentSkills.java
+++ b/src/test/java/com/iemr/common/cti/ContantAddUpdateAgentSkills.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ContantAddUpdateAgentSkills extends Constants
diff --git a/src/test/java/com/iemr/common/cti/ContantCallBeneficiary.java b/src/test/java/com/iemr/common/cti/ContantCallBeneficiary.java
index cf234d33..9032bd4f 100644
--- a/src/test/java/com/iemr/common/cti/ContantCallBeneficiary.java
+++ b/src/test/java/com/iemr/common/cti/ContantCallBeneficiary.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.cti;
 
 public interface ContantCallBeneficiary extends Constants
diff --git a/src/test/java/com/iemr/common/kmfilemanager/KMFileManagerServiceImplTest.java b/src/test/java/com/iemr/common/kmfilemanager/KMFileManagerServiceImplTest.java
index 19cc7d91..416685b5 100644
--- a/src/test/java/com/iemr/common/kmfilemanager/KMFileManagerServiceImplTest.java
+++ b/src/test/java/com/iemr/common/kmfilemanager/KMFileManagerServiceImplTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.kmfilemanager;
 
 import org.junit.Test;
diff --git a/src/test/java/com/iemr/common/notification/ConstantEmergencyContacts.java b/src/test/java/com/iemr/common/notification/ConstantEmergencyContacts.java
index bd2a351b..626fc9bb 100644
--- a/src/test/java/com/iemr/common/notification/ConstantEmergencyContacts.java
+++ b/src/test/java/com/iemr/common/notification/ConstantEmergencyContacts.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification;
 
 public interface ConstantEmergencyContacts
diff --git a/src/test/java/com/iemr/common/notification/NotificationControllerTest.java b/src/test/java/com/iemr/common/notification/NotificationControllerTest.java
index 410ecc52..8af7d9ec 100644
--- a/src/test/java/com/iemr/common/notification/NotificationControllerTest.java
+++ b/src/test/java/com/iemr/common/notification/NotificationControllerTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification;
 
 import static org.mockito.Mockito.spy;
diff --git a/src/test/java/com/iemr/common/notification/NotificationServiceTest.java b/src/test/java/com/iemr/common/notification/NotificationServiceTest.java
index 85bf2c1b..c75306c2 100644
--- a/src/test/java/com/iemr/common/notification/NotificationServiceTest.java
+++ b/src/test/java/com/iemr/common/notification/NotificationServiceTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.notification;
 
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/com/iemr/common/users/IEMRAdminControllerTest.java b/src/test/java/com/iemr/common/users/IEMRAdminControllerTest.java
index 371b3bad..e8187d27 100644
--- a/src/test/java/com/iemr/common/users/IEMRAdminControllerTest.java
+++ b/src/test/java/com/iemr/common/users/IEMRAdminControllerTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.users;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/com/iemr/common/utils/config/ConfigPropertiesTest.java b/src/test/java/com/iemr/common/utils/config/ConfigPropertiesTest.java
index ae9db2ca..850f7de2 100644
--- a/src/test/java/com/iemr/common/utils/config/ConfigPropertiesTest.java
+++ b/src/test/java/com/iemr/common/utils/config/ConfigPropertiesTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.config;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/iemr/common/utils/km/openkm/OpenKMServicesTest.java b/src/test/java/com/iemr/common/utils/km/openkm/OpenKMServicesTest.java
index f1fceeda..fd3c21b0 100644
--- a/src/test/java/com/iemr/common/utils/km/openkm/OpenKMServicesTest.java
+++ b/src/test/java/com/iemr/common/utils/km/openkm/OpenKMServicesTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.km.openkm;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/com/iemr/common/utils/sessionobject/SessionObjectTest.java b/src/test/java/com/iemr/common/utils/sessionobject/SessionObjectTest.java
index 971cea49..2cb7d066 100644
--- a/src/test/java/com/iemr/common/utils/sessionobject/SessionObjectTest.java
+++ b/src/test/java/com/iemr/common/utils/sessionobject/SessionObjectTest.java
@@ -1,3 +1,24 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology 
+* Integrated EHR (Electronic Health Records) Solution 
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute" 
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
 package com.iemr.common.utils.sessionobject;
 
 import static org.junit.Assert.assertEquals;
