diff --git a/.env b/.env
new file mode 100644
index 000000000..8e3c6c03b
--- /dev/null
+++ b/.env
@@ -0,0 +1,12 @@
+MYSQL_TAG=8.0.25
+MYSQL_DATABASE=oh
+MYSQL_PORT=3306
+MYSQL_ROOT_PASSWORD=root
+MYSQL_USER=isf
+MYSQL_PASSWORD=isf123
+
+GITHUB_ORG=SteveGT96
+OH_CORE_BRANCH=staging3
+OH_API_BRANCH=staging3-upgrade-2.6.7
+API_VERSION=0.0.1
+API_PORT:8080
\ No newline at end of file
diff --git a/Dockerfile.backend b/Dockerfile.backend
new file mode 100644
index 000000000..d8d659221
--- /dev/null
+++ b/Dockerfile.backend
@@ -0,0 +1,22 @@
+FROM maven:3.8-jdk-8
+
+ARG GITHUB_ORG
+ARG OH_CORE_BRANCH
+ARG OH_API_BRANCH
+ARG OH_VERSION
+
+RUN mkdir /oh_web
+RUN apt-get update
+RUN apt-get install -y git
+WORKDIR /oh_web
+RUN git clone https://github.com/${GITHUB_ORG}/openhospital-core.git --depth=1 -b ${OH_CORE_BRANCH}
+WORKDIR ./openhospital-core
+RUN mvn clean install -DskipTests=true
+WORKDIR /oh_web
+RUN git clone https://github.com/${GITHUB_ORG}/openhospital-api.git  --depth=1 -b ${OH_API_BRANCH}
+WORKDIR ./openhospital-api
+# Database connection must be changed in order to work in docker network
+RUN sed -i 's/localhost/database/g' src/main/resources/database.properties
+RUN mvn clean install -DskipTests=true
+
+CMD mvn spring-boot:run
\ No newline at end of file
diff --git a/Dockerfile.database b/Dockerfile.database
new file mode 100644
index 000000000..95ff4ac40
--- /dev/null
+++ b/Dockerfile.database
@@ -0,0 +1,18 @@
+FROM mysql:5.7.9
+
+ARG GITHUB_ORG
+ARG OH_CORE_BRANCH
+
+ENV MYSQL_DATABASE=oh
+ENV MYSQL_ROOT_PASSWORD=root
+ENV MYSQL_USER=isf
+ENV MYSQL_PASSWORD=isf123
+
+RUN mkdir /oh_web
+RUN apt-get update
+RUN apt-get install -y git
+WORKDIR /oh_web
+RUN git clone https://github.com/${GITHUB_ORG}/openhospital-core.git --depth=1 -b ${OH_CORE_BRANCH}
+WORKDIR ./openhospital-core
+
+EXPOSE 3306
\ No newline at end of file
diff --git a/README.md b/README.md
index 6a2dd3368..f1c6ebb4d 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,21 @@ For the moment, to build this project you should
 
 Service available on localhost:8080
 
+## How to deploy backend in docker environment
+
+Make sure you have docker with docker-compose installed, then run the following commands:
+
+    - DOCKER_BUILDKIT=0 docker-compose build [--no-cache]
+    - docker-compose up
+    - docker-compose  exec database /bin/bash
+    - cd sql/
+    - mysql -u isf -p
+    - source create_all_demo.sql;
+
+When done successfully, head over at http://localhost:[API_PORT]/oh-api/swagger-ui.html
+
+You can change the deployment branch and the repository organization in the .env file.
+
 ## How to contribute
 
 You can find the contribution guidelines in the [Open Hospital wiki][contribution-guide].  
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..e30a4df2c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,40 @@
+version: '3.8'
+services:
+  database:
+    container_name: database
+    restart: always
+    command: --lower_case_table_names=1
+    environment:
+      - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}"
+      - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
+      - "MYSQL_USER=${MYSQL_USER}"
+      - "MYSQL_DATABASE=${MYSQL_DATABASE}"
+    build:
+       context: .
+       dockerfile: Dockerfile.database
+       args:
+        OH_CORE_BRANCH: ${OH_CORE_BRANCH}
+        GITHUB_ORG: ${GITHUB_ORG}
+    ports:
+      - "${MYSQL_PORT}:3306"
+  backend:
+    container_name: backend
+    build:
+       context: .
+       dockerfile: Dockerfile.backend
+       args:
+        API_VERSION: ${API_VERSION}
+        OH_CORE_BRANCH: ${OH_CORE_BRANCH}
+        OH_API_BRANCH: ${OH_API_BRANCH}
+        GITHUB_ORG: ${GITHUB_ORG}
+    restart: always
+    ports:
+      - "${API_PORT}:8080"
+    depends_on:
+      - database
+    logging:
+        driver: "json-file"
+        options:
+            max-size: "100m"
+            max-file: "10"
+  
diff --git a/pom.xml b/pom.xml
index 05a5adf40..8d864df85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.22.RELEASE</version>
+        <version>2.6.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.isf</groupId>
@@ -16,6 +16,7 @@
 
     <properties>
         <oh.version>2.0.0</oh.version>
+        <oh-core.version>1.12.0-SNAPSHOT</oh-core.version>
         <java.version>1.8</java.version>
         <spring-boot-admin.version>2.1.3</spring-boot-admin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -37,6 +38,11 @@
 		        </exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+        	<groupId>commons-logging</groupId>
+        	<artifactId>commons-logging</artifactId>
+        	<version>1.1.1</version>
+        </dependency>
 		<!-- <dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -73,10 +79,21 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>7.0.4.Final</version>
+        </dependency>
 		<dependency>
 			<groupId>org.isf</groupId>
 			<artifactId>OH-core</artifactId>
-			<version>${oh.version}</version>
+			<version>${oh-core.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.hibernate.javax.persistence</groupId>
@@ -91,7 +108,7 @@
         <dependency>
             <groupId>org.isf</groupId>
             <artifactId>OH-core</artifactId>
-            <version>${oh.version}</version>
+            <version>${oh-core.version}</version>
             <classifier>tests</classifier>
             <type>test-jar</type>
             <scope>test</scope>
@@ -143,6 +160,16 @@
     		<artifactId>java-jwt</artifactId>
     		<version>3.18.2</version>
 	</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/org/isf/accounting/rest/BillController.java b/src/main/java/org/isf/accounting/rest/BillController.java
index 00add790a..a1a053698 100644
--- a/src/main/java/org/isf/accounting/rest/BillController.java
+++ b/src/main/java/org/isf/accounting/rest/BillController.java
@@ -21,6 +21,8 @@
  */
 package org.isf.accounting.rest;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -209,25 +211,30 @@ public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value = "datefrom
 			@RequestParam(value = "dateto") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo,
 			@RequestParam(value = "patient_code", required = false, defaultValue = "") Integer code) throws OHServiceException {
 
-		GregorianCalendar datefrom = new GregorianCalendar();
-		datefrom.setTime(dateFrom);
-
-		GregorianCalendar dateto = new GregorianCalendar();
-		dateto.setTime(dateTo);
+		
+		LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
 
 		List<Bill> bills;
 
 		List<BillDTO> billDTOS;
 
 		if (code == null) {
-			LOGGER.info("Get payments datefrom: {}  dateTo: {}", datefrom, dateto);
-			bills = billManager.getBills(datefrom, dateto);
+			LOGGER.info("Get payments datefrom: {}  dateTo: {}", dateF, dateT);
+			bills = billManager.getBills(dateF, dateT);
 		} else {
 			Patient pat = patientManager.getPatientById(code);
 
-			LOGGER.info("Get Bills datefrom: {}  dateTo: {} patient: {}", datefrom, dateto, pat);
+			LOGGER.info("Get Bills datefrom: {}  dateTo: {} patient: {}", dateF, dateT, pat);
 
-			bills = billManager.getBills(datefrom, dateto, pat);
+			bills = billManager.getBills(dateF, dateT, pat);
 		}
 
 		billDTOS = billMapper.map2DTOList(bills);
@@ -257,19 +264,23 @@ public ResponseEntity<List<BillPaymentsDTO>> searchBillsPayments(
         
         List<BillPaymentsDTO> paymentsDTOS;
         
-        GregorianCalendar datefrom = new GregorianCalendar();
-        datefrom.setTime(dateFrom);
-        
-        GregorianCalendar dateto = new GregorianCalendar();
-        dateto.setTime(dateTo);
+        LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
 
-		LOGGER.info("Get getPayments datefrom: {}  dateTo: {}", datefrom, dateto);
+		LOGGER.info("Get getPayments datefrom: {}  dateTo: {}", dateF, dateT);
         
         if (code == null) {
-        	payments = billManager.getPayments(datefrom, dateto);
+        	payments = billManager.getPayments(dateF, dateT);
         } else {
         	 Patient pat = patientManager.getPatientById(code);             
-             payments = billManager.getPayments(datefrom, dateto, pat);
+             payments = billManager.getPayments(dateF, dateT, pat);
         }
         
         paymentsDTOS = billPaymentsMapper.map2DTOList(payments);
@@ -401,17 +412,21 @@ public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value="datefrom")
 			@RequestParam(value="dateto")@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo,
 			@RequestBody BillItemsDTO billItemDTO) throws OHServiceException {
         
-        GregorianCalendar datefrom = new GregorianCalendar();
-        datefrom.setTime(dateFrom);
-        
-        GregorianCalendar dateto = new GregorianCalendar();
-        dateto.setTime(dateTo);
+		LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
                
         BillItems billItem = billItemsMapper.map2Model(billItemDTO);
 
-		LOGGER.info("Get Bills datefrom: {}  dateTo: {}  Bill ITEM ID: {}", datefrom, dateto, billItem.getId());
+		LOGGER.info("Get Bills datefrom: {}  dateTo: {}  Bill ITEM ID: {}", dateF, dateT, billItem.getId());
 
-		List<Bill> bills = billManager.getBills(datefrom, dateto, billItem);
+		List<Bill> bills = billManager.getBills(dateF, dateT, billItem);
         
         List<BillDTO> billDTOS = billMapper.map2DTOList(bills);
         
diff --git a/src/main/java/org/isf/admission/dto/AdmissionDTO.java b/src/main/java/org/isf/admission/dto/AdmissionDTO.java
index e7ada0fdc..6580f8d94 100644
--- a/src/main/java/org/isf/admission/dto/AdmissionDTO.java
+++ b/src/main/java/org/isf/admission/dto/AdmissionDTO.java
@@ -147,7 +147,6 @@ public class AdmissionDTO {
 	@ApiModelProperty(notes = "lock", example = "0", position = 31)
 	private int lock;
 
-	@NotNull
 	@ApiModelProperty(notes = "flag record deleted, values are 'Y' OR 'N' ", example = "N", position = 32)
 	private String deleted;
 
diff --git a/src/main/java/org/isf/admission/rest/AdmissionController.java b/src/main/java/org/isf/admission/rest/AdmissionController.java
index e35636db3..be09fe07c 100644
--- a/src/main/java/org/isf/admission/rest/AdmissionController.java
+++ b/src/main/java/org/isf/admission/rest/AdmissionController.java
@@ -21,6 +21,10 @@
  */
 package org.isf.admission.rest;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -55,6 +59,8 @@
 import org.isf.utils.exception.OHServiceException;
 import org.isf.utils.exception.model.OHExceptionMessage;
 import org.isf.utils.exception.model.OHSeverityLevel;
+import org.isf.visits.dto.VisitDTO;
+import org.isf.visits.model.Visit;
 import org.isf.ward.manager.WardBrowserManager;
 import org.isf.ward.model.Ward;
 import org.slf4j.Logger;
@@ -63,14 +69,17 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.annotations.Api;
@@ -104,11 +113,11 @@ public class AdmissionController {
 
 	@Autowired
 	private DeliveryResultTypeBrowserManager dlvrrestTypeManager;
-	
+
 	@Autowired
 	private AdmissionMapper admissionMapper;
-	
-	@Autowired 
+
+	@Autowired
 	private AdmittedPatientMapper admittedMapper;
 	@Autowired
 	private DischargeTypeBrowserManager dischargeManager;
@@ -135,6 +144,7 @@ public AdmissionController(AdmissionBrowserManager admissionManager, PatientBrow
 		this.dischargeManager = dischargeManager;
 		this.dischargeMapper = dischargeMapper;
 	}
+
 	/**
 	 * Get {@link Admission} for the specified id.
 	 * 
@@ -142,10 +152,10 @@ public AdmissionController(AdmissionBrowserManager admissionManager, PatientBrow
 	 * @return the {@link Admission} found or NO_CONTENT otherwise.
 	 * @throws OHServiceException
 	 */
-	@GetMapping(value = "/admissions/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<AdmissionDTO> getAdmissions(@PathVariable int id) throws OHServiceException {
-		LOGGER.info("Get admission by id: {}", id);
-		Admission admission = admissionManager.getAdmission(id);
+	@GetMapping(value = "/admissions/{patientCode}", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<AdmissionDTO> getAdmissions(@PathVariable int patientCode) throws OHServiceException {
+		LOGGER.info("Get admission by id: {}", patientCode);
+		Admission admission = admissionManager.getAdmission(patientCode);
 		if (admission == null) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
 		}
@@ -162,7 +172,7 @@ public ResponseEntity<AdmissionDTO> getAdmissions(@PathVariable int id) throws O
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/admissions/current", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<AdmissionDTO> getCurrentAdmission(@RequestParam("patientcode") Integer patientCode)
+	public ResponseEntity<AdmissionDTO> getCurrentAdmission(@RequestParam("patientCode") int patientCode)
 			throws OHServiceException {
 		LOGGER.info("Get admission by patient code: {}", patientCode);
 		Patient patient = patientManager.getPatientById(patientCode);
@@ -173,11 +183,16 @@ public ResponseEntity<AdmissionDTO> getCurrentAdmission(@RequestParam("patientco
 		if (admission == null) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
 		}
-		return ResponseEntity.ok(admissionMapper.map2DTO(admission));
+		AdmissionDTO admDTO = admissionMapper.map2DTO(admission);
+		Instant instant = admission.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date = Date.from(instant);
+		admDTO.setAdmDate(date);
+		return ResponseEntity.ok(admDTO);
 	}
 
 	/**
 	 * Get all admitted {@link Patient}s based on the applied filters.
+	 * 
 	 * @param searchTerms
 	 * @param admissionRange
 	 * @param dischargeRange
@@ -191,41 +206,40 @@ public ResponseEntity<List<AdmittedPatientDTO>> getAdmittedPatients(
 			@RequestParam(name = "dischargerange", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date[] dischargeRange)
 			throws OHServiceException {
 		LOGGER.info("Get admitted patients search terms: {}", searchTerms);
-		GregorianCalendar[] admissionR = new GregorianCalendar[admissionRange.length];
-		GregorianCalendar[] dischargeR = new GregorianCalendar[admissionRange.length];
+		LocalDateTime[] admissionR = new LocalDateTime[admissionRange.length];
+		LocalDateTime[] dischargeR = new LocalDateTime[admissionRange.length];
 		int i = 0;
-		for(Date date :admissionRange) {
-			GregorianCalendar datep = new GregorianCalendar();
-			datep.setTime(date);
-			admissionR[i]=datep;
+		for (Date date : admissionRange) {
+			LocalDateTime dateR = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+			admissionR[i] = dateR;
 			i++;
 		}
-		
+
 		int j = 0;
-		for(Date date :dischargeRange) {
-			GregorianCalendar dated = new GregorianCalendar();
-			dated.setTime(date);
-			dischargeR[j]=dated;
+		for (Date date : dischargeRange) {
+			LocalDateTime dateD = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+			dischargeR[j] = dateD;
 			j++;
 		}
-		
-		List<AdmittedPatient> admittedPatients = admissionManager
-				.getAdmittedPatients(admissionR, dischargeR, searchTerms);
+
+		List<AdmittedPatient> admittedPatients = admissionManager.getAdmittedPatients(admissionR, dischargeR,
+				searchTerms);
 		if (admittedPatients.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
 		}
-		
+
 		return ResponseEntity.ok(admittedMapper.map2DTOList(admittedPatients));
 	}
 
 	/**
 	 * Get all the {@link Admission}s for the specified {@link Patient} code.
+	 * 
 	 * @param patientCode
 	 * @return the {@link List} of found {@link Admission} or NO_CONTENT otherwise.
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/admissions", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<AdmissionDTO>> getPatientAdmissions(@RequestParam("patientcode") Integer patientCode)
+	public ResponseEntity<List<AdmissionDTO>> getPatientAdmissions(@RequestParam("patientCode") int patientCode)
 			throws OHServiceException {
 		LOGGER.info("Get patient admissions by patient code: {}", patientCode);
 		Patient patient = patientManager.getPatientById(patientCode);
@@ -237,29 +251,46 @@ public ResponseEntity<List<AdmissionDTO>> getPatientAdmissions(@RequestParam("pa
 		if (admissions.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
 		}
-		return ResponseEntity.ok(admissionMapper.map2DTOList(admissions));
+		List<AdmissionDTO> listAdmission = new ArrayList<AdmissionDTO>();
+		for (Admission adm : admissions) {
+			AdmissionDTO admission = admissionMapper.map2DTO(adm);
+			Instant instant = adm.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+			Date date = (Date) Date.from(instant);
+			admission.setAdmDate(date);
+
+			if (adm.getDisDate() != null) {
+				Instant instant1 = adm.getDisDate().atZone(ZoneId.systemDefault()).toInstant();
+				Date date1 = (Date) Date.from(instant1);
+				admission.setDisDate(date1);
+			}
+			listAdmission.add(admission);
+		}
+
+		return ResponseEntity.ok(listAdmission);
 	}
 
 	/**
 	 * Get the next prog in the year for specified {@link Ward} code.
+	 * 
 	 * @param wardCode
 	 * @return the next prog.
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/admissions/getNextProgressiveIdInYear", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Integer> getNextYProg(@RequestParam("wardcode") String wardCode)
-			throws OHServiceException {
+	public ResponseEntity<Integer> getNextYProg(@RequestParam("wardcode") String wardCode) throws OHServiceException {
 		LOGGER.info("get the next prog in the year for ward code: {}", wardCode);
-		
+
 		if (wardCode.trim().isEmpty() || !wardManager.isCodePresent(wardCode)) {
-			throw new OHAPIException(new OHExceptionMessage(null, "Ward not found for code:" + wardCode, OHSeverityLevel.ERROR));
+			throw new OHAPIException(
+					new OHExceptionMessage(null, "Ward not found for code:" + wardCode, OHSeverityLevel.ERROR));
 		}
-		
+
 		return ResponseEntity.ok(admissionManager.getNextYProg(wardCode));
 	}
-	
+
 	/**
 	 * Get the number of used beds for the specified {@link Ward} code.
+	 * 
 	 * @param wardCode
 	 * @return the number of used beds.
 	 * @throws OHServiceException
@@ -269,14 +300,16 @@ public ResponseEntity<Integer> getUsedWardBed(@RequestParam("wardid") String war
 		LOGGER.info("Counts the number of used bed for ward code: {}", wardCode);
 
 		if (wardCode.trim().isEmpty() || !wardManager.isCodePresent(wardCode)) {
-			throw new OHAPIException( new OHExceptionMessage(null, "Ward not found for code:" + wardCode, OHSeverityLevel.ERROR));
+			throw new OHAPIException(
+					new OHExceptionMessage(null, "Ward not found for code:" + wardCode, OHSeverityLevel.ERROR));
 		}
 
 		return ResponseEntity.ok(admissionManager.getUsedWardBed(wardCode));
 	}
-	
+
 	/**
 	 * Set an {@link Admission} record to deleted.
+	 * 
 	 * @param id
 	 * @return <code>true</code> if the record has been set to delete.
 	 * @throws OHServiceException
@@ -294,6 +327,7 @@ public ResponseEntity<Boolean> deleteAdmissionType(@PathVariable int id) throws
 
 		return ResponseEntity.ok(isDeleted);
 	}
+
 	/**
 	 * discharge the {@link Admission}s for the specified {@link Patient} code.
 	 * 
@@ -307,10 +341,10 @@ public ResponseEntity<Boolean> dischargePatient(@RequestParam("patientCode") int
 
 		LOGGER.info("discharge the patient");
 		Patient patient = patientManager.getPatientById(patientCode);
-		Boolean bol = false;
+		boolean bol = false;
 
 		if (patient == null)
-			return ResponseEntity.status(HttpStatus.NOT_FOUND).body(bol);
+			return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
 
 		Admission admission = admissionManager.getCurrentAdmission(patient);
 
@@ -318,40 +352,64 @@ public ResponseEntity<Boolean> dischargePatient(@RequestParam("patientCode") int
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
 
 		Admission adm = admissionMapper.map2Model(currentAdmissionDTO);
+		adm.setAdmDate(currentAdmissionDTO.getAdmDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 
 		if (adm == null || admission.getId() != adm.getId())
-			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(bol);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
 
 		if (adm.getDiseaseOut1() == null) {
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "at least one disease must be give!", OHSeverityLevel.ERROR));
 		}
+		adm.setDisDate(currentAdmissionDTO.getDisDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 		if (adm.getDisDate() == null) {
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "the exit date must be filled in!", OHSeverityLevel.ERROR));
 		}
-		if (adm.getDisType() == null || !dischargeManager.isCodePresent(adm.getDisType().getCode())) {
+		if (adm.getDisDate() == null || !dischargeManager.isCodePresent(adm.getDisType().getCode())) {
 			throw new OHAPIException(new OHExceptionMessage(null, "the type of output is mandatory or does not exist!",
 					OHSeverityLevel.ERROR));
 		}
 		adm.setAdmitted(0);
-		bol = admissionManager.updateAdmission(adm);
+		if (admissionManager.updateAdmission(adm) != null) {
+
+			bol = true;
+		}
 
 		return ResponseEntity.status(HttpStatus.OK).body(bol);
 	}
 
 	/**
 	 * Create a new {@link Admission}.
+	 * 
 	 * @param newAdmissionDTO
-	 * @return the generated id or <code>null</code> for the created {@link Admission}.
+	 * @return the generated id or <code>null</code> for the created
+	 *         {@link Admission}.
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/admissions", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmissionDTO)
+	ResponseEntity<AdmissionDTO> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmissionDTO)
 			throws OHServiceException {
 
 		Admission newAdmission = admissionMapper.map2Model(newAdmissionDTO);
-
+		newAdmission
+				.setAdmDate(newAdmissionDTO.getAdmDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		if (newAdmissionDTO.getAbortDate() != null) {
+			newAdmission.setAbortDate(
+					newAdmissionDTO.getAbortDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		}
+		if (newAdmissionDTO.getCtrlDate1() != null) {
+			newAdmission.setCtrlDate1(
+					newAdmissionDTO.getCtrlDate1().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		}
+		if (newAdmissionDTO.getCtrlDate2() != null) {
+			newAdmission.setCtrlDate2(
+					newAdmissionDTO.getCtrlDate2().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		}
+		if (newAdmissionDTO.getOpDate() != null) {
+			newAdmission.setOpDate(
+					newAdmissionDTO.getOpDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		}
 		if (newAdmissionDTO.getWard() != null && newAdmissionDTO.getWard().getCode() != null
 				&& !newAdmissionDTO.getWard().getCode().trim().isEmpty()) {
 			List<Ward> wards = wardManager.getWards().stream()
@@ -388,52 +446,49 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 		} else {
 			throw new OHAPIException(new OHExceptionMessage(null, "Patient field is required!", OHSeverityLevel.ERROR));
 		}
-		List<Disease> diseases = null;
+		Disease diseases = null;
 		if (newAdmissionDTO.getDiseaseIn() != null && newAdmissionDTO.getDiseaseIn().getCode() != null) {
-			diseases = diseaseManager.getDisease();
-			List<Disease> dIns = diseases.stream()
-					.filter(d -> d.getCode().equals(newAdmissionDTO.getDiseaseIn().getCode()))
-					.collect(Collectors.toList());
-			if (dIns.isEmpty()) {
+			diseases = diseaseManager.getDiseaseByCode(newAdmissionDTO.getDiseaseIn().getCode());
+
+			if (diseases == null) {
 				throw new OHAPIException(new OHExceptionMessage(null, "Disease in not found!", OHSeverityLevel.ERROR));
 			}
-			newAdmission.setDiseaseIn(dIns.get(0));
-		} 
-		
+			newAdmission.setDiseaseIn(diseases);
+		}
+
 		if (newAdmissionDTO.getDiseaseOut1() != null && newAdmissionDTO.getDiseaseOut1().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut1s = diseases.stream()
-					.filter(d -> d.getCode().equals(newAdmissionDTO.getDiseaseOut1().getCode()))
-					.collect(Collectors.toList());
-			if (dOut1s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(newAdmissionDTO.getDiseaseOut1().getCode());
+
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
 			}
-			newAdmission.setDiseaseOut1(dOut1s.get(0));
-		} 
-		
+			newAdmission.setDiseaseOut1(diseases);
+		}
+
 		if (newAdmissionDTO.getDiseaseOut2() != null && newAdmissionDTO.getDiseaseOut2().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut2s = diseases.stream()
-					.filter(d -> d.getCode().equals(newAdmissionDTO.getDiseaseOut2().getCode()))
-					.collect(Collectors.toList());
-			if (dOut2s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 2 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(newAdmissionDTO.getDiseaseOut2().getCode());
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 2 not found!", OHSeverityLevel.ERROR));
 			}
-			newAdmission.setDiseaseOut2(dOut2s.get(0));
-		} 
-		
+			newAdmission.setDiseaseOut2(diseases);
+		}
+
 		if (newAdmissionDTO.getDiseaseOut3() != null && newAdmissionDTO.getDiseaseOut3().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut3s = diseases.stream()
-					.filter(d -> d.getCode().equals(newAdmissionDTO.getDiseaseOut3().getCode()))
-					.collect(Collectors.toList());
-			if (dOut3s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 3 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(newAdmissionDTO.getDiseaseOut3().getCode());
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 3 not found!", OHSeverityLevel.ERROR));
 			}
-			newAdmission.setDiseaseOut3(dOut3s.get(0));
-		} 
-	
-		if (newAdmissionDTO.getOperation() != null && newAdmissionDTO.getOperation().getCode() != null && !newAdmissionDTO.getOperation().getCode().trim().isEmpty()) {
+			newAdmission.setDiseaseOut3(diseases);
+		}
+
+		if (newAdmissionDTO.getOperation() != null && newAdmissionDTO.getOperation().getCode() != null
+				&& !newAdmissionDTO.getOperation().getCode().trim().isEmpty()) {
 			List<Operation> operations = operationManager.getOperation();
 			List<Operation> opFounds = operations.stream()
 					.filter(op -> op.getCode().equals(newAdmissionDTO.getOperation().getCode()))
@@ -444,7 +499,8 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 			newAdmission.setOperation(opFounds.get(0));
 		}
 
-		if (newAdmissionDTO.getDisType() != null && newAdmissionDTO.getDisType().getCode() != null && !newAdmissionDTO.getDisType().getCode().trim().isEmpty()) {
+		if (newAdmissionDTO.getDisType() != null && newAdmissionDTO.getDisType().getCode() != null
+				&& !newAdmissionDTO.getDisType().getCode().trim().isEmpty()) {
 			List<DischargeType> disTypes = admissionManager.getDischargeType();
 			List<DischargeType> disTypesF = disTypes.stream()
 					.filter(dtp -> dtp.getCode().equals(newAdmissionDTO.getDisType().getCode()))
@@ -456,7 +512,8 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 			newAdmission.setDisType(disTypesF.get(0));
 		}
 
-		if (newAdmissionDTO.getPregTreatmentType() != null && newAdmissionDTO.getPregTreatmentType().getCode() != null && !newAdmissionDTO.getPregTreatmentType().getCode().trim().isEmpty()) {
+		if (newAdmissionDTO.getPregTreatmentType() != null && newAdmissionDTO.getPregTreatmentType().getCode() != null
+				&& !newAdmissionDTO.getPregTreatmentType().getCode().trim().isEmpty()) {
 			List<PregnantTreatmentType> pregTTypes = pregTraitTypeManager.getPregnantTreatmentType();
 			List<PregnantTreatmentType> pregTTypesF = pregTTypes.stream()
 					.filter(pregtt -> pregtt.getCode().equals(newAdmissionDTO.getPregTreatmentType().getCode()))
@@ -468,7 +525,8 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 			newAdmission.setPregTreatmentType(pregTTypesF.get(0));
 		}
 
-		if (newAdmissionDTO.getDeliveryType() != null && newAdmissionDTO.getDeliveryType().getCode() != null && !newAdmissionDTO.getDeliveryType().getCode().trim().isEmpty()) {
+		if (newAdmissionDTO.getDeliveryType() != null && newAdmissionDTO.getDeliveryType().getCode() != null
+				&& !newAdmissionDTO.getDeliveryType().getCode().trim().isEmpty()) {
 			List<DeliveryType> dlvrTypes = dlvrTypeManager.getDeliveryType();
 			List<DeliveryType> dlvrTypesF = dlvrTypes.stream()
 					.filter(dlvrType -> dlvrType.getCode().equals(newAdmissionDTO.getDeliveryType().getCode()))
@@ -480,10 +538,11 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 			newAdmission.setDeliveryType(dlvrTypesF.get(0));
 		}
 
-		if (newAdmissionDTO.getDeliveryResult() != null && newAdmissionDTO.getDeliveryResult().getCode() != null && !newAdmissionDTO.getDeliveryResult().getCode().trim().isEmpty()) {
+		if (newAdmissionDTO.getDeliveryResult() != null && newAdmissionDTO.getDeliveryResult().getCode() != null
+				&& !newAdmissionDTO.getDeliveryResult().getCode().trim().isEmpty()) {
 			List<DeliveryResultType> dlvrrestTypes = dlvrrestTypeManager.getDeliveryResultType();
-			List<DeliveryResultType> dlvrrestTypesF = dlvrrestTypes.stream()
-					.filter(dlvrrestType -> dlvrrestType.getCode().equals(newAdmissionDTO.getDeliveryResult().getCode()))
+			List<DeliveryResultType> dlvrrestTypesF = dlvrrestTypes.stream().filter(
+					dlvrrestType -> dlvrrestType.getCode().equals(newAdmissionDTO.getDeliveryResult().getCode()))
 					.collect(Collectors.toList());
 			if (dlvrrestTypesF.isEmpty()) {
 				throw new OHAPIException(
@@ -496,27 +555,40 @@ ResponseEntity<Integer> newAdmissions(@Valid @RequestBody AdmissionDTO newAdmiss
 				? newAdmission.getPatient().getFirstName() + " " + newAdmission.getPatient().getSecondName()
 				: newAdmission.getPatient().getName();
 		LOGGER.info("Create admission for patient {}", name);
-		int aId = admissionManager.newAdmissionReturnKey(newAdmission);
-		if (aId > 0) {
-			return ResponseEntity.status(HttpStatus.CREATED).body(aId);
+		Admission ad = admissionManager.newAdmission(newAdmission);
+		if (ad == null) {
+			throw new OHAPIException(new OHExceptionMessage(null, "Admission is not created!", OHSeverityLevel.ERROR));
 		}
-		throw new OHAPIException(new OHExceptionMessage(null, "Admission is not created!", OHSeverityLevel.ERROR));
+		AdmissionDTO admDTO = admissionMapper.map2DTO(ad);
+		Instant instant = ad.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date = Date.from(instant);
+		admDTO.setAdmDate(date);
+		return ResponseEntity.status(HttpStatus.CREATED).body(admDTO);
+	}
+
+	@ExceptionHandler
+	@ResponseStatus(HttpStatus.BAD_REQUEST)
+	public void handle(HttpMessageNotReadableException e) {
+		e.printStackTrace();
 	}
 
 	/**
 	 * Updates the specified {@link Admission} object.
+	 * 
 	 * @param updAdmissionDTO
 	 * @return <code>true</code> if has been updated, <code>false</code> otherwise.
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/admissions", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionDTO) throws OHServiceException {
-		
+	ResponseEntity<AdmissionDTO> updateAdmissions(@RequestBody AdmissionDTO updAdmissionDTO) throws OHServiceException {
+
 		Admission old = admissionManager.getAdmission(updAdmissionDTO.getId());
 		if (old == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "Admission not found!", OHSeverityLevel.ERROR));
 		}
 		Admission updAdmission = admissionMapper.map2Model(updAdmissionDTO);
+		updAdmission
+				.setAdmDate(updAdmissionDTO.getAdmDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 
 		if (updAdmissionDTO.getWard() != null && updAdmissionDTO.getWard().getCode() != null
 				&& !updAdmissionDTO.getWard().getCode().trim().isEmpty()) {
@@ -554,52 +626,51 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 		} else {
 			throw new OHAPIException(new OHExceptionMessage(null, "Patient field is required!", OHSeverityLevel.ERROR));
 		}
-		List<Disease> diseases = null;
-		if (updAdmissionDTO.getDiseaseIn() != null && updAdmissionDTO.getDiseaseIn().getCode() != null ) {
-			diseases = diseaseManager.getDisease();
-			List<Disease> dIns = diseases.stream()
-					.filter(d -> d.getCode().equals(updAdmissionDTO.getDiseaseIn().getCode()))
-					.collect(Collectors.toList());
-			if (dIns.isEmpty()) {
+		Disease diseases = null;
+		if (updAdmissionDTO.getDiseaseIn() != null && updAdmissionDTO.getDiseaseIn().getCode() != null) {
+			diseases = diseaseManager.getDiseaseByCode(updAdmissionDTO.getDiseaseIn().getCode());
+
+			if (diseases == null) {
 				throw new OHAPIException(new OHExceptionMessage(null, "Disease in not found!", OHSeverityLevel.ERROR));
 			}
-			updAdmission.setDiseaseIn(dIns.get(0));
-		} 
-		
+			updAdmission.setDiseaseIn(diseases);
+		}
+
 		if (updAdmissionDTO.getDiseaseOut1() != null && updAdmissionDTO.getDiseaseOut1().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut1s = diseases.stream()
-					.filter(d -> d.getCode().equals(updAdmissionDTO.getDiseaseOut1().getCode()))
-					.collect(Collectors.toList());
-			if (dOut1s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(updAdmissionDTO.getDiseaseOut1().getCode());
+
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
 			}
-			updAdmission.setDiseaseOut1(dOut1s.get(0));
-		} 
-		
+			updAdmission.setDiseaseOut1(diseases);
+		}
+
 		if (updAdmissionDTO.getDiseaseOut2() != null && updAdmissionDTO.getDiseaseOut2().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut2s = diseases.stream()
-					.filter(d -> d.getCode().equals(updAdmissionDTO.getDiseaseOut2().getCode()) )
-					.collect(Collectors.toList());
-			if (dOut2s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 2 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(updAdmissionDTO.getDiseaseOut2().getCode());
+
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
 			}
-			updAdmission.setDiseaseOut2(dOut2s.get(0));
-		} 
-		
+			updAdmission.setDiseaseOut2(diseases);
+		}
+
 		if (updAdmissionDTO.getDiseaseOut3() != null && updAdmissionDTO.getDiseaseOut3().getCode() != null) {
-			if (diseases == null) diseases = diseaseManager.getDisease();
-			List<Disease> dOut3s = diseases.stream()
-					.filter(d -> d.getCode().equals(updAdmissionDTO.getDiseaseOut3().getCode()))
-					.collect(Collectors.toList());
-			if (dOut3s.isEmpty()) {
-				throw new OHAPIException(new OHExceptionMessage(null, "Disease out 3 not found!", OHSeverityLevel.ERROR));
+			if (diseases == null)
+				diseases = diseaseManager.getDiseaseByCode(updAdmissionDTO.getDiseaseOut2().getCode());
+
+			if (diseases == null) {
+				throw new OHAPIException(
+						new OHExceptionMessage(null, "Disease out 1 not found!", OHSeverityLevel.ERROR));
 			}
-			updAdmission.setDiseaseOut3(dOut3s.get(0));
-		} 
-	
-		if (updAdmissionDTO.getOperation() != null && updAdmissionDTO.getOperation().getCode() != null && !updAdmissionDTO.getOperation().getCode().trim().isEmpty()) {
+			updAdmission.setDiseaseOut3(diseases);
+		}
+
+		if (updAdmissionDTO.getOperation() != null && updAdmissionDTO.getOperation().getCode() != null
+				&& !updAdmissionDTO.getOperation().getCode().trim().isEmpty()) {
 			List<Operation> operations = operationManager.getOperation();
 			List<Operation> opFounds = operations.stream()
 					.filter(op -> op.getCode().equals(updAdmissionDTO.getOperation().getCode()))
@@ -610,7 +681,8 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 			updAdmission.setOperation(opFounds.get(0));
 		}
 
-		if (updAdmissionDTO.getDisType() != null && updAdmissionDTO.getDisType().getCode() != null && !updAdmissionDTO.getDisType().getCode().trim().isEmpty()) {
+		if (updAdmissionDTO.getDisType() != null && updAdmissionDTO.getDisType().getCode() != null
+				&& !updAdmissionDTO.getDisType().getCode().trim().isEmpty()) {
 			List<DischargeType> disTypes = admissionManager.getDischargeType();
 			List<DischargeType> disTypesF = disTypes.stream()
 					.filter(dtp -> dtp.getCode().equals(updAdmissionDTO.getDisType().getCode()))
@@ -622,7 +694,8 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 			updAdmission.setDisType(disTypesF.get(0));
 		}
 
-		if (updAdmissionDTO.getPregTreatmentType() != null && updAdmissionDTO.getPregTreatmentType().getCode() != null && !updAdmissionDTO.getPregTreatmentType().getCode().trim().isEmpty()) {
+		if (updAdmissionDTO.getPregTreatmentType() != null && updAdmissionDTO.getPregTreatmentType().getCode() != null
+				&& !updAdmissionDTO.getPregTreatmentType().getCode().trim().isEmpty()) {
 			List<PregnantTreatmentType> pregTTypes = pregTraitTypeManager.getPregnantTreatmentType();
 			List<PregnantTreatmentType> pregTTypesF = pregTTypes.stream()
 					.filter(pregtt -> pregtt.getCode().equals(updAdmissionDTO.getPregTreatmentType().getCode()))
@@ -634,7 +707,8 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 			updAdmission.setPregTreatmentType(pregTTypesF.get(0));
 		}
 
-		if (updAdmissionDTO.getDeliveryType() != null && updAdmissionDTO.getDeliveryType().getCode() != null && !updAdmissionDTO.getDeliveryType().getCode().trim().isEmpty()) {
+		if (updAdmissionDTO.getDeliveryType() != null && updAdmissionDTO.getDeliveryType().getCode() != null
+				&& !updAdmissionDTO.getDeliveryType().getCode().trim().isEmpty()) {
 			List<DeliveryType> dlvrTypes = dlvrTypeManager.getDeliveryType();
 			List<DeliveryType> dlvrTypesF = dlvrTypes.stream()
 					.filter(dlvrType -> dlvrType.getCode().equals(updAdmissionDTO.getDeliveryType().getCode()))
@@ -646,10 +720,11 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 			updAdmission.setDeliveryType(dlvrTypesF.get(0));
 		}
 
-		if (updAdmissionDTO.getDeliveryResult() != null && updAdmissionDTO.getDeliveryResult().getCode() != null && !updAdmissionDTO.getDeliveryResult().getCode().trim().isEmpty()) {
+		if (updAdmissionDTO.getDeliveryResult() != null && updAdmissionDTO.getDeliveryResult().getCode() != null
+				&& !updAdmissionDTO.getDeliveryResult().getCode().trim().isEmpty()) {
 			List<DeliveryResultType> dlvrrestTypes = dlvrrestTypeManager.getDeliveryResultType();
-			List<DeliveryResultType> dlvrrestTypesF = dlvrrestTypes.stream()
-					.filter(dlvrrestType -> dlvrrestType.getCode().equals(updAdmissionDTO.getDeliveryResult().getCode()))
+			List<DeliveryResultType> dlvrrestTypesF = dlvrrestTypes.stream().filter(
+					dlvrrestType -> dlvrrestType.getCode().equals(updAdmissionDTO.getDeliveryResult().getCode()))
 					.collect(Collectors.toList());
 			if (dlvrrestTypesF.isEmpty()) {
 				throw new OHAPIException(
@@ -662,12 +737,38 @@ ResponseEntity<Integer> updateAdmissions(@RequestBody AdmissionDTO updAdmissionD
 				? updAdmission.getPatient().getFirstName() + " " + updAdmission.getPatient().getSecondName()
 				: updAdmission.getPatient().getName();
 		LOGGER.info("update admission for patient {}", name);
-		boolean isUpdated = admissionManager.updateAdmission(updAdmission);
-		if (isUpdated) {
-			return ResponseEntity.ok(updAdmission.getId());
+		Admission isUpdated = admissionManager.updateAdmission(updAdmission);
+
+		if (isUpdated == null) {
+			throw new OHAPIException(new OHExceptionMessage(null, "Admission is not updated!", OHSeverityLevel.ERROR));
 		}
-		throw new OHAPIException(new OHExceptionMessage(null, "Admission is not updated!", OHSeverityLevel.ERROR));
-	}
 
+		AdmissionDTO admDTO = admissionMapper.map2DTO(isUpdated);
+		Instant instant = isUpdated.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date = Date.from(instant);
+		admDTO.setAdmDate(date);
+
+		if (admDTO.getAbortDate() != null) {
+			Instant instant1 = isUpdated.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+			Date date1 = Date.from(instant1);
+			admDTO.setAbortDate(date1);
+		}
+		if (admDTO.getCtrlDate1() != null) {
+			Instant instant2 = isUpdated.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+			Date date1 = Date.from(instant2);
+			admDTO.setAbortDate(date1);
+		}
+		if (admDTO.getCtrlDate2() != null) {
+			Instant instant3 = isUpdated.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+			Date date2 = Date.from(instant3);
+			admDTO.setAbortDate(date2);
+		}
+		if (admDTO.getOpDate() != null) {
+			Instant instant4 = isUpdated.getAdmDate().atZone(ZoneId.systemDefault()).toInstant();
+			Date date3 = Date.from(instant4);
+			admDTO.setAbortDate(date3);
+		}
+		return ResponseEntity.ok(admDTO);
+	}
 
 }
diff --git a/src/main/java/org/isf/admtype/rest/AdmissionTypeController.java b/src/main/java/org/isf/admtype/rest/AdmissionTypeController.java
index 16a6ad2f8..5ac327e9c 100644
--- a/src/main/java/org/isf/admtype/rest/AdmissionTypeController.java
+++ b/src/main/java/org/isf/admtype/rest/AdmissionTypeController.java
@@ -71,7 +71,7 @@ public AdmissionTypeController(AdmissionTypeBrowserManager admtManager, Admissio
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/admissiontypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newAdmissionType(@RequestBody AdmissionTypeDTO admissionTypeDTO) throws OHServiceException {
+	ResponseEntity<AdmissionTypeDTO> newAdmissionType(@RequestBody AdmissionTypeDTO admissionTypeDTO) throws OHServiceException {
 		String code = admissionTypeDTO.getCode();
 		LOGGER.info("Create Admission Type {}", code);
 		boolean isCreated = admtManager.newAdmissionType(mapper.map2Model(admissionTypeDTO));
@@ -86,7 +86,7 @@ ResponseEntity<String> newAdmissionType(@RequestBody AdmissionTypeDTO admissionT
 					new OHExceptionMessage(null, "Admission Type is not created!", OHSeverityLevel.ERROR),
 					HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(admtCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(admtCreated));
 	}
 
 	/**
@@ -96,7 +96,7 @@ ResponseEntity<String> newAdmissionType(@RequestBody AdmissionTypeDTO admissionT
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/admissiontypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateAdmissionTypet(@RequestBody AdmissionTypeDTO admissionTypeDTO)
+	ResponseEntity<AdmissionTypeDTO> updateAdmissionTypet(@RequestBody AdmissionTypeDTO admissionTypeDTO)
 			throws OHServiceException {
 		LOGGER.info("Update admissiontypes code: {}", admissionTypeDTO.getCode());
 		AdmissionType admt = mapper.map2Model(admissionTypeDTO);
@@ -107,7 +107,7 @@ ResponseEntity<String> updateAdmissionTypet(@RequestBody AdmissionTypeDTO admiss
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "Admission Type is not updated!", OHSeverityLevel.ERROR),
 					HttpStatus.INTERNAL_SERVER_ERROR);
-		return ResponseEntity.ok(admt.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(admt));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/config/SecurityConfig.java b/src/main/java/org/isf/config/SecurityConfig.java
index e8573d5ed..6d01c3f46 100644
--- a/src/main/java/org/isf/config/SecurityConfig.java
+++ b/src/main/java/org/isf/config/SecurityConfig.java
@@ -33,6 +33,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -87,6 +88,12 @@ public PasswordEncoder encoder() {
         return new BCryptPasswordEncoder();
     }
 
+	@Bean
+	@Override
+	public AuthenticationManager authenticationManagerBean() throws Exception {
+		return super.authenticationManagerBean();
+	}
+
     @Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
@@ -96,7 +103,7 @@ public CorsFilter corsFilter() {
         // config.setAllowedHeaders(Arrays.asList("Accept", "Accept-Encoding", "Accept-Language", "Authorization", "Content-Type", "Cache-Control", "Connection", "Cookie", "Host", "Pragma", "Referer, User-Agent"));
         config.setAllowedMethods(Arrays.asList("*"));
         // config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE"));
-        config.setAllowCredentials(true);
+        //config.setAllowCredentials(true);
         config.setAllowedOrigins(Arrays.asList("*"));
         config.setMaxAge(3600L);
         source.registerCorsConfiguration("/**", config);
diff --git a/src/main/java/org/isf/disctype/rest/DischargeTypeController.java b/src/main/java/org/isf/disctype/rest/DischargeTypeController.java
index 3e170da89..1ae4f4574 100644
--- a/src/main/java/org/isf/disctype/rest/DischargeTypeController.java
+++ b/src/main/java/org/isf/disctype/rest/DischargeTypeController.java
@@ -71,7 +71,7 @@ public DischargeTypeController(DischargeTypeBrowserManager discTypeManager, Disc
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/dischargetypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newDischargeType(@RequestBody DischargeTypeDTO dischTypeDTO) throws OHServiceException {
+	ResponseEntity<DischargeTypeDTO> newDischargeType(@RequestBody DischargeTypeDTO dischTypeDTO) throws OHServiceException {
 		String code = dischTypeDTO.getCode();
 		LOGGER.info("Create discharge type {}", code);
 		boolean isCreated = discTypeManager.newDischargeType(mapper.map2Model(dischTypeDTO));
@@ -85,7 +85,7 @@ ResponseEntity<String> newDischargeType(@RequestBody DischargeTypeDTO dischTypeD
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "discharge type is not created!", OHSeverityLevel.ERROR), HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(dischTypeCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(dischTypeCreated));
 	}
 
 	/**
@@ -95,7 +95,7 @@ ResponseEntity<String> newDischargeType(@RequestBody DischargeTypeDTO dischTypeD
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/dischargetypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateDischargeTypet(@RequestBody DischargeTypeDTO dischTypeDTO) throws OHServiceException {
+	ResponseEntity<DischargeTypeDTO> updateDischargeTypet(@RequestBody DischargeTypeDTO dischTypeDTO) throws OHServiceException {
 		LOGGER.info("Update dischargetypes code: {}", dischTypeDTO.getCode());
 		DischargeType dischType = mapper.map2Model(dischTypeDTO);
 		if (!discTypeManager.isCodePresent(dischTypeDTO.getCode()))
@@ -105,7 +105,7 @@ ResponseEntity<String> updateDischargeTypet(@RequestBody DischargeTypeDTO dischT
 		if (!isUpdated)
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "discharge type is not updated!", OHSeverityLevel.ERROR), HttpStatus.INTERNAL_SERVER_ERROR);
-		return ResponseEntity.ok(dischType.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(dischType));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/disease/rest/DiseaseController.java b/src/main/java/org/isf/disease/rest/DiseaseController.java
index 0cde44d4d..5f2177c50 100644
--- a/src/main/java/org/isf/disease/rest/DiseaseController.java
+++ b/src/main/java/org/isf/disease/rest/DiseaseController.java
@@ -222,7 +222,7 @@ public ResponseEntity<List<DiseaseDTO>> getAllDiseases() throws OHServiceExcepti
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/diseases/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<DiseaseDTO> getDiseaseByCode(@PathVariable("code") int code) throws OHServiceException {
+	public ResponseEntity<DiseaseDTO> getDiseaseByCode(@PathVariable("code") String code) throws OHServiceException {
         LOGGER.info("Get disease by code");
         
 	    Disease disease = diseaseManager.getDiseaseByCode(code);
@@ -282,7 +282,7 @@ public ResponseEntity<DiseaseDTO> updateDisease(@Valid @RequestBody DiseaseDTO d
 	 * @throws OHServiceException
 	 */
 	@DeleteMapping(value = "/diseases/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Boolean>> deleteDisease(@PathVariable("code") int code) throws OHServiceException {
+	public ResponseEntity<Map<String, Boolean>> deleteDisease(@PathVariable("code") String code) throws OHServiceException {
 		Disease disease = diseaseManager.getDiseaseByCode(code);
 		if(disease != null) {
 			Map<String, Boolean> result = new HashMap<>();
diff --git a/src/main/java/org/isf/dlvrrestype/rest/DeliveryResultTypeController.java b/src/main/java/org/isf/dlvrrestype/rest/DeliveryResultTypeController.java
index f3aead7a2..defa5a8d3 100644
--- a/src/main/java/org/isf/dlvrrestype/rest/DeliveryResultTypeController.java
+++ b/src/main/java/org/isf/dlvrrestype/rest/DeliveryResultTypeController.java
@@ -71,7 +71,7 @@ public DeliveryResultTypeController(DeliveryResultTypeBrowserManager dlvrrestMan
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/deliveryresulttypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newDeliveryResultType(@RequestBody DeliveryResultTypeDTO dlvrrestTypeDTO)
+	ResponseEntity<DeliveryResultTypeDTO> newDeliveryResultType(@RequestBody DeliveryResultTypeDTO dlvrrestTypeDTO)
 			throws OHServiceException {
 		String code = dlvrrestTypeDTO.getCode();
 		LOGGER.info("Create Delivery result type {}", code);
@@ -88,7 +88,7 @@ ResponseEntity<String> newDeliveryResultType(@RequestBody DeliveryResultTypeDTO
 					new OHExceptionMessage(null, "Delivery result type is not created!", OHSeverityLevel.ERROR),
 					HttpStatus.INTERNAL_SERVER_ERROR);
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(dlvrrestTypeCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(dlvrrestTypeCreated));
 	}
 
 	/**
@@ -98,7 +98,7 @@ ResponseEntity<String> newDeliveryResultType(@RequestBody DeliveryResultTypeDTO
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/deliveryresulttypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateDeliveryResultTypet(@RequestBody DeliveryResultTypeDTO dlvrrestTypeDTO)
+	ResponseEntity<DeliveryResultTypeDTO> updateDeliveryResultTypet(@RequestBody DeliveryResultTypeDTO dlvrrestTypeDTO)
 			throws OHServiceException {
 		LOGGER.info("Update deliveryresulttypes code: {}", dlvrrestTypeDTO.getCode());
 		DeliveryResultType dlvrrestType = mapper.map2Model(dlvrrestTypeDTO);
@@ -110,7 +110,7 @@ ResponseEntity<String> updateDeliveryResultTypet(@RequestBody DeliveryResultType
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "Delivery result type is not updated!", OHSeverityLevel.ERROR),
 					HttpStatus.INTERNAL_SERVER_ERROR);
-		return ResponseEntity.ok(dlvrrestType.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(dlvrrestType));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/dlvrtype/rest/DeliveryTypeController.java b/src/main/java/org/isf/dlvrtype/rest/DeliveryTypeController.java
index ad2dc20ea..ee90affa7 100644
--- a/src/main/java/org/isf/dlvrtype/rest/DeliveryTypeController.java
+++ b/src/main/java/org/isf/dlvrtype/rest/DeliveryTypeController.java
@@ -71,7 +71,7 @@ public DeliveryTypeController(DeliveryTypeBrowserManager dlvrtypeManager, Delive
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/deliverytypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newDeliveryType(@RequestBody DeliveryTypeDTO dlvrTypeDTO) throws OHServiceException {
+	ResponseEntity<DeliveryTypeDTO> newDeliveryType(@RequestBody DeliveryTypeDTO dlvrTypeDTO) throws OHServiceException {
 		String code = dlvrTypeDTO.getCode();
 		LOGGER.info("Create Delivery type {}", code);
 		boolean isCreated = dlvrtypeManager.newDeliveryType(deliveryTypeMapper.map2Model(dlvrTypeDTO));
@@ -85,7 +85,7 @@ ResponseEntity<String> newDeliveryType(@RequestBody DeliveryTypeDTO dlvrTypeDTO)
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "Delivery type is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(dlvrTypeCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(deliveryTypeMapper.map2DTO(dlvrTypeCreated));
 	}
 
 	/**
@@ -95,7 +95,7 @@ ResponseEntity<String> newDeliveryType(@RequestBody DeliveryTypeDTO dlvrTypeDTO)
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/deliverytypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateDeliveryTypet(@RequestBody DeliveryTypeDTO dlvrTypeDTO) throws OHServiceException {
+	ResponseEntity<DeliveryTypeDTO> updateDeliveryTypet(@RequestBody DeliveryTypeDTO dlvrTypeDTO) throws OHServiceException {
 		LOGGER.info("Update deliverytypes code: {}", dlvrTypeDTO.getCode());
 		DeliveryType dlvrType = deliveryTypeMapper.map2Model(dlvrTypeDTO);
 		if (!dlvrtypeManager.isCodePresent(dlvrType.getCode()))
@@ -105,7 +105,7 @@ ResponseEntity<String> updateDeliveryTypet(@RequestBody DeliveryTypeDTO dlvrType
 		if (!isUpdated)
 			throw new OHAPIException(
 					new OHExceptionMessage(null, "Delivery type is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(dlvrType.getCode());
+		return ResponseEntity.ok(deliveryTypeMapper.map2DTO(dlvrType));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/exam/rest/ExamController.java b/src/main/java/org/isf/exam/rest/ExamController.java
index 8c1387953..e5e095e8b 100644
--- a/src/main/java/org/isf/exam/rest/ExamController.java
+++ b/src/main/java/org/isf/exam/rest/ExamController.java
@@ -70,7 +70,7 @@ public ExamController(ExamBrowsingManager examManager, ExamMapper examMapper) {
     }
 
     @PostMapping(value = "/exams", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newExam(@RequestBody ExamDTO newExam) throws OHServiceException {
+    public ResponseEntity<ExamDTO> newExam(@RequestBody ExamDTO newExam) throws OHServiceException {
         ExamType examType = examTypeBrowserManager.getExamType().stream().filter(et -> newExam.getExamtype().getCode().equals(et.getCode())).findFirst().orElse(null);
 
         if (examType == null) {
@@ -84,11 +84,11 @@ public ResponseEntity newExam(@RequestBody ExamDTO newExam) throws OHServiceExce
         if (!isCreated) {
             throw new OHAPIException(new OHExceptionMessage(null, "Exam is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(exam.getCode());
+        return ResponseEntity.ok(examMapper.map2DTO(exam));
     }
 
     @PutMapping(value = "/exams/{code:.+}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateExams(@PathVariable String code, @RequestBody ExamDTO updateExam) throws OHServiceException {
+    public ResponseEntity<ExamDTO> updateExams(@PathVariable String code, @RequestBody ExamDTO updateExam) throws OHServiceException {
 
         if (!updateExam.getCode().equals(code)) {
             throw new OHAPIException(new OHExceptionMessage(null, "Exam code mismatch", OHSeverityLevel.ERROR));
@@ -105,11 +105,12 @@ public ResponseEntity updateExams(@PathVariable String code, @RequestBody ExamDT
         Exam exam = examMapper.map2Model(updateExam);
         exam.setExamtype(examType);
         exam.setLock(0);
-        if (!examManager.updateExam(exam)) {
+        Exam ex = examManager.updateExam(exam);
+        if (ex == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Exam is not updated!", OHSeverityLevel.ERROR));
         }
 
-        return ResponseEntity.ok(true);
+        return ResponseEntity.ok(examMapper.map2DTO(ex));
     }
 
 
diff --git a/src/main/java/org/isf/exam/rest/ExamRowController.java b/src/main/java/org/isf/exam/rest/ExamRowController.java
index 1047fa9e0..d398700d4 100644
--- a/src/main/java/org/isf/exam/rest/ExamRowController.java
+++ b/src/main/java/org/isf/exam/rest/ExamRowController.java
@@ -71,7 +71,7 @@ public ExamRowController(ExamBrowsingManager examManager, ExamRowBrowsingManager
     }
 
     @PostMapping(value = "/examrows", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newExamRow(@RequestBody ExamRowDTO examRowDTO) throws OHServiceException {
+    public ResponseEntity<ExamRowDTO> newExamRow(@RequestBody ExamRowDTO examRowDTO) throws OHServiceException {
         Exam exam = examManager.getExams().stream().filter(e -> examRowDTO.getExam().getCode().equals(e.getCode())).findFirst().orElse(null);
 
         if (exam == null) {
@@ -81,11 +81,11 @@ public ResponseEntity newExamRow(@RequestBody ExamRowDTO examRowDTO) throws OHSe
         ExamRow examRow = examRowMapper.map2Model(examRowDTO);
         examRow.setExamCode(exam);
 
-        boolean isCreated = examRowBrowsingManager.newExamRow(examRow);
-        if (!isCreated) {
+        ExamRow isCreated = examRowBrowsingManager.newExamRow(examRow);
+        if (isCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "ExamRow is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(true);
+        return ResponseEntity.status(HttpStatus.CREATED).body(examRowMapper.map2DTO(isCreated));
     }
 
     @GetMapping(value = "/examrows", produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/src/main/java/org/isf/examination/rest/ExaminationController.java b/src/main/java/org/isf/examination/rest/ExaminationController.java
index 006f201e8..dffcacdc0 100644
--- a/src/main/java/org/isf/examination/rest/ExaminationController.java
+++ b/src/main/java/org/isf/examination/rest/ExaminationController.java
@@ -21,6 +21,10 @@
  */
 package org.isf.examination.rest;
 
+import java.sql.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.isf.examination.dto.PatientExaminationDTO;
@@ -79,7 +83,7 @@ public ResponseEntity<Boolean> newPatientExamination(@RequestBody PatientExamina
 
         PatientExamination patientExamination = patientExaminationMapper.map2Model(newPatientExamination);
         patientExamination.setPatient(patient);
-
+        patientExamination.setPex_date(newPatientExamination.getPex_date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
         examinationBrowserManager.saveOrUpdate(patientExamination);
 
         return ResponseEntity.status(HttpStatus.CREATED).body(true);
@@ -87,7 +91,7 @@ public ResponseEntity<Boolean> newPatientExamination(@RequestBody PatientExamina
 
     @PutMapping(value = "/examinations/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity updateExamination(@PathVariable Integer id, @RequestBody PatientExaminationDTO dto) throws OHServiceException {
+    public ResponseEntity<Boolean> updateExamination(@PathVariable Integer id, @RequestBody PatientExaminationDTO dto) throws OHServiceException {
         if (dto.getPex_ID() != id) {
             throw new OHAPIException(new OHExceptionMessage(null, "Patient examination id mismatch", OHSeverityLevel.ERROR));
         }
@@ -102,6 +106,7 @@ public ResponseEntity updateExamination(@PathVariable Integer id, @RequestBody P
 
         PatientExamination patientExamination = patientExaminationMapper.map2Model(dto);
         patientExamination.setPatient(patient);
+        patientExamination.setPex_date(dto.getPex_date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
         examinationBrowserManager.saveOrUpdate(patientExamination);
 
         return ResponseEntity.ok(true);
@@ -114,10 +119,15 @@ public ResponseEntity<PatientExaminationDTO> getDefaultPatientExamination(@Reque
         if (patient == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Patient not exists!", OHSeverityLevel.ERROR));
         }
-        PatientExaminationDTO patientExaminationDTO = patientExaminationMapper.map2DTO(examinationBrowserManager.getDefaultPatientExamination(patient));
+        PatientExamination patientExamination = examinationBrowserManager.getDefaultPatientExamination(patient);
+        PatientExaminationDTO patientExaminationDTO = patientExaminationMapper.map2DTO(patientExamination);
         if (patientExaminationDTO == null) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
+        	Instant instant = patientExamination.getPex_date().atZone(ZoneId.systemDefault()).toInstant();
+    		Date date = (Date) Date.from(instant);
+    		patientExaminationDTO.setPex_date(date);
+    		
             return ResponseEntity.ok(patientExaminationDTO);
         }
     }
@@ -130,6 +140,9 @@ public ResponseEntity<PatientExaminationDTO> getFromLastPatientExamination(@Path
         if (patientExaminationDTO == null) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
+        	Instant instant = lastPatientExamination.getPex_date().atZone(ZoneId.systemDefault()).toInstant();
+    		Date date = (Date) Date.from(instant);
+    		patientExaminationDTO.setPex_date(date);
             return ResponseEntity.ok(patientExaminationDTO);
         }
     }
@@ -142,7 +155,12 @@ public ResponseEntity<PatientExaminationDTO> getByID(@PathVariable Integer id) t
         if (patientExamination == null) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
-            return ResponseEntity.ok(patientExaminationMapper.map2DTO(patientExamination));
+        	PatientExaminationDTO patienE = patientExaminationMapper.map2DTO(patientExamination);
+        	Instant instant = patientExamination.getPex_date().atZone(ZoneId.systemDefault()).toInstant();
+    		Date date = (Date) Date.from(instant);
+    		patienE.setPex_date(date);
+            return ResponseEntity.ok(patienE);
+            
         }
     }
 
@@ -154,7 +172,11 @@ public ResponseEntity<PatientExaminationDTO> getLastByPatientId(@PathVariable In
         if (patientExamination == null) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
-            return ResponseEntity.ok(patientExaminationMapper.map2DTO(patientExamination));
+        	PatientExaminationDTO patienE = patientExaminationMapper.map2DTO(patientExamination);
+        	Instant instant = patientExamination.getPex_date().atZone(ZoneId.systemDefault()).toInstant();
+    		Date date = (Date) Date.from(instant);
+    		patienE.setPex_date(date);
+            return ResponseEntity.ok(patienE);
         }
     }
 
@@ -174,11 +196,20 @@ public ResponseEntity<List<PatientExaminationDTO>> getLastNByPatID(@RequestParam
     public ResponseEntity<List<PatientExaminationDTO>> getByPatientId(@PathVariable Integer patId) throws OHServiceException {
 
         List<PatientExamination> patientExamination = examinationBrowserManager.getByPatID(patId);
-
+        List<PatientExaminationDTO> listePExam = new ArrayList<PatientExaminationDTO>();
         if (patientExamination == null || patientExamination.isEmpty()) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
-            return ResponseEntity.ok(patientExaminationMapper.map2DTOList(patientExamination));
-        }
+        		for(PatientExamination patienExam : patientExamination) {	
+        			PatientExaminationDTO patientExamDTO = patientExaminationMapper.map2DTO(patienExam);
+            		Instant instant = patienExam.getPex_date().atZone(ZoneId.systemDefault()).toInstant();
+                	Date date = (Date) Date.from(instant);
+                	patientExamDTO.setPex_date(date);
+                	listePExam.add(patientExamDTO);
+            			
+            	}
+        		
+        	}
+            return ResponseEntity.ok(listePExam);
     }
 }
diff --git a/src/main/java/org/isf/exatype/rest/ExamTypeController.java b/src/main/java/org/isf/exatype/rest/ExamTypeController.java
index bc8e600d1..a8eafec99 100644
--- a/src/main/java/org/isf/exatype/rest/ExamTypeController.java
+++ b/src/main/java/org/isf/exatype/rest/ExamTypeController.java
@@ -65,20 +65,20 @@ public ExamTypeController(ExamTypeBrowserManager examTypeBrowserManager, ExamTyp
     }
 
     @PostMapping(value = "/examtypes", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newExamType(@RequestBody ExamTypeDTO newExamType) throws OHServiceException {
+    public ResponseEntity<ExamTypeDTO> newExamType(@RequestBody ExamTypeDTO newExamType) throws OHServiceException {
 
         ExamType examType = examTypeMapper.map2Model(newExamType);
-        boolean created = examTypeBrowserManager.newExamType(examType);
+        ExamType created = examTypeBrowserManager.newExamType(examType);
 
-        if (!created) {
+        if (created  == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "ExamType type not created!", OHSeverityLevel.ERROR));
         }
 
-        return ResponseEntity.status(HttpStatus.CREATED).body(true);
+        return ResponseEntity.status(HttpStatus.CREATED).body(examTypeMapper.map2DTO(created));
     }
 
     @PutMapping(value = "/examtypes/{code:.+}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateExamType(@PathVariable String code, @RequestBody ExamTypeDTO updateExamType) throws OHServiceException {
+    public ResponseEntity<ExamTypeDTO> updateExamType(@PathVariable String code, @RequestBody ExamTypeDTO updateExamType) throws OHServiceException {
 
         if (!updateExamType.getCode().equals(code)) {
             throw new OHAPIException(new OHExceptionMessage(null, "ExamType code mismatch", OHSeverityLevel.ERROR));
@@ -88,11 +88,12 @@ public ResponseEntity updateExamType(@PathVariable String code, @RequestBody Exa
         }
 
         ExamType examType = examTypeMapper.map2Model(updateExamType);
-        if (!examTypeBrowserManager.updateExamType(examType)) {
+        ExamType exType = examTypeBrowserManager.updateExamType(examType);
+        if (exType == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "ExamType is not updated!", OHSeverityLevel.ERROR));
         }
 
-        return ResponseEntity.ok(true);
+        return ResponseEntity.ok(examTypeMapper.map2DTO(exType));
     }
 
 
diff --git a/src/main/java/org/isf/hospital/rest/HospitalController.java b/src/main/java/org/isf/hospital/rest/HospitalController.java
index a1ca89c93..7ec32b99b 100644
--- a/src/main/java/org/isf/hospital/rest/HospitalController.java
+++ b/src/main/java/org/isf/hospital/rest/HospitalController.java
@@ -60,7 +60,7 @@ public HospitalController(HospitalBrowsingManager hospitalBrowsingManager, Hospi
     }
 
     @PutMapping(value = "/hospitals/{code:.+}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateHospital(@PathVariable String code, @RequestBody HospitalDTO hospitalDTO) throws OHServiceException {
+    public ResponseEntity<HospitalDTO> updateHospital(@PathVariable String code, @RequestBody HospitalDTO hospitalDTO) throws OHServiceException {
 
         if (!hospitalDTO.getCode().equals(code)) {
             throw new OHAPIException(new OHExceptionMessage(null, "Hospital code mismatch", OHSeverityLevel.ERROR));
@@ -71,9 +71,9 @@ public ResponseEntity updateHospital(@PathVariable String code, @RequestBody Hos
 
         Hospital hospital = hospitalMapper.map2Model(hospitalDTO);
         hospital.setLock(0);
-        hospitalBrowsingManager.updateHospital(hospital);
+        Hospital hospi = hospitalBrowsingManager.updateHospital(hospital);
 
-        return ResponseEntity.ok(true);
+        return ResponseEntity.ok(hospitalMapper.map2DTO(hospi));
     }
 
     @GetMapping(value = "/hospitals", produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/src/main/java/org/isf/lab/dto/LaboratoryForPrintDTO.java b/src/main/java/org/isf/lab/dto/LaboratoryForPrintDTO.java
index 7baa5b29a..c72d82b00 100644
--- a/src/main/java/org/isf/lab/dto/LaboratoryForPrintDTO.java
+++ b/src/main/java/org/isf/lab/dto/LaboratoryForPrintDTO.java
@@ -30,6 +30,8 @@ public class LaboratoryForPrintDTO {
     private String result;
 
     private Integer code;
+    
+    private String patName;
 
 	public String getExam() {
 		return this.exam;
@@ -62,4 +64,13 @@ public void setResult(String result) {
 	public void setCode(Integer code) {
 		this.code = code;
 	}
+
+	public String getPatName() {
+		return patName;
+	}
+
+	public void setPatName(String patName) {
+		this.patName = patName;
+	}
+	
 }
diff --git a/src/main/java/org/isf/lab/rest/LaboratoryController.java b/src/main/java/org/isf/lab/rest/LaboratoryController.java
index 57647288d..ac48ca543 100644
--- a/src/main/java/org/isf/lab/rest/LaboratoryController.java
+++ b/src/main/java/org/isf/lab/rest/LaboratoryController.java
@@ -21,7 +21,12 @@
  */
 package org.isf.lab.rest;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -45,6 +50,8 @@
 import org.isf.utils.exception.OHServiceException;
 import org.isf.utils.exception.model.OHExceptionMessage;
 import org.isf.utils.exception.model.OHSeverityLevel;
+import org.isf.visits.dto.VisitDTO;
+import org.isf.visits.model.Visit;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -119,8 +126,13 @@ public ResponseEntity<Boolean> newLaboratory(@RequestBody LabWithRowsDTO labWith
         if (labRow != null) {
             labRows = new ArrayList<String>(labRow);
         }
-        if (labToInsert.getDate() == null)
-        	labToInsert.setDate(new GregorianCalendar());
+        if (labToInsert.getDate() == null) {
+        	Calendar cal = Calendar.getInstance();
+            Date input = cal.getTime();
+            LocalDateTime la = input.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            labToInsert.setDate(la);
+        }
+        	
         
         boolean inserted = laboratoryManager.newLaboratory(labToInsert, labRows);
 
@@ -131,11 +143,11 @@ public ResponseEntity<Boolean> newLaboratory(@RequestBody LabWithRowsDTO labWith
         return ResponseEntity.status(HttpStatus.CREATED).body(true);
     }
 
-    @PostMapping(value = "/laboratories/insertList", produces = MediaType.APPLICATION_JSON_VALUE)
+    /*@PostMapping(value = "/laboratories/insertList", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Boolean> newLaboratory2(@RequestBody List<LabWithRowsDTO> labsWithRows) throws OHServiceException {
 
-        List<Laboratory> labsToInsert = new ArrayList<>();
-        ArrayList<ArrayList<LaboratoryRow>> labsRowsToInsert = new ArrayList<>();
+    	LaboratoryRow labsToInsert = new LaboratoryRow();
+        List<LaboratoryRow> labsRowsToInsert = new ArrayList<>();
 
         for (LabWithRowsDTO labWithRowsDTO : labsWithRows) {
             LaboratoryDTO laboratoryDTO = labWithRowsDTO.getLaboratoryDTO();
@@ -153,8 +165,6 @@ public ResponseEntity<Boolean> newLaboratory2(@RequestBody List<LabWithRowsDTO>
             labToInsert.setExam(exam);
             labToInsert.setPatient(patient);
 
-            labsToInsert.add(labToInsert);
-
             if (labWithRowsDTO.getLaboratoryRowList() != null) {
                 ArrayList<LaboratoryRow> labRowToInsert = new ArrayList<>();
                 for (String rowDescription : labWithRowsDTO.getLaboratoryRowList()) {
@@ -172,7 +182,7 @@ public ResponseEntity<Boolean> newLaboratory2(@RequestBody List<LabWithRowsDTO>
             throw new OHAPIException(new OHExceptionMessage(null, "Laboratory is not created!", OHSeverityLevel.ERROR));
         }
         return ResponseEntity.status(HttpStatus.CREATED).body(true);
-    }
+    }*/
 
     @PutMapping(value = "/laboratories/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Boolean> updateLaboratory(@PathVariable Integer code, @RequestBody LabWithRowsDTO labWithRowsDTO) throws OHServiceException {
@@ -204,6 +214,12 @@ public ResponseEntity<Boolean> updateLaboratory(@PathVariable Integer code, @Req
         if (labRow != null) {
             labRows = new ArrayList<>(labRow);
         }
+        if (labToInsert.getDate() == null) {
+        	Calendar cal = Calendar.getInstance();
+            Date input = cal.getTime();
+            LocalDateTime la = input.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            labToInsert.setDate(la);
+        }
         labToInsert.setLock(0);
 
         boolean updated = laboratoryManager.updateLaboratory(labToInsert, labRows);
@@ -244,10 +260,20 @@ public ResponseEntity<List<LaboratoryDTO>> getLaboratory(@PathVariable Integer p
         }
 
         List<Laboratory> labList = laboratoryManager.getLaboratory(patient);
+        List<LaboratoryDTO> listLab = new ArrayList<LaboratoryDTO>();
         if (labList == null || labList.isEmpty()) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
-            return ResponseEntity.ok(laboratoryMapper.map2DTOList(labList));
+        	
+             for(Laboratory lab : labList) {	
+            	 LaboratoryDTO labDTO =  laboratoryMapper.map2DTO(lab);
+         		Instant instant = lab.getDate().atZone(ZoneId.systemDefault()).toInstant();
+             	Date date = (Date) Date.from(instant);
+             	labDTO.setExamDate(date);
+             	listLab.add(labDTO);
+         			
+         	}
+            return ResponseEntity.ok(listLab);
         }
     }
 
@@ -263,18 +289,31 @@ public ResponseEntity<List<String>> getMaterials() throws OHServiceException {
 
     @GetMapping(value = "/laboratories/exams", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<LaboratoryForPrintDTO>> getLaboratoryForPrint(@RequestParam String examName, @RequestParam(value = "dateFrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateFrom, @RequestParam(value = "dateTo") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo) throws OHServiceException {
-        GregorianCalendar datefrom = new GregorianCalendar();
-        datefrom.setTime(dateFrom);
-
-        GregorianCalendar dateto = new GregorianCalendar();
-        dateto.setTime(dateTo);
-
-        List<LaboratoryForPrint> laboratoryForPrintList = laboratoryManager.getLaboratoryForPrint(examName, datefrom, dateto);
+    	LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+
+        List<LaboratoryForPrint> laboratoryForPrintList = laboratoryManager.getLaboratoryForPrint(examName, dateF, dateT);
         if (laboratoryForPrintList == null || laboratoryForPrintList.isEmpty()) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
             return ResponseEntity.ok(laboratoryForPrintMapper.map2DTOList(laboratoryForPrintList));
         }
     }
+    
+    @GetMapping(value = "/laboratories/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<LaboratoryDTO> getExamById(@PathVariable Integer code) throws OHServiceException {
+        Laboratory lab = laboratoryManager.getLaboratory().stream().filter(l -> l.getCode().equals(code)).findFirst().orElse(null);
+        if (lab == null) {
+            throw new OHAPIException(new OHExceptionMessage(null, "Laboratory Not Found!", OHSeverityLevel.ERROR));
+        }
+        return ResponseEntity.ok(laboratoryMapper.map2DTO(lab));
+    }
 
 }
diff --git a/src/main/java/org/isf/login/dto/LoginResponse.java b/src/main/java/org/isf/login/dto/LoginResponse.java
index f6faea2a2..0065651fb 100644
--- a/src/main/java/org/isf/login/dto/LoginResponse.java
+++ b/src/main/java/org/isf/login/dto/LoginResponse.java
@@ -5,25 +5,25 @@ public class LoginResponse {
 	  private String token;
 	  private String type = "Bearer";
 	  private String username;
-	  public LoginResponse(String accessToken, String username) {
-	    this.token = accessToken;
+	  public LoginResponse(String token, String username) {
+	    this.token = token;
 	    this.username = username;
 	  }
 
-	  public String getAccessToken() {
+	  public String getToken() {
 	    return token;
 	  }
 
-	  public void setAccessToken(String accessToken) {
-	    this.token = accessToken;
+	  public void setToken(String token) {
+	    this.token = token;
 	  }
 
-	  public String getTokenType() {
+	  public String getType() {
 	    return type;
 	  }
 
-	  public void setTokenType(String tokenType) {
-	    this.type = tokenType;
+	  public void setType(String type) {
+	    this.type = type;
 	  }
 	  
 	  public String getUsername() {
diff --git a/src/main/java/org/isf/malnutrition/rest/MalnutritionController.java b/src/main/java/org/isf/malnutrition/rest/MalnutritionController.java
index c0868304a..5900ce3fa 100644
--- a/src/main/java/org/isf/malnutrition/rest/MalnutritionController.java
+++ b/src/main/java/org/isf/malnutrition/rest/MalnutritionController.java
@@ -69,15 +69,15 @@ public class MalnutritionController {
 	 * @throws OHServiceException 
 	 */
 	@PostMapping(value = "/malnutritions", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> newMalnutrition(@RequestBody @Valid MalnutritionDTO malnutritionDTO) throws OHServiceException{
+	public ResponseEntity<MalnutritionDTO> newMalnutrition(@RequestBody @Valid MalnutritionDTO malnutritionDTO) throws OHServiceException{
 		LOGGER.info("Creating a new malnutrition ...");
-		boolean isCreated = manager.newMalnutrition(mapper.map2Model(malnutritionDTO));
-		if (!isCreated) {
+		Malnutrition isCreated = manager.newMalnutrition(mapper.map2Model(malnutritionDTO));
+		if (isCreated == null) {
 			LOGGER.info("Malnutrition is not created!");
             throw new OHAPIException(new OHExceptionMessage(null, "Malnutrition is not created!", OHSeverityLevel.ERROR));
         }
 		LOGGER.info("Malnutrition successfully created!");
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 	
 	/**
diff --git a/src/main/java/org/isf/medical/dto/MedicalDTO.java b/src/main/java/org/isf/medical/dto/MedicalDTO.java
index 97ebd5748..06835cbdb 100644
--- a/src/main/java/org/isf/medical/dto/MedicalDTO.java
+++ b/src/main/java/org/isf/medical/dto/MedicalDTO.java
@@ -33,35 +33,35 @@ public class MedicalDTO {
 	@ApiModelProperty(notes="The id of the medical", example = "1", position = 1)
 	private Integer code;
 	
-	@NotEmpty(message="The product code is required")
+	//@NotEmpty(message="The product code is required")
 	@ApiModelProperty(notes="The product code", example = "PARA", position = 2)
 	private String prod_code;
 	
-	@NotNull(message="The medical type is required")
+	//@NotNull(message="The medical type is required")
 	@ApiModelProperty(notes="The medical type", position = 3)
 	private MedicalTypeDTO type;
 	
-	@NotEmpty(message="The description of the medical is required")
+	//@NotEmpty(message="The description of the medical is required")
 	@ApiModelProperty(notes="The description of the medical", example = "Paracétamol", position = 4)
 	private String description;
 	
-	@NotNull(message="Initial quantity is required")
+	//@NotNull(message="Initial quantity is required")
 	@ApiModelProperty(notes="The initial quantity of the medical", example = "21", position = 5)
 	private double initialqty;
 	
-	@NotNull(message="The number of pieces per packet is required")
+	//@NotNull(message="The number of pieces per packet is required")
 	@ApiModelProperty(notes="The number of pieces per packet", example = "100", position = 6)
 	private Integer pcsperpck;
 	
-	@NotNull(message="The input quantity is required")
+	//@NotNull(message="The input quantity is required")
 	@ApiModelProperty(notes="The input quantity of the medical", example = "340", position = 7)
 	private double inqty;
 	
-	@NotNull(message="The out quantity is required")
+	//@NotNull(message="The out quantity is required")
 	@ApiModelProperty(notes="The out quantity of the medical", example = "8", position = 8)
 	private double outqty;
 	
-	@NotNull(message="The min quantity is required")
+	//@NotNull(message="The min quantity is required")
 	@ApiModelProperty(notes="The min quantity of the medical", example = "15", position = 9)
 	private double minqty;
 	
diff --git a/src/main/java/org/isf/medical/rest/MedicalController.java b/src/main/java/org/isf/medical/rest/MedicalController.java
index bd416c0ef..d8c5ec7c9 100644
--- a/src/main/java/org/isf/medical/rest/MedicalController.java
+++ b/src/main/java/org/isf/medical/rest/MedicalController.java
@@ -167,17 +167,17 @@ else if(nameSorted){
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/medicals", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> newMedical(
+	public ResponseEntity<MedicalDTO> newMedical(
 			@RequestBody MedicalDTO medicalDTO,
 			@RequestParam(name="ignore_similar", defaultValue="false") boolean ignoreSimilar) throws OHServiceException {
 		LOGGER.info("Creating a new medical ...");
-		boolean isCreated = medicalManager.newMedical(mapper.map2Model(medicalDTO), ignoreSimilar);
-		if (!isCreated) {
+		Medical isCreated = medicalManager.newMedical(mapper.map2Model(medicalDTO), ignoreSimilar);
+		if (isCreated == null) {
 			LOGGER.info("Medical is not created!");
             throw new OHAPIException(new OHExceptionMessage(null, "Medical is not created!", OHSeverityLevel.ERROR));
         }
 		LOGGER.info("Medical successfully created!");
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 	
 	/**
@@ -188,17 +188,17 @@ public ResponseEntity<Void> newMedical(
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/medicals", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> updateMedical(
+	public ResponseEntity<MedicalDTO> updateMedical(
 			@RequestBody @Valid MedicalDTO medicalDTO,
 			@RequestParam(name="ignore_similar", defaultValue="false") boolean ignoreSimilar) throws OHServiceException {
 		LOGGER.info("Updating a medical ...");
-		boolean isUpdated = medicalManager.updateMedical(mapper.map2Model(medicalDTO), ignoreSimilar);
-		if (!isUpdated) {
+		Medical isUpdated = medicalManager.updateMedical(mapper.map2Model(medicalDTO), ignoreSimilar);
+		if (isUpdated == null) {
 			LOGGER.info("Medical is not updated!");
             throw new OHAPIException(new OHExceptionMessage(null, "Medical is not updated!", OHSeverityLevel.ERROR));
         }
 		LOGGER.info("Medical successfully updated!");
-        return ResponseEntity.status(HttpStatus.OK).body(null);
+        return ResponseEntity.status(HttpStatus.OK).body(mapper.map2DTO(isUpdated));
 	}
 	
 	/**
diff --git a/src/main/java/org/isf/medicalstock/rest/StockMovementController.java b/src/main/java/org/isf/medicalstock/rest/StockMovementController.java
index 70dbf8f95..03bdc7b99 100644
--- a/src/main/java/org/isf/medicalstock/rest/StockMovementController.java
+++ b/src/main/java/org/isf/medicalstock/rest/StockMovementController.java
@@ -21,6 +21,8 @@
  */
 package org.isf.medicalstock.rest;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -133,11 +135,16 @@ public ResponseEntity<List<MovementDTO>> getMovements(
 			@RequestParam("ward_id") String wardId,
 			@RequestParam("from") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateFrom,
 			@RequestParam("to") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo) throws OHServiceException {
-		GregorianCalendar dateFrom_ = new GregorianCalendar();
-		dateFrom_.setTime(dateFrom);
-		GregorianCalendar dateTo_ = new GregorianCalendar();
-		dateTo_.setTime(dateTo);
-		List<Movement> movements = movManager.getMovements(wardId, dateFrom_, dateTo_);
+		LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		List<Movement> movements = movManager.getMovements(wardId, dateF, dateT);
 		return collectResults(movements);
 	}
 	
@@ -180,38 +187,37 @@ public ResponseEntity<List<MovementDTO>> getMovements(
 			@RequestParam(name="lot_prep_to", required=false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date lotPrepTo,
 			@RequestParam(name="lot_due_from", required=false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date lotDueFrom,
 			@RequestParam(name="lot_due_to", required=false) @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date lotDueTo) throws OHServiceException {
-		GregorianCalendar movFrom_ = null;
+		LocalDateTime movF = null;
 		if(movFrom != null) {
-			movFrom_ = new GregorianCalendar();
-			movFrom_.setTime(movFrom);
+			movF  = movFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
-		GregorianCalendar movTo_ = null;
+		
+		LocalDateTime movT = null;
 		if(movTo != null) {
-			movTo_ = new GregorianCalendar();
-			movTo_.setTime(movTo);
+			movT  = movTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
-		GregorianCalendar lotPrepFrom_ = null;
+		
+		LocalDateTime lotPrepF = null;
 		if(lotPrepFrom != null) {
-			lotPrepFrom_ = new GregorianCalendar();
-			lotPrepFrom_.setTime(lotPrepFrom);
+			lotPrepF  = lotPrepFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
-		GregorianCalendar lotPrepTo_ = null;
+		
+		LocalDateTime lotPrepT = null;
 		if(lotPrepTo != null) {
-			lotPrepTo_ = new GregorianCalendar();
-			lotPrepTo_.setTime(lotPrepTo);
+			lotPrepT  = lotPrepTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
-		GregorianCalendar lotDueFrom_ = null;
+		
+		LocalDateTime lotDueF = null;
 		if(lotDueFrom != null) {
-			lotDueFrom_ = new GregorianCalendar();
-			lotDueFrom_.setTime(lotDueFrom);
+			lotDueF  = lotDueFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
-		GregorianCalendar lotDueTo_ = null;
+		
+		LocalDateTime lotDueT = null;
 		if(lotDueTo != null) {
-			lotDueTo_ = new GregorianCalendar();
-			lotDueTo_.setTime(lotDueTo);
+			lotDueT  = lotDueTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
 		
-		List<Movement> movements = movManager.getMovements(medicalCode, medicalType, wardId, movType, movFrom_, movTo_, lotPrepFrom_, lotPrepTo_, lotDueFrom_, lotDueTo_);
+		List<Movement> movements = movManager.getMovements(medicalCode, medicalType, wardId, movType, movF, movT, lotPrepF, lotPrepT, lotDueF, lotDueT);
 		return collectResults(movements);
 	}
 	
diff --git a/src/main/java/org/isf/medicalstockward/rest/MedicalStockWardController.java b/src/main/java/org/isf/medicalstockward/rest/MedicalStockWardController.java
index 5973ea975..9efe04f98 100644
--- a/src/main/java/org/isf/medicalstockward/rest/MedicalStockWardController.java
+++ b/src/main/java/org/isf/medicalstockward/rest/MedicalStockWardController.java
@@ -21,6 +21,9 @@
  */
 package org.isf.medicalstockward.rest;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -150,19 +153,17 @@ public ResponseEntity<List<MovementWardDTO>> getMovementWard(
 			@PathVariable("ward_code") String wardId, 
 			@RequestParam("from") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateFrom, 
 			@RequestParam("to") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo) throws OHServiceException {
-		GregorianCalendar dateFrom_ = null;
+		LocalDateTime dateF = null;
 		if(dateFrom != null) {
-			dateFrom_ = new GregorianCalendar();
-			dateFrom_.setTime(dateFrom);
+			dateF = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
 		
-		GregorianCalendar dateTo_ = null;
+		LocalDateTime dateT = null;
 		if(dateTo != null) {
-			dateTo_ = new GregorianCalendar();
-			dateTo_.setTime(dateTo);
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
 		
-		List<MovementWard> movs = movWardBrowserManager.getMovementWard(wardId, dateFrom_, dateTo_);
+		List<MovementWard> movs = movWardBrowserManager.getMovementWard(wardId, dateF, dateT);
 		List<MovementWardDTO> mappedMovs = movementWardMapper.map2DTOList(movs);
 		if(mappedMovs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(mappedMovs);
@@ -184,19 +185,17 @@ public ResponseEntity<List<MovementWardDTO>> getWardMovementsToWard(
 			@PathVariable("target_ward_code") String idwardTo, 
 			@RequestParam("from") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateFrom, 
 			@RequestParam("to") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo) throws OHServiceException {
-		GregorianCalendar dateFrom_ = null;
+		LocalDateTime dateF = null;
 		if(dateFrom != null) {
-			dateFrom_ = new GregorianCalendar();
-			dateFrom_.setTime(dateFrom);
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
 		
-		GregorianCalendar dateTo_ = null;
+		LocalDateTime dateT = null;
 		if(dateTo != null) {
-			dateTo_ = new GregorianCalendar();
-			dateTo_.setTime(dateTo);
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 		}
 		
-		List<MovementWard> movs = movWardBrowserManager.getWardMovementsToWard(idwardTo, dateFrom_, dateTo_);
+		List<MovementWard> movs = movWardBrowserManager.getWardMovementsToWard(idwardTo, dateF, dateT);
 		List<MovementWardDTO> mappedMovs = movementWardMapper.map2DTOList(movs);
 		if(mappedMovs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(mappedMovs);
diff --git a/src/main/java/org/isf/medstockmovtype/rest/MedStockMovementTypeController.java b/src/main/java/org/isf/medstockmovtype/rest/MedStockMovementTypeController.java
index a202f8aa2..a0058bc88 100644
--- a/src/main/java/org/isf/medstockmovtype/rest/MedStockMovementTypeController.java
+++ b/src/main/java/org/isf/medstockmovtype/rest/MedStockMovementTypeController.java
@@ -103,12 +103,12 @@ public ResponseEntity<MovementTypeDTO> getMovementType(@PathVariable("code") Str
 	 * @throws OHServiceException 
 	 */
 	@PostMapping(value = "/medstockmovementtype", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> newMedicaldsrstockmovType(@RequestBody @Valid MovementTypeDTO medicaldsrstockmovType) throws OHServiceException {
-		boolean isCreated = manager.newMedicaldsrstockmovType(mapper.map2Model(medicaldsrstockmovType));
-		if (!isCreated) {
+	public ResponseEntity<MovementTypeDTO> newMedicaldsrstockmovType(@RequestBody @Valid MovementTypeDTO medicaldsrstockmovType) throws OHServiceException {
+		MovementType isCreated = manager.newMedicaldsrstockmovType(mapper.map2Model(medicaldsrstockmovType));
+		if (isCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Movement type is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 	
 	/**
@@ -118,15 +118,15 @@ public ResponseEntity<Void> newMedicaldsrstockmovType(@RequestBody @Valid Moveme
 	 * @throws OHServiceException 
 	 */
 	@PutMapping(value = "/medstockmovementtype", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> updateMedicaldsrstockmovType(@RequestBody @Valid MovementTypeDTO medicaldsrstockmovTypeDTO) throws OHServiceException {
+	public ResponseEntity<MovementTypeDTO> updateMedicaldsrstockmovType(@RequestBody @Valid MovementTypeDTO medicaldsrstockmovTypeDTO) throws OHServiceException {
 		MovementType medicaldsrstockmovType = mapper.map2Model(medicaldsrstockmovTypeDTO);
 		if (!manager.isCodePresent(medicaldsrstockmovType.getCode()))
 			throw new OHAPIException(new OHExceptionMessage(null, "Movement type not found!", OHSeverityLevel.ERROR));
-		boolean isUpdated = manager.updateMedicaldsrstockmovType(medicaldsrstockmovType);
-		if (!isUpdated) {
+		MovementType isUpdated = manager.updateMedicaldsrstockmovType(medicaldsrstockmovType);
+		if (isUpdated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Movement type is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(null);
+        return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 	
 	/**
diff --git a/src/main/java/org/isf/medtype/rest/MedicalTypeController.java b/src/main/java/org/isf/medtype/rest/MedicalTypeController.java
index 8106571ea..0cebf469a 100644
--- a/src/main/java/org/isf/medtype/rest/MedicalTypeController.java
+++ b/src/main/java/org/isf/medtype/rest/MedicalTypeController.java
@@ -87,12 +87,12 @@ public ResponseEntity<List<MedicalTypeDTO>> getMedicalTypes() throws OHServiceEx
 	 * @throws OHServiceException 
 	 */
 	@PostMapping(value = "/medicaltypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> createMedicalType(@RequestBody @Valid MedicalTypeDTO medicalTypeDTO) throws OHServiceException {
-		boolean isCreated = medicalTypeBrowserManager.newMedicalType(medicalTypeMapper.map2Model(medicalTypeDTO));
-		if (!isCreated) {
+	public ResponseEntity<MedicalTypeDTO> createMedicalType(@RequestBody @Valid MedicalTypeDTO medicalTypeDTO) throws OHServiceException {
+		MedicalType isCreated = medicalTypeBrowserManager.newMedicalType(medicalTypeMapper.map2Model(medicalTypeDTO));
+		if (isCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Medical type is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(medicalTypeMapper.map2DTO(isCreated));
 	}
 	
 	/**
@@ -102,15 +102,15 @@ public ResponseEntity<Void> createMedicalType(@RequestBody @Valid MedicalTypeDTO
 	 * @throws OHServiceException 
 	 */
 	@PutMapping(value = "/medicaltypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Void> updateMedicalType(@RequestBody @Valid MedicalTypeDTO medicalTypeDTO) throws OHServiceException {
+	public ResponseEntity<MedicalTypeDTO> updateMedicalType(@RequestBody @Valid MedicalTypeDTO medicalTypeDTO) throws OHServiceException {
 		MedicalType medicalType = medicalTypeMapper.map2Model(medicalTypeDTO);
 		if (!medicalTypeBrowserManager.isCodePresent(medicalType.getCode()))
 			throw new OHAPIException(new OHExceptionMessage(null, "Medical type not found!", OHSeverityLevel.ERROR));
-		boolean isUpdated = medicalTypeBrowserManager.updateMedicalType(medicalType);
-		if (!isUpdated) {
+		MedicalType isUpdated = medicalTypeBrowserManager.updateMedicalType(medicalType);
+		if (isUpdated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Medical type is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(null);
+        return ResponseEntity.ok(medicalTypeMapper.map2DTO(isUpdated));
 	}
 	
 	/**
diff --git a/src/main/java/org/isf/opd/dto/OpdDTO.java b/src/main/java/org/isf/opd/dto/OpdDTO.java
index 621662b91..6b6cdcf1a 100644
--- a/src/main/java/org/isf/opd/dto/OpdDTO.java
+++ b/src/main/java/org/isf/opd/dto/OpdDTO.java
@@ -42,7 +42,7 @@ public class OpdDTO {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Date date;
 
-    @NotNull
+    //@NotNull
     @ApiModelProperty(notes = "the visit date", position = 3)
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Date visitDate;
@@ -61,12 +61,17 @@ public class OpdDTO {
     @NotNull
     @ApiModelProperty(notes = "the patient sex", example = "M", position = 7)
     private char sex;
+    
+    //@NotNull
+    @ApiModelProperty(notes = "the patient sex", example = "M", position = 7)
+    private String patientName;
+    
 
     @NotNull
     @ApiModelProperty(notes = "the admission note", example = "this is out patient", position = 8)
     private String note; // ADDED: Alex
 
-    @NotNull
+   // @NotNull
     @ApiModelProperty(notes = "a progr. in year for each ward", example = "18", position = 9)
     private int prog_year;
 
@@ -178,6 +183,14 @@ public Date getVisitDate() {
 		return this.visitDate;
 	}
 
+	public String getPatientName() {
+		return patientName;
+	}
+
+	public void setPatientName(String patientName) {
+		this.patientName = patientName;
+	}
+
 	public Date getNextVisitDate() {
 		return this.nextVisitDate;
 	}
diff --git a/src/main/java/org/isf/opd/mapper/OpdMapper.java b/src/main/java/org/isf/opd/mapper/OpdMapper.java
index 3d7c0ca84..759b38a63 100644
--- a/src/main/java/org/isf/opd/mapper/OpdMapper.java
+++ b/src/main/java/org/isf/opd/mapper/OpdMapper.java
@@ -47,6 +47,7 @@ public OpdDTO map2DTO(Opd fromObj) {
 		OpdDTO opdDTO = super.map2DTO(fromObj);
 		if (fromObj.getPatient() != null) {
 			opdDTO.setPatientCode(fromObj.getPatient().getCode());
+			opdDTO.setPatientName(fromObj.getFullName());
 		}
 		return opdDTO;
 
diff --git a/src/main/java/org/isf/opd/rest/OpdController.java b/src/main/java/org/isf/opd/rest/OpdController.java
index 2b7137edb..7e8ad68c7 100644
--- a/src/main/java/org/isf/opd/rest/OpdController.java
+++ b/src/main/java/org/isf/opd/rest/OpdController.java
@@ -21,10 +21,17 @@
  */
 package org.isf.opd.rest;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.chrono.ChronoLocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 
+import org.isf.admission.dto.AdmissionDTO;
+import org.isf.admission.model.Admission;
 import org.isf.disease.manager.DiseaseBrowserManager;
 import org.isf.opd.dto.OpdDTO;
 import org.isf.opd.manager.OpdBrowserManager;
@@ -62,6 +69,9 @@ public class OpdController {
 	@Autowired
 	protected OpdBrowserManager opdManager;
 	
+	@Autowired
+	private PatientBrowserManager patientManager = new PatientBrowserManager();
+	
 	@Autowired
 	protected OpdMapper mapper;
 	
@@ -83,7 +93,7 @@ public OpdController(OpdBrowserManager opdManager, OpdMapper opdmapper) {
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/opds", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Boolean> newOpd(@RequestBody OpdDTO opdDTO) throws OHServiceException {
+	ResponseEntity<OpdDTO> newOpd(@RequestBody OpdDTO opdDTO) throws OHServiceException {
 		int code = opdDTO.getCode();
 		LOGGER.info("store Out patient {}", code);
 		Patient patient = patientBrowserManager.getPatientById(opdDTO.getPatientCode());
@@ -97,11 +107,16 @@ ResponseEntity<Boolean> newOpd(@RequestBody OpdDTO opdDTO) throws OHServiceExcep
 			throw new OHAPIException(new OHExceptionMessage(null, "not field is mandatory!", OHSeverityLevel.ERROR));
 		}
 		Opd opdToInsert = mapper.map2Model(opdDTO);
-		boolean isCreated = opdManager.newOpd(opdToInsert);
-		if (!isCreated) {
+		opdToInsert.setDate(opdDTO.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		Opd isCreated = opdManager.newOpd(opdToInsert);
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "Opd is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.OK).body(true);
+		OpdDTO opdDTOs = mapper.map2DTO(isCreated);
+		Instant instant = isCreated.getDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date = Date.from(instant);
+		opdDTOs.setDate(date);
+		return ResponseEntity.status(HttpStatus.OK).body(opdDTOs);
 	}
 
 	/**
@@ -111,12 +126,12 @@ ResponseEntity<Boolean> newOpd(@RequestBody OpdDTO opdDTO) throws OHServiceExcep
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/opds/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Integer> updateOpd(@PathVariable("code") int code, @RequestBody OpdDTO opdDTO)
+	ResponseEntity<OpdDTO> updateOpd(@PathVariable("code") int code, @RequestBody OpdDTO opdDTO)
 			throws OHServiceException {
 		LOGGER.info("Update opds code: {}", opdDTO.getCode());
-	/*	if(opdManager.getOpdByCode(code) == null ) {	
+		if(opdManager.getOpdByCode(code) == null ) {	
 			throw new OHAPIException(new OHExceptionMessage(null, "Opd not found!", OHSeverityLevel.ERROR));
-		}*/
+		}
 
 		if(opdDTO.getCode() != 0 && opdDTO.getCode() != code) {	
 			throw new OHAPIException(new OHExceptionMessage(null, "Opd not found!", OHSeverityLevel.ERROR));
@@ -128,12 +143,18 @@ ResponseEntity<Integer> updateOpd(@PathVariable("code") int code, @RequestBody O
 		}
 
 		Opd opdToUpdate = mapper.map2Model(opdDTO);
-		opdToUpdate.setLock(0);
+		opdToUpdate.setDate(opdDTO.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		opdToUpdate.setLock(opdDTO.getLock());
 		Opd updatedOpd = opdManager.updateOpd(opdToUpdate);
 		
 		if(updatedOpd == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "Opd is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(updatedOpd.getCode());
+		
+		OpdDTO opdDTOs = mapper.map2DTO(updatedOpd);
+		Instant instant = updatedOpd.getDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date = Date.from(instant);
+		opdDTOs.setDate(date);
+		return ResponseEntity.status(HttpStatus.OK).body(opdDTOs);
 	}
 
 	/**
@@ -162,19 +183,25 @@ public ResponseEntity<List<OpdDTO>> getOpdToDayOrWeek(@RequestParam(name="oneWee
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/opds/search", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<OpdDTO>> getOpdByDates(@RequestParam String diseaseTypeCode, @RequestParam String diseaseCode,
+	public ResponseEntity<List<OpdDTO>> getOpdByDates(
 			@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateFrom, 
 			@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") Date dateTo, 
-			@RequestParam int ageFrom, @RequestParam int ageTo, @RequestParam char sex,
-			@RequestParam char newPatient) throws OHServiceException {
+			@RequestParam(value = "diseaseTypeCode", required = false, defaultValue = "angal.common.alltypes.txt") String diseaseTypeCode, @RequestParam(value = "diseaseCode", required = false, defaultValue = "angal.opd.alldiseases.txt") String diseaseCode,
+			@RequestParam(value = "ageFrom", required = false, defaultValue = "0") Integer ageFrom, @RequestParam(value = "ageTo", required = false, defaultValue = "0") Integer ageTo,
+			@RequestParam(value = "sex", required = false, defaultValue = "A") char sex,
+			@RequestParam(value = "newPatient", required = false, defaultValue = "A") char newPatient,
+			@RequestParam(value = "patientCode", required = false, defaultValue = "0") Integer patientCode) throws OHServiceException {
 		LOGGER.info("Get opd within specified dates");
+		LocalDate dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+		}
 		
-		GregorianCalendar datefrom = new GregorianCalendar();
-		GregorianCalendar dateto = new GregorianCalendar();
-        dateto.setTime(dateTo);
-        datefrom.setTime(dateFrom);
-        
-		List<Opd> opds = opdManager.getOpd(diseaseTypeCode, diseaseCode, datefrom, dateto, ageFrom,  ageTo, sex, newPatient);
+		LocalDate dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+		}
+		List<Opd> opds = opdManager.getOpd(diseaseTypeCode, diseaseCode, dateF, dateT, ageFrom,  ageTo, sex, newPatient, patientCode);
 		List<OpdDTO> opdDTOs = mapper.map2DTOList(opds);
 		if (opdDTOs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(opdDTOs);
@@ -189,10 +216,19 @@ public ResponseEntity<List<OpdDTO>> getOpdByDates(@RequestParam String diseaseTy
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/opds/patient/{pcode}", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<OpdDTO>> getOpdByPatient(@PathVariable("pcode") int patientcode) throws OHServiceException {
-		LOGGER.info("Get opd associated to specified patient CODE: {}", patientcode);
-		List<Opd> opds = opdManager.getOpdList(patientcode);
-		List<OpdDTO> opdDTOs = mapper.map2DTOList(opds);
+	public ResponseEntity<List<OpdDTO>> getOpdByPatient(@PathVariable("pcode") int pcode) throws OHServiceException {
+		LOGGER.info("Get opd associated to specified patient CODE: {}", pcode);
+		
+		List<Opd> opds = opdManager.getOpdList(pcode);
+		List<OpdDTO> opdDTOs = new ArrayList<OpdDTO>();
+		 for(Opd opd : opds) {	
+			 OpdDTO admission =  mapper.map2DTO(opd);
+	    		Instant instant = opd.getDate().atZone(ZoneId.systemDefault()).toInstant();
+	        	Date date = (Date) Date.from(instant);
+	        	admission.setDate(date);
+	       
+	        	opdDTOs.add(admission);	
+	    	}
 		if (opdDTOs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(opdDTOs);
 		} else {
diff --git a/src/main/java/org/isf/operation/dto/OperationRowDTO.java b/src/main/java/org/isf/operation/dto/OperationRowDTO.java
index eb2e11790..1752b17dd 100644
--- a/src/main/java/org/isf/operation/dto/OperationRowDTO.java
+++ b/src/main/java/org/isf/operation/dto/OperationRowDTO.java
@@ -41,16 +41,16 @@ public class OperationRowDTO {
 
     private int id;
 
-    @NotNull
+    //@NotNull
     private OperationDTO operation;
 
-    @NotNull
+    //@NotNull
     private String prescriber;
 
-    @NotNull
+    //@NotNull
     private String opResult;
 
-    @NotNull
+    //@NotNull
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
 	private Date opDate;
 
diff --git a/src/main/java/org/isf/operation/rest/OperationController.java b/src/main/java/org/isf/operation/rest/OperationController.java
index 31877dec7..3256f891a 100644
--- a/src/main/java/org/isf/operation/rest/OperationController.java
+++ b/src/main/java/org/isf/operation/rest/OperationController.java
@@ -21,9 +21,14 @@
  */
 package org.isf.operation.rest;
 
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.isf.admission.dto.AdmissionDTO;
 import org.isf.admission.manager.AdmissionBrowserManager;
 import org.isf.admission.model.Admission;
 import org.isf.opd.dto.OpdDTO;
@@ -94,18 +99,18 @@ public OperationController(OperationBrowserManager operationManager, OperationMa
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/operations", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newOperation(@RequestBody OperationDTO operationDTO) throws OHServiceException {
+	ResponseEntity<OperationDTO> newOperation(@RequestBody OperationDTO operationDTO) throws OHServiceException {
 		String code = operationDTO.getCode();
 		LOGGER.info("Create operation {}", code);
 		if(operationManager.descriptionControl(operationDTO.getDescription(), operationDTO.getType().getCode())) {
 			throw new OHAPIException(new OHExceptionMessage(null, "another operation has already been created with provided description and types!", OHSeverityLevel.ERROR));
 		}
-		boolean isCreated = operationManager.newOperation(mapper.map2Model(operationDTO));
-		Operation operationCreated = operationManager.getOperationByCode(code);
-		if (!isCreated || operationCreated == null) {
+		Operation operation = mapper.map2Model(operationDTO);
+		Operation isCreated = operationManager.newOperation(mapper.map2Model(operationDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "operation is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(operationCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -115,17 +120,17 @@ ResponseEntity<String> newOperation(@RequestBody OperationDTO operationDTO) thro
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/operations/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateOperation(@PathVariable String code, @RequestBody OperationDTO operationDTO)
+	ResponseEntity<OperationDTO> updateOperation(@PathVariable String code, @RequestBody OperationDTO operationDTO)
 			throws OHServiceException {
 		LOGGER.info("Update operations code: {}", operationDTO.getCode());
 		Operation operation = mapper.map2Model(operationDTO);
 		if (!operationManager.isCodePresent(code))
 			throw new OHAPIException(new OHExceptionMessage(null, "operation not found!", OHSeverityLevel.ERROR));
 		operation.setLock(0);
-		boolean isUpdated = operationManager.updateOperation(operation);
-		if (!isUpdated)
+		Operation isUpdated = operationManager.updateOperation(operation);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "operation is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(operation.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
@@ -205,13 +210,15 @@ public ResponseEntity<Boolean> deleteOperation(@PathVariable("code") String code
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/operations/rows", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Integer> newOperationRow(@RequestBody OperationRowDTO operationRowDTO) throws OHServiceException {
-		int code = operationRowDTO.getId();
+	ResponseEntity<OperationRowDTO> newOperationRow(@RequestBody OperationRowDTO operationRowDTO) throws OHServiceException {
+		int code = operationRowDTO.getAdmission().getId();
 		LOGGER.info("Create operation {}", code);
 		if(operationRowDTO.getAdmission() == null && operationRowDTO.getOpd() == null) {
 			   throw new OHAPIException(new OHExceptionMessage(null, "At least one field between admission and Opd is required!", OHSeverityLevel.ERROR));
 		}
 		OperationRow opRow = opRowMapper.map2Model(operationRowDTO);
+		opRow.setOpDate(operationRowDTO.getOpDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		
 		boolean isCreated = operationRowManager.newOperationRow(opRow);
 		List<OperationRow> opRowFounds = operationRowManager.getOperationRowByAdmission(opRow.getAdmission()).stream().filter(op -> op.getId() == code)
 				.collect(Collectors.toList());
@@ -222,7 +229,11 @@ ResponseEntity<Integer> newOperationRow(@RequestBody OperationRowDTO operationRo
 		if (!isCreated || opCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "operation row is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(opCreated.getId());
+		OperationRowDTO opR =  opRowMapper.map2DTO(opCreated);
+		 Instant instant = opRow.getOpDate().atZone(ZoneId.systemDefault()).toInstant();
+         Date date = (Date) Date.from(instant);
+         opR.setOpDate(date);
+		return ResponseEntity.status(HttpStatus.CREATED).body(opR);
 	}
 	
 	/**
@@ -239,6 +250,8 @@ ResponseEntity<Integer> updateOperationRow(@RequestBody OperationRowDTO operatio
 		   throw new OHAPIException(new OHExceptionMessage(null, "At least one field between admission and Opd is required!", OHSeverityLevel.ERROR));
 	    }
 		OperationRow opRow = opRowMapper.map2Model(operationRowDTO);
+		opRow.setOpDate(operationRowDTO.getOpDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		
 		List<OperationRow> opRowFounds = operationRowManager.getOperationRowByAdmission(opRow.getAdmission()).stream().filter(op -> op.getId() == opRow.getId())
 				.collect(Collectors.toList());
 		if (opRowFounds.isEmpty())
@@ -259,7 +272,17 @@ public ResponseEntity<List<OperationRowDTO>> getOperationRowsByAdmt(@RequestPara
 		LOGGER.info("Get operations row for provided admission");
 		Admission adm = admissionManager.getAdmission(id);
 		List<OperationRow> operationRows = operationRowManager.getOperationRowByAdmission(adm);
-		List<OperationRowDTO> operationRowDTOs = opRowMapper.map2DTOList(operationRows);
+		List<OperationRowDTO> operationRowDTOs = new ArrayList<OperationRowDTO>();
+		 for(OperationRow opRow : operationRows) {
+			 OperationRowDTO opR =  opRowMapper.map2DTO(opRow);
+			 if(opRow.getOpDate() != null) {
+		    	 Instant instant = opRow.getOpDate().atZone(ZoneId.systemDefault()).toInstant();
+		         Date date = (Date) Date.from(instant);
+		         opR.setOpDate(date); 
+			 }
+	        	
+	         operationRowDTOs.add(opR);	
+	    	}
 		if (operationRowDTOs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(operationRowDTOs);
 		} else {
diff --git a/src/main/java/org/isf/opetype/rest/OperationTypeController.java b/src/main/java/org/isf/opetype/rest/OperationTypeController.java
index 53df057f4..f37c1105b 100644
--- a/src/main/java/org/isf/opetype/rest/OperationTypeController.java
+++ b/src/main/java/org/isf/opetype/rest/OperationTypeController.java
@@ -71,16 +71,14 @@ public OperationTypeController(OperationTypeBrowserManager opeTypeManager, Opera
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/operationtypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newOperationType(@RequestBody OperationTypeDTO operationTypeDTO) throws OHServiceException {
+	ResponseEntity<OperationTypeDTO> newOperationType(@RequestBody OperationTypeDTO operationTypeDTO) throws OHServiceException {
 		String code = operationTypeDTO.getCode();
 		LOGGER.info("Create operation Type {}", code);
-		boolean isCreated = opeTypeManager.newOperationType(mapper.map2Model(operationTypeDTO));
-		OperationType opeTypeCreated = opeTypeManager.getOperationType().stream().filter(opetype -> opetype.getCode().equals(code))
-				.findFirst().orElse(null);
-		if (!isCreated || opeTypeCreated == null) {
+		OperationType isCreated = opeTypeManager.newOperationType(mapper.map2Model(operationTypeDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "operation Type is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(opeTypeCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -90,16 +88,16 @@ ResponseEntity<String> newOperationType(@RequestBody OperationTypeDTO operationT
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/operationtypes/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updateOperationTypet(@PathVariable String code, @RequestBody OperationTypeDTO operationTypeDTO)
+	ResponseEntity<OperationTypeDTO> updateOperationTypet(@PathVariable String code, @RequestBody OperationTypeDTO operationTypeDTO)
 			throws OHServiceException {
 		LOGGER.info("Update operationtypes code: {}", operationTypeDTO.getCode());
 		OperationType opeType = mapper.map2Model(operationTypeDTO);
 		if (!opeTypeManager.isCodePresent(code))
 			throw new OHAPIException(new OHExceptionMessage(null, "operation Type not found!", OHSeverityLevel.ERROR));
-		boolean isUpdated = opeTypeManager.updateOperationType(opeType);
-		if (!isUpdated)
+		OperationType isUpdated = opeTypeManager.updateOperationType(opeType);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "operation Type is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(opeType.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/patient/mapper/PatientMapper.java b/src/main/java/org/isf/patient/mapper/PatientMapper.java
index fac266361..7d577b85f 100644
--- a/src/main/java/org/isf/patient/mapper/PatientMapper.java
+++ b/src/main/java/org/isf/patient/mapper/PatientMapper.java
@@ -21,6 +21,7 @@
  */
 package org.isf.patient.mapper;
 
+import java.time.ZoneId;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -41,6 +42,10 @@ public PatientMapper() {
 	@Override
 	public PatientDTO map2DTO(Patient fromObj) {
 		PatientDTO patientDTO = super.map2DTO(fromObj);
+		if(fromObj.getBirthDate() != null) {
+			patientDTO.setBirthDate(java.sql.Date.valueOf(fromObj.getBirthDate()));
+		}
+		
 		if (fromObj.getPatientProfilePhoto() != null) {
 			patientDTO.setBlobPhoto(fromObj.getPatientProfilePhoto().getPhoto());
 		}
@@ -61,7 +66,10 @@ public PatientDTO map2DTOWS(Patient fromObj, Boolean status) {
 	public Patient map2Model(PatientDTO toObj) {
 
 		Patient patient = super.map2Model(toObj);
-
+		if(toObj.getBirthDate() != null) {
+			patient.setBirthDate(toObj.getBirthDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+		}
+		
 		if (toObj.getBlobPhoto() != null) {
 			PatientProfilePhoto photo = new PatientProfilePhoto();
 			photo.setPatient(patient);
diff --git a/src/main/java/org/isf/patient/rest/PatientController.java b/src/main/java/org/isf/patient/rest/PatientController.java
index 32f81eedf..77e83f200 100644
--- a/src/main/java/org/isf/patient/rest/PatientController.java
+++ b/src/main/java/org/isf/patient/rest/PatientController.java
@@ -23,6 +23,7 @@
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -85,18 +86,19 @@ public PatientController(PatientBrowserManager patientManager, PatientMapper pat
      * @throws OHServiceException
      */
 	@PostMapping(value = "/patients", produces = MediaType.APPLICATION_JSON_VALUE)
-    ResponseEntity<Integer> newPatient(@RequestBody PatientDTO newPatient) throws OHServiceException {
+    ResponseEntity<PatientDTO> newPatient(@RequestBody PatientDTO newPatient) throws OHServiceException {
         String name = StringUtils.isEmpty(newPatient.getName()) ? newPatient.getFirstName() + " " + newPatient.getSecondName() : newPatient.getName();
 		LOGGER.info("Create patient {}", name);
-        Patient patient = patientManager.savePatient(patientMapper.map2Model(newPatient));
-        if(patient == null){
+		Patient patient = patientMapper.map2Model(newPatient);
+        Patient pat = patientManager.savePatient(patient);
+        if(pat == null){
             throw new OHAPIException(new OHExceptionMessage(null, "Patient is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(patient.getCode());
+        return ResponseEntity.status(HttpStatus.CREATED).body(patientMapper.map2DTO(patient));
 	}
 
 	@PutMapping(value = "/patients/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-    ResponseEntity<Integer> updatePatient(@PathVariable int code, @RequestBody PatientDTO updatePatient) throws OHServiceException {
+    ResponseEntity<PatientDTO> updatePatient(@PathVariable int code, @RequestBody PatientDTO updatePatient) throws OHServiceException {
 		LOGGER.info("Update patient code: {}", code);
 		if (!updatePatient.getCode().equals(code)) {
 			throw new OHAPIException(new OHExceptionMessage(null, "Patient code mismatch", OHSeverityLevel.ERROR));
@@ -111,7 +113,7 @@ ResponseEntity<Integer> updatePatient(@PathVariable int code, @RequestBody Patie
 		if (patient == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Patient is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(patient.getCode());
+        return ResponseEntity.ok(patientMapper.map2DTO(patient));
 	}
 
 	@GetMapping(value = "/patients", produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/src/main/java/org/isf/patvac/rest/PatVacController.java b/src/main/java/org/isf/patvac/rest/PatVacController.java
index b64e9c0a9..332c7b3f0 100644
--- a/src/main/java/org/isf/patvac/rest/PatVacController.java
+++ b/src/main/java/org/isf/patvac/rest/PatVacController.java
@@ -21,8 +21,9 @@
  */
 package org.isf.patvac.rest;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 
 import org.isf.patvac.dto.PatientVaccineDTO;
@@ -73,14 +74,14 @@ public PatVacController(PatVacManager patVacManager, PatVacMapper patientVaccine
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/patientvaccines", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Boolean> newPatientVaccine(@RequestBody PatientVaccineDTO patientVaccineDTO) throws OHServiceException {
+	ResponseEntity<PatientVaccineDTO> newPatientVaccine(@RequestBody PatientVaccineDTO patientVaccineDTO) throws OHServiceException {
 		int code = patientVaccineDTO.getCode();
 		LOGGER.info("Create patient vaccine {}", code);
-		boolean isCreated = patVacManager.newPatientVaccine(mapper.map2Model(patientVaccineDTO));
-		if (!isCreated) {
+		PatientVaccine isCreated = patVacManager.newPatientVaccine(mapper.map2Model(patientVaccineDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "patient vaccine is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(true);
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -90,15 +91,15 @@ ResponseEntity<Boolean> newPatientVaccine(@RequestBody PatientVaccineDTO patient
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/patientvaccines/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<Integer> updatePatientVaccinet(@PathVariable Integer code, @RequestBody PatientVaccineDTO patientVaccineDTO)
+	ResponseEntity<PatientVaccineDTO> updatePatientVaccinet(@PathVariable Integer code, @RequestBody PatientVaccineDTO patientVaccineDTO)
 			throws OHServiceException {
 		LOGGER.info("Update patientvaccines code: {}", patientVaccineDTO.getCode());
 		PatientVaccine patvac = mapper.map2Model(patientVaccineDTO);
 		patvac.setLock(0);
-		boolean isUpdated = patVacManager.updatePatientVaccine(patvac);
-		if (!isUpdated)
+		PatientVaccine isUpdated = patVacManager.updatePatientVaccine(patvac);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "patient vaccine is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(patientVaccineDTO.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
@@ -129,12 +130,17 @@ public ResponseEntity<List<PatientVaccineDTO>> getPatientVaccinesByDatesRanges(@
 			@RequestParam Date dateFrom, @RequestParam Date dateTo, @RequestParam char sex, @RequestParam int ageFrom, @RequestParam int ageTo) throws OHServiceException {
 		LOGGER.info("filter patient vaccine by dates ranges");
 		
-		GregorianCalendar datefrom = new GregorianCalendar();
-		GregorianCalendar dateto = new GregorianCalendar();
-        dateto.setTime(dateTo);
-        datefrom.setTime(dateFrom);
+		LocalDateTime dateF = null;
+		if(dateFrom != null) {
+			dateF  = dateFrom.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		
+		LocalDateTime dateT = null;
+		if(dateTo != null) {
+			dateT  = dateTo.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
         
-		List<PatientVaccine> patientVaccines = patVacManager.getPatientVaccine(vaccineTypeCode, vaccineCode, datefrom, dateto, sex, ageFrom, ageTo);
+		List<PatientVaccine> patientVaccines = patVacManager.getPatientVaccine(vaccineTypeCode, vaccineCode, dateF, dateT, sex, ageFrom, ageTo);
 		List<PatientVaccineDTO> patientVaccineDTOs = mapper.map2DTOList(patientVaccines);
 		if (patientVaccineDTOs.isEmpty()) {
 			return ResponseEntity.status(HttpStatus.NO_CONTENT).body(patientVaccineDTOs);
diff --git a/src/main/java/org/isf/pregtreattype/rest/PregnantTreatmentTypeController.java b/src/main/java/org/isf/pregtreattype/rest/PregnantTreatmentTypeController.java
index 8700ad0f8..197cdf5ee 100644
--- a/src/main/java/org/isf/pregtreattype/rest/PregnantTreatmentTypeController.java
+++ b/src/main/java/org/isf/pregtreattype/rest/PregnantTreatmentTypeController.java
@@ -71,16 +71,14 @@ public PregnantTreatmentTypeController(PregnantTreatmentTypeBrowserManager pregT
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/pregnanttreatmenttypes", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newPregnantTreatmentType(@RequestBody PregnantTreatmentTypeDTO pregnantTreatmentTypeDTO) throws OHServiceException {
+	ResponseEntity<PregnantTreatmentTypeDTO> newPregnantTreatmentType(@RequestBody PregnantTreatmentTypeDTO pregnantTreatmentTypeDTO) throws OHServiceException {
 		String code = pregnantTreatmentTypeDTO.getCode();
 		LOGGER.info("Create pregnant treatment Type {}", code);
-		boolean isCreated = pregTreatTypeManager.newPregnantTreatmentType(mapper.map2Model(pregnantTreatmentTypeDTO));
-		PregnantTreatmentType pregTreatTypeCreated = pregTreatTypeManager.getPregnantTreatmentType().stream().filter(pregtreattype -> pregtreattype.getCode().equals(code))
-				.findFirst().orElse(null);
-		if (!isCreated || pregTreatTypeCreated == null) {
+		PregnantTreatmentType isCreated = pregTreatTypeManager.newPregnantTreatmentType(mapper.map2Model(pregnantTreatmentTypeDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "pregnant treatment Type is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(pregTreatTypeCreated.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -90,16 +88,16 @@ ResponseEntity<String> newPregnantTreatmentType(@RequestBody PregnantTreatmentTy
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/pregnanttreatmenttypes/{code}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updatePregnantTreatmentTypet(@PathVariable String code, @RequestBody PregnantTreatmentTypeDTO pregnantTreatmentTypeDTO)
+	ResponseEntity<PregnantTreatmentTypeDTO> updatePregnantTreatmentTypet(@PathVariable String code, @RequestBody PregnantTreatmentTypeDTO pregnantTreatmentTypeDTO)
 			throws OHServiceException {
 		LOGGER.info("Update pregnanttreatmenttypes code: {}", pregnantTreatmentTypeDTO.getCode());
 		PregnantTreatmentType pregTreatType = mapper.map2Model(pregnantTreatmentTypeDTO);
 		if (!pregTreatTypeManager.isCodePresent(code))
 			throw new OHAPIException(new OHExceptionMessage(null, "pregnantTreatment Type not found!", OHSeverityLevel.ERROR));
-		boolean isUpdated = pregTreatTypeManager.updatePregnantTreatmentType(pregTreatType);
-		if (!isUpdated)
+		PregnantTreatmentType isUpdated = pregTreatTypeManager.updatePregnantTreatmentType(pregTreatType);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "pregnantTreatment Type is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(pregTreatType.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/priceslist/rest/PriceListController.java b/src/main/java/org/isf/priceslist/rest/PriceListController.java
index aa80c0121..8fd0be9df 100644
--- a/src/main/java/org/isf/priceslist/rest/PriceListController.java
+++ b/src/main/java/org/isf/priceslist/rest/PriceListController.java
@@ -78,13 +78,13 @@ public PriceListController(PriceListManager priceListManager, PriceListMapper pr
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/pricelists", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newPriceList(@RequestBody PriceListDTO priceListDTO) throws OHServiceException {
+	ResponseEntity<PriceListDTO> newPriceList(@RequestBody PriceListDTO priceListDTO) throws OHServiceException {
 		LOGGER.info("Create price list {}", priceListDTO.getCode());
-		boolean isCreated = priceListManager.newList(mapper.map2Model(priceListDTO));
-		if (!isCreated) {
+		PriceList isCreated = priceListManager.newList(mapper.map2Model(priceListDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "price list is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(priceListDTO.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -94,14 +94,14 @@ ResponseEntity<String> newPriceList(@RequestBody PriceListDTO priceListDTO) thro
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/pricelists/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updatePriceListt(@PathVariable Integer id, @RequestBody PriceListDTO priceListDTO)
+	ResponseEntity<PriceListDTO> updatePriceListt(@PathVariable Integer id, @RequestBody PriceListDTO priceListDTO)
 			throws OHServiceException {
 		LOGGER.info("Update pricelists code: {}", priceListDTO.getCode());
 		PriceList priceList = mapper.map2Model(priceListDTO);
-		boolean isUpdated = priceListManager.updateList(priceList);
-		if (!isUpdated)
+		PriceList isUpdated = priceListManager.updateList(priceList);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "price list is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(priceList.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/pricesothers/dto/PricesOthersDTO.java b/src/main/java/org/isf/pricesothers/dto/PricesOthersDTO.java
index 3eaff963d..4216c8df0 100644
--- a/src/main/java/org/isf/pricesothers/dto/PricesOthersDTO.java
+++ b/src/main/java/org/isf/pricesothers/dto/PricesOthersDTO.java
@@ -21,7 +21,6 @@
  */
 package org.isf.pricesothers.dto;
 
-import javax.persistence.Id;
 import javax.validation.constraints.NotNull;
 
 import io.swagger.annotations.ApiModel;
@@ -30,7 +29,7 @@
 @ApiModel(description = "Class representing a price others")
 public class PricesOthersDTO
 {
-	@Id 
+	
     private int id;
 
 	@NotNull 
diff --git a/src/main/java/org/isf/pricesothers/rest/PricesOthersController.java b/src/main/java/org/isf/pricesothers/rest/PricesOthersController.java
index 72b9be326..3ce817b37 100644
--- a/src/main/java/org/isf/pricesothers/rest/PricesOthersController.java
+++ b/src/main/java/org/isf/pricesothers/rest/PricesOthersController.java
@@ -71,13 +71,13 @@ public PricesOthersController(PricesOthersManager pricesOthersManager, PricesOth
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/pricesothers", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> newPricesOthers(@RequestBody PricesOthersDTO pricesOthersDTO) throws OHServiceException {
+	ResponseEntity<PricesOthersDTO> newPricesOthers(@RequestBody PricesOthersDTO pricesOthersDTO) throws OHServiceException {
 		LOGGER.info("Create prices others {}", pricesOthersDTO.getCode());
-		boolean isCreated = pricesOthersManager.newOther(mapper.map2Model(pricesOthersDTO));
-		if (!isCreated) {
+		PricesOthers isCreated = pricesOthersManager.newOther(mapper.map2Model(pricesOthersDTO));
+		if (isCreated == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "prices others is not created!", OHSeverityLevel.ERROR));
 		}
-		return ResponseEntity.status(HttpStatus.CREATED).body(pricesOthersDTO.getCode());
+		return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 
 	/**
@@ -87,17 +87,17 @@ ResponseEntity<String> newPricesOthers(@RequestBody PricesOthersDTO pricesOthers
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/pricesothers/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-	ResponseEntity<String> updatePricesOtherst(@PathVariable Integer id, @RequestBody PricesOthersDTO pricesOthersDTO)
+	ResponseEntity<PricesOthersDTO> updatePricesOtherst(@PathVariable Integer id, @RequestBody PricesOthersDTO pricesOthersDTO)
 			throws OHServiceException {
 		LOGGER.info("Update pricesothers code: {}", pricesOthersDTO.getCode());
 		PricesOthers pricesOthers = mapper.map2Model(pricesOthersDTO);
 		List<PricesOthers> pricesOthersFounds = pricesOthersManager.getOthers().stream().filter(po -> po.getId() == pricesOthersDTO.getId()).collect(Collectors.toList());
 		if (pricesOthersFounds.isEmpty())
 			return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
-		boolean isUpdated = pricesOthersManager.updateOther(pricesOthers);
-		if (!isUpdated)
+		PricesOthers isUpdated = pricesOthersManager.updateOther(pricesOthers);
+		if (isUpdated == null)
 			throw new OHAPIException(new OHExceptionMessage(null, "prices others is not updated!", OHSeverityLevel.ERROR));
-		return ResponseEntity.ok(pricesOthers.getCode());
+		return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 
 	/**
diff --git a/src/main/java/org/isf/security/LoginApi.java b/src/main/java/org/isf/security/LoginApi.java
index 613aed8fc..a417fb81d 100644
--- a/src/main/java/org/isf/security/LoginApi.java
+++ b/src/main/java/org/isf/security/LoginApi.java
@@ -45,9 +45,9 @@ public class LoginApi {
     /**
      * Implemented by Spring Security
      */
-    @ApiOperation(value = "Login", notes = "Login with the given credentials.")
-    @ApiResponses({@ApiResponse(code = 200, message = "", response = LoginResponse.class)})
-    @PostMapping(value = "/auth/login")
+    //@ApiOperation(value = "Login", notes = "Login with the given credentials.")
+    //@ApiResponses({@ApiResponse(code = 200, message = "", response = LoginResponse.class)})
+    //@PostMapping(value = "/auth/login")
     void login(@Valid @RequestParam String username,  @RequestParam String password) {
     	 throw new IllegalStateException("Add Spring Security to handle authentication");
     }
diff --git a/src/main/java/org/isf/sms/rest/SmsController.java b/src/main/java/org/isf/sms/rest/SmsController.java
index 035d0a523..3a1d87d06 100644
--- a/src/main/java/org/isf/sms/rest/SmsController.java
+++ b/src/main/java/org/isf/sms/rest/SmsController.java
@@ -23,6 +23,8 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -76,13 +78,24 @@ public ResponseEntity<List<SmsDTO>> getAll(
 		LOGGER.info("Fetching the list of sms");
 		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
 		Date from, to;
+		LocalDateTime dateT = null;
+		LocalDateTime dateF = null;
 		try {
 			from = format.parse(dateFrom);
 			to = format.parse(dateTo);
+			if(dateFrom != null) {
+				dateF  = from.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+			}
+			
+			
+			if(dateTo != null) {
+				dateT  = to.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+			}
 		} catch (ParseException e) {
 			throw new OHAPIException(new OHExceptionMessage(null, "Invalid date! Format is yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", OHSeverityLevel.ERROR));
 		}
-		List<Sms> smsList = smsManager.getAll(from, to);
+		
+		List<Sms> smsList = smsManager.getAll(dateF, dateT);
 		List<SmsDTO> mappedSmsList = smsMapper.map2DTOList(smsList);
 		if(mappedSmsList.isEmpty()){
 			LOGGER.info("No sms found");
diff --git a/src/main/java/org/isf/stats/rest/ReportsController.java b/src/main/java/org/isf/stats/rest/ReportsController.java
index 2ac1fe1e6..47e834602 100644
--- a/src/main/java/org/isf/stats/rest/ReportsController.java
+++ b/src/main/java/org/isf/stats/rest/ReportsController.java
@@ -28,7 +28,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.poi.util.IOUtils;
 import org.isf.shared.exceptions.OHAPIException;
 import org.isf.stat.dto.JasperReportResultDto;
 import org.isf.stat.manager.JasperReportsManager;
@@ -44,6 +43,8 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.google.common.io.ByteStreams;
+
 import io.swagger.annotations.Api;
 
 @RestController
@@ -85,9 +86,14 @@ private ResponseEntity<byte[]> getReport(JasperReportResultDto resultDto, HttpSe
 		if (contentType == null) {
 			contentType = "application/octet-stream";
 		}
-
-		byte[] out = IOUtils.toByteArray(resource.getInputStream());
-
+		byte[] out;
+       try {
+    	   out =ByteStreams.toByteArray( resource.getInputStream());
+       }catch (IOException ex) {
+			throw new OHAPIException(new OHExceptionMessage(null, "Failed to load the bytes", OHSeverityLevel.ERROR));
+		}
+		
+		
 		return ResponseEntity.ok()
 				.contentType(MediaType.parseMediaType(contentType))
 				.header(HttpHeaders.CONTENT_DISPOSITION,
diff --git a/src/main/java/org/isf/supplier/rest/SupplierController.java b/src/main/java/org/isf/supplier/rest/SupplierController.java
index c8241c42d..df1fa5448 100644
--- a/src/main/java/org/isf/supplier/rest/SupplierController.java
+++ b/src/main/java/org/isf/supplier/rest/SupplierController.java
@@ -67,15 +67,15 @@ public class SupplierController {
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/suppliers", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Boolean> saveSupplier(@RequestBody @Valid SupplierDTO supplierDTO) throws OHServiceException {
+	public ResponseEntity<SupplierDTO> saveSupplier(@RequestBody @Valid SupplierDTO supplierDTO) throws OHServiceException {
 		LOGGER.info("Saving a new supplier...");
-		boolean isCreated = manager.saveOrUpdate(mapper.map2Model(supplierDTO));
-		if (!isCreated) {
+		Supplier isCreated = manager.saveOrUpdate(mapper.map2Model(supplierDTO));
+		if (isCreated == null) {
 			LOGGER.error("Supplier is not created!");
             throw new OHAPIException(new OHExceptionMessage(null, "Supplier is not created!", OHSeverityLevel.ERROR));
         }
 		LOGGER.info("Supplier saved successfully");
-        return ResponseEntity.status(HttpStatus.CREATED).body(isCreated);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
 	}
 	
 	/**
@@ -85,18 +85,18 @@ public ResponseEntity<Boolean> saveSupplier(@RequestBody @Valid SupplierDTO supp
 	 * @throws OHServiceException
 	 */
 	@PutMapping(value = "/suppliers", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Boolean> updateSupplier(@RequestBody @Valid SupplierDTO supplierDTO) throws OHServiceException {
+	public ResponseEntity<SupplierDTO> updateSupplier(@RequestBody @Valid SupplierDTO supplierDTO) throws OHServiceException {
 		if(supplierDTO.getSupId() == null || manager.getByID(supplierDTO.getSupId()) == null) {
 			throw new OHAPIException(new OHExceptionMessage(null, "Supplier not found!", OHSeverityLevel.ERROR));
 		}
 		LOGGER.info("Updating supplier...");
-		boolean isUpdated = manager.saveOrUpdate(mapper.map2Model(supplierDTO));
-		if (!isUpdated) {
+		Supplier isUpdated = manager.saveOrUpdate(mapper.map2Model(supplierDTO));
+		if (isUpdated == null) {
 			LOGGER.error("Supplier is not updated!");
             throw new OHAPIException(new OHExceptionMessage(null, "Supplier is not updated!", OHSeverityLevel.ERROR));
         }
 		LOGGER.info("Supplier updated successfully");
-        return ResponseEntity.ok(isUpdated);
+        return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 	}
 	
 	/**
diff --git a/src/main/java/org/isf/therapy/dto/TherapyRowDTO.java b/src/main/java/org/isf/therapy/dto/TherapyRowDTO.java
index 1f160b5cf..17fdef785 100644
--- a/src/main/java/org/isf/therapy/dto/TherapyRowDTO.java
+++ b/src/main/java/org/isf/therapy/dto/TherapyRowDTO.java
@@ -35,48 +35,48 @@ public class TherapyRowDTO {
 	@ApiModelProperty(notes="The therapy's ID", example = "1", position = 1)
 	private int therapyID;
 
-	@NotNull(message="the patient is required")
+	//@NotNull(message="the patient is required")
 	@ApiModelProperty(notes="The patient", position = 2)
 	PatientDTO patID;
 
-	@NotNull(message="the start date is require")
+	//@NotNull(message="the start date is require")
 	@ApiModelProperty(notes="The start date of therapy", example = "2020-07-16T14:25:30.002Z", position = 3)
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Date startDate;
 
-	@NotNull(message="the end date is required")
+	//@NotNull(message="the end date is required")
 	@ApiModelProperty(notes="The end date of the therapy", example = "2020-07-30T14:25:30.002Z", position = 4)
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
 	private Date endDate;
 
-	@NotNull(message="the medical's ID is required")
+	//@NotNull(message="the medical's ID is required")
 	@ApiModelProperty(notes="The ID of the medical concerned by the therapy", example = "1", position = 5)
 	private int medicalId;
 
-	@NotNull(message="the quantity is required")
+	//@NotNull(message="the quantity is required")
 	@ApiModelProperty(notes="The quantity of medicals", example = "48", position = 6)
 	private Double qty;
 
-	@NotNull(message="the unit's ID is required")
+	//@NotNull(message="the unit's ID is required")
 	@ApiModelProperty(notes="The unit's ID", example = "1", position = 7)
 	private int unitID;
 
-	@NotNull(message="the frequency in day is required")
+	//@NotNull(message="the frequency in day is required")
 	@ApiModelProperty(notes="The frequency in day", example = "2", position = 8)
 	private int freqInDay;
 
-	@NotNull(message="the frequency in period is required")
+	//@NotNull(message="the frequency in period is required")
 	@ApiModelProperty(notes="The frequency in period", example = "1", position = 9)
 	private int freqInPeriod;
 	
 	@ApiModelProperty(notes="A note for the therapy", example = "Sample note", position = 10)		
 	private String note;
 
-	@NotNull(message="the notify flag is required")
+	//@NotNull(message="the notify flag is required")
 	@ApiModelProperty(notes="the notify flag: 1 if the notification need to be activated, 0 otherwise", example = "0", position = 11)	
 	private int notifyInt;
 
-	@NotNull(message="the sms flag is required")
+	//@NotNull(message="the sms flag is required")
 	@ApiModelProperty(notes="the sms flag: 1 if sms need to be sent to patient, 0 otherwise", example = "0", position = 12)	
 	private int smsInt;
 
diff --git a/src/main/java/org/isf/therapy/mapper/TherapyRowMapper.java b/src/main/java/org/isf/therapy/mapper/TherapyRowMapper.java
index b3a417a2f..a7e272a9c 100644
--- a/src/main/java/org/isf/therapy/mapper/TherapyRowMapper.java
+++ b/src/main/java/org/isf/therapy/mapper/TherapyRowMapper.java
@@ -21,9 +21,13 @@
  */
 package org.isf.therapy.mapper;
 
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.isf.admission.dto.AdmissionDTO;
 import org.isf.medicals.model.Medical;
 import org.isf.patient.dto.PatientDTO;
 import org.isf.patient.mapper.PatientMapper;
@@ -36,12 +40,12 @@
 
 @Component
 public class TherapyRowMapper extends GenericMapper<TherapyRow, TherapyRowDTO> {
-
+	@Autowired
+	private PatientMapper patientMapper = new PatientMapper();
 	public TherapyRowMapper() {
 		super(TherapyRow.class, TherapyRowDTO.class);
 	}
-	@Autowired
-	private PatientMapper patientMapper;
+	
 
 	@Override
 	public TherapyRow map2Model(TherapyRowDTO toObj) {
@@ -53,6 +57,8 @@ public TherapyRow map2Model(TherapyRowDTO toObj) {
 		therapyRow.setMedical(medical);
 		Patient patient = patientMapper.map2Model(toObj.getPatID());
 		therapyRow.setPatient(patient);
+		therapyRow.setStartDate(toObj.getStartDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		therapyRow.setEndDate(toObj.getEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 		return therapyRow;
 	}
 
@@ -64,7 +70,13 @@ public TherapyRowDTO map2DTO(TherapyRow fromObj) {
 		therapyRowDTO.setMedicalId(fromObj.getMedical());
 		PatientDTO patID = patientMapper.map2DTO(fromObj.getPatient());
 		therapyRowDTO.setPatID(patID);
+		Instant instant1 = fromObj.getStartDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date1 = Date.from(instant1);
+		therapyRowDTO.setStartDate(date1);
 		
+		Instant instant2 = fromObj.getEndDate().atZone(ZoneId.systemDefault()).toInstant();
+		Date date2 = Date.from(instant2);
+		therapyRowDTO.setEndDate(date2);
 		return therapyRowDTO;
 	}
 
diff --git a/src/main/java/org/isf/therapy/rest/TherapyController.java b/src/main/java/org/isf/therapy/rest/TherapyController.java
index 5a92e0ca3..a80fe18a5 100644
--- a/src/main/java/org/isf/therapy/rest/TherapyController.java
+++ b/src/main/java/org/isf/therapy/rest/TherapyController.java
@@ -21,6 +21,7 @@
  */
 package org.isf.therapy.rest;
 
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -81,6 +82,10 @@ public class TherapyController {
 	 */
 	@PostMapping(value = "/therapies", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<TherapyRowDTO> newTherapy(@RequestBody TherapyRowDTO thRowDTO) throws OHServiceException {
+		if(thRowDTO.getPatID() == null) {
+			throw new OHAPIException(
+					new OHExceptionMessage(null, "patient not found!", OHSeverityLevel.ERROR));
+		}
 		TherapyRow thRow = therapyRowMapper.map2Model(thRowDTO);
 		thRow = manager.newTherapy(thRow);
 		return ResponseEntity.status(HttpStatus.CREATED).body(therapyRowMapper.map2DTO(thRow));
@@ -93,10 +98,10 @@ public ResponseEntity<TherapyRowDTO> newTherapy(@RequestBody TherapyRowDTO thRow
 	 * @throws OHServiceException 
 	 */
 	@PostMapping(value = "/therapies/replace", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Boolean> replaceTherapies(@RequestBody @Valid List<TherapyRowDTO> thRowDTOs) throws OHServiceException {
+	public ResponseEntity<TherapyRow> replaceTherapies(@RequestBody @Valid List<TherapyRowDTO> thRowDTOs) throws OHServiceException {
 		ArrayList<TherapyRow> therapies = (ArrayList<TherapyRow>)therapyRowMapper.map2ModelList(thRowDTOs);
-		boolean done = manager.newTherapies(therapies);
-		if(done) {
+		TherapyRow done = manager.newTherapy(therapies.get(0));
+		if(done != null) {
 			return ResponseEntity.status(HttpStatus.CREATED).body(done);
 		} else {
 			throw new OHAPIException(new OHExceptionMessage(null, "Therapies are not replaced!", OHSeverityLevel.ERROR));
diff --git a/src/main/java/org/isf/vaccine/rest/VaccineController.java b/src/main/java/org/isf/vaccine/rest/VaccineController.java
index 19997f845..eac9e69b5 100644
--- a/src/main/java/org/isf/vaccine/rest/VaccineController.java
+++ b/src/main/java/org/isf/vaccine/rest/VaccineController.java
@@ -109,18 +109,18 @@ public ResponseEntity<List<VaccineDTO>> getVaccinesByVaccineTypeCode(@PathVariab
      * @throws OHServiceException
      */
     @PostMapping(value = "/vaccines", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newVaccine(@RequestBody VaccineDTO newVaccine) throws OHServiceException {
+    public ResponseEntity<VaccineDTO> newVaccine(@RequestBody VaccineDTO newVaccine) throws OHServiceException {
         LOGGER.info("Create vaccine: {}", newVaccine.toString());
-        boolean isCreated;
+        Vaccine isCreated;
         try {
-             isCreated = vaccineManager.newVaccine(mapper.map2Model(newVaccine)) != null;
+             isCreated = vaccineManager.newVaccine(mapper.map2Model(newVaccine));
         } catch (OHDataIntegrityViolationException e) {
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine type already present!", OHSeverityLevel.ERROR));
         }
-        if (!isCreated) {
+        if (isCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
     }
 
     /**
@@ -131,13 +131,13 @@ public ResponseEntity newVaccine(@RequestBody VaccineDTO newVaccine) throws OHSe
      * @throws OHServiceException
      */
     @PutMapping(value = "/vaccines", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateVaccine(@RequestBody VaccineDTO updateVaccine) throws OHServiceException {
+    public ResponseEntity<VaccineDTO> updateVaccine(@RequestBody VaccineDTO updateVaccine) throws OHServiceException {
         LOGGER.info("Update vaccine: {}", updateVaccine.toString());
-        boolean isUpdated = vaccineManager.updateVaccine(mapper.map2Model(updateVaccine)) != null;
-        if (!isUpdated) {
+        Vaccine isUpdated = vaccineManager.updateVaccine(mapper.map2Model(updateVaccine));
+        if (isUpdated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(null);
+        return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 
     }
 
diff --git a/src/main/java/org/isf/vactype/rest/VaccineTypeController.java b/src/main/java/org/isf/vactype/rest/VaccineTypeController.java
index 7016a5aeb..91e408123 100644
--- a/src/main/java/org/isf/vactype/rest/VaccineTypeController.java
+++ b/src/main/java/org/isf/vactype/rest/VaccineTypeController.java
@@ -90,18 +90,18 @@ public ResponseEntity<List<VaccineTypeDTO>> getVaccineType() throws OHServiceExc
      * @throws OHServiceException
      */
     @PostMapping(value = "/vaccinetype", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newVaccineType(@RequestBody VaccineTypeDTO newVaccineType) throws OHServiceException {
+    public ResponseEntity<VaccineTypeDTO> newVaccineType(@RequestBody VaccineTypeDTO newVaccineType) throws OHServiceException {
         LOGGER.info("Create vaccine type: {}", newVaccineType.toString());
-        boolean isCreated;
+        VaccineType isCreated;
         try {
             isCreated = vaccineTypeManager.newVaccineType(mapper.map2Model(newVaccineType));
         }catch(OHDataIntegrityViolationException e){
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine type already present!", OHSeverityLevel.ERROR));
         }
-        if (!isCreated) {
+        if (isCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine type is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(isCreated));
     }
 
     /**
@@ -112,13 +112,13 @@ public ResponseEntity newVaccineType(@RequestBody VaccineTypeDTO newVaccineType)
      * @throws OHServiceException
      */
     @PutMapping(value = "/vaccinetype", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateVaccineType(@RequestBody VaccineTypeDTO updateVaccineType) throws OHServiceException {
+    public ResponseEntity<VaccineTypeDTO> updateVaccineType(@RequestBody VaccineTypeDTO updateVaccineType) throws OHServiceException {
         LOGGER.info("Update vaccine type: {}", updateVaccineType.toString());
-        boolean isUpdated = vaccineTypeManager.updateVaccineType(mapper.map2Model(updateVaccineType));
-        if (!isUpdated) {
+        VaccineType isUpdated = vaccineTypeManager.updateVaccineType(mapper.map2Model(updateVaccineType));
+        if (isUpdated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Vaccine type is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(null);
+        return ResponseEntity.ok(mapper.map2DTO(isUpdated));
 
     }
 
diff --git a/src/main/java/org/isf/visits/rest/VisitsController.java b/src/main/java/org/isf/visits/rest/VisitsController.java
index 45234d394..c81338ee6 100644
--- a/src/main/java/org/isf/visits/rest/VisitsController.java
+++ b/src/main/java/org/isf/visits/rest/VisitsController.java
@@ -21,9 +21,15 @@
  */
 package org.isf.visits.rest;
 
+
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import org.isf.examination.dto.PatientExaminationDTO;
+import org.isf.examination.model.PatientExamination;
 import org.isf.shared.exceptions.OHAPIException;
 import org.isf.utils.exception.OHServiceException;
 import org.isf.utils.exception.model.OHExceptionMessage;
@@ -75,7 +81,15 @@ public VisitsController(VisitManager visitManager, VisitMapper visitMapper) {
     public ResponseEntity<List<VisitDTO>> getVisit(@PathVariable("patID") int patID) throws OHServiceException {
         LOGGER.info("Get visit related to patId: {}", patID);
         List<Visit> visit = visitManager.getVisits(patID);
-        List<VisitDTO> listVisit = mapper.map2DTOList(visit);
+        List<VisitDTO> listVisit = new ArrayList<VisitDTO>();
+        for(Visit visitP : visit) {	
+			VisitDTO visitDTO =  mapper.map2DTO(visitP);
+    		Instant instant = visitP.getDate().atZone(ZoneId.systemDefault()).toInstant();
+        	Date date = (Date) Date.from(instant);
+        	visitDTO.setDate(date);
+        	listVisit.add(visitDTO);
+    			
+    	}
         if (listVisit.isEmpty()) {
             return ResponseEntity.status(HttpStatus.NO_CONTENT).body(null);
         } else {
@@ -91,10 +105,12 @@ public ResponseEntity<List<VisitDTO>> getVisit(@PathVariable("patID") int patID)
      * @throws OHServiceException
      */
     @PostMapping(value = "/visit", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Integer> newVisit(@RequestBody VisitDTO newVisit) throws OHServiceException {
+    public ResponseEntity<VisitDTO> newVisit(@RequestBody VisitDTO newVisit) throws OHServiceException {
 	    LOGGER.info("Create Visit: {}", newVisit);
-        Visit visit = visitManager.newVisit(mapper.map2Model(newVisit));
-        return ResponseEntity.status(HttpStatus.CREATED).body(visit.getVisitID()); //TODO: verify if it's correct
+	    Visit visitD = mapper.map2Model(newVisit);
+	    visitD.setDate(newVisit.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+        Visit visit = visitManager.newVisit(visitD);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(visit)); //TODO: verify if it's correct
     }
 
     /**
@@ -150,7 +166,7 @@ public ResponseEntity<VisitDTO> updateVisit(@PathVariable("visitID") int visitID
         	return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
         
         Visit visitUp = mapper.map2Model(updateVisit);
-        
+        visitUp.setDate(updateVisit.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
         //Visit visitUpdate = visitManager.updateVisit(visitUp);
         Visit visitUpdate = visitManager.newVisit(visitUp);
         if(visitUpdate == null)
diff --git a/src/main/java/org/isf/ward/rest/WardController.java b/src/main/java/org/isf/ward/rest/WardController.java
index bc7195d69..745934a66 100644
--- a/src/main/java/org/isf/ward/rest/WardController.java
+++ b/src/main/java/org/isf/ward/rest/WardController.java
@@ -126,13 +126,13 @@ public ResponseEntity<Integer> getCurrentOccupation(@PathVariable String code) t
      * @throws OHServiceException
      */
     @PostMapping(value = "/wards", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity newWard(@RequestBody WardDTO newWard) throws OHServiceException {
+    public ResponseEntity<WardDTO> newWard(@RequestBody WardDTO newWard) throws OHServiceException {
 	    LOGGER.info("Create Ward: {}", newWard);
         Ward wardCreated = wardManager.newWard(mapper.map2Model(newWard));
         if (wardCreated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Ward is not created!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(null);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.map2DTO(wardCreated));
     }
 
     /**
@@ -143,7 +143,7 @@ public ResponseEntity newWard(@RequestBody WardDTO newWard) throws OHServiceExce
      * @throws OHServiceException
      */
     @PutMapping(value = "/wards", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity updateWard(@RequestBody WardDTO updateWard) throws OHServiceException {
+    public ResponseEntity<WardDTO> updateWard(@RequestBody WardDTO updateWard) throws OHServiceException {
 	    LOGGER.info("Update ward with code: {}", updateWard.getCode());
 	    Ward ward = mapper.map2Model(updateWard);
 	    ward.setLock(0);
@@ -151,7 +151,7 @@ public ResponseEntity updateWard(@RequestBody WardDTO updateWard) throws OHServi
         if (wardUpdated == null) {
             throw new OHAPIException(new OHExceptionMessage(null, "Ward is not updated!", OHSeverityLevel.ERROR));
         }
-        return ResponseEntity.ok(null);
+        return ResponseEntity.ok(mapper.map2DTO(wardUpdated));
 
     }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 129ae7dc5..2df4ae6ee 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,10 +1,10 @@
-logging.file=oh-rest-api.log
 # logging.level.org.springframework.web=DEBUG
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%t %a "%r" %s (%D ms)
 spring.jpa.hibernate.use-new-id-generator-mappings=false
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-server.context-path=/oh-api
-#spring.main.allow-bean-definition-overriding=true
+server.servlet.context-path=/oh-api
+spring.main.allow-bean-definition-overriding=true
 api.host=localhost:8080
-api.protocol=http
\ No newline at end of file
+api.protocol=http
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
\ No newline at end of file
diff --git a/src/test/java/org/isf/accounting/rest/BillControllerTest.java b/src/test/java/org/isf/accounting/rest/BillControllerTest.java
index 358eb22c2..d76c80450 100644
--- a/src/test/java/org/isf/accounting/rest/BillControllerTest.java
+++ b/src/test/java/org/isf/accounting/rest/BillControllerTest.java
@@ -28,8 +28,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -41,6 +41,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -469,7 +470,7 @@ public void when_post_searchBillsByItem_with_valid_dates_and_billItemsDTO_conten
 		//TODO add test(s) with incorrect formatted dates returning an exception
 		//TODO add test(s) with specific dates returning an empty list and asserting  HttpStatus.NO_CONTENT
 		//TODO add test(s) with different BillItem returning an empty list and asserting  HttpStatus.NO_CONTENT
-		when(billManagerMock.getBills(any(GregorianCalendar.class), any(GregorianCalendar.class), eq(billItem))).thenReturn(billList);
+		when(billManagerMock.getBills(any(LocalDateTime.class), any(LocalDateTime.class), eq(billItem))).thenReturn(billList);
 
 		this.mockMvc
 				.perform(
@@ -500,7 +501,7 @@ public void when_get_searchBills_with_valid_dates_and_valid_patient_code_and_Pat
 		//TODO add test(s) with incorrect formatted dates returning an exception
 		//TODO add test(s) with specific dates returning an empty list and asserting  HttpStatus.NO_CONTENT
 		//TODO add test(s) with a different patient returning an empty list and asserting  HttpStatus.NO_CONTENT
-		when(billManagerMock.getBills(any(GregorianCalendar.class), any(GregorianCalendar.class), eq(patient))).thenReturn(billList);
+		when(billManagerMock.getBills(any(LocalDateTime.class), any(LocalDateTime.class), eq(patient))).thenReturn(billList);
 
 		this.mockMvc
 				.perform(
diff --git a/src/test/java/org/isf/admission/rest/AdmissionControllerTest.java b/src/test/java/org/isf/admission/rest/AdmissionControllerTest.java
index 46da2d15f..f0a84f57a 100644
--- a/src/test/java/org/isf/admission/rest/AdmissionControllerTest.java
+++ b/src/test/java/org/isf/admission/rest/AdmissionControllerTest.java
@@ -22,8 +22,8 @@
 package org.isf.admission.rest;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -32,8 +32,11 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.GregorianCalendar;
+import java.util.Calendar;
+import java.util.Date;
 
 import org.isf.admission.data.AdmissionHelper;
 import org.isf.admission.dto.AdmissionDTO;
@@ -197,7 +200,7 @@ public void testGetAdmittedPatients_200() throws Exception {
 		//GregorianCalendar[] dischargeRange = null;
 		String searchTerms = "";
 		//when(admissionManagerMock.getAdmittedPatients(admissionRange, dischargeRange, searchTerms))
-		when(admissionManagerMock.getAdmittedPatients(any(GregorianCalendar[].class), any(GregorianCalendar[].class), any(String.class)))
+		when(admissionManagerMock.getAdmittedPatients(any(LocalDateTime[].class), any(LocalDateTime[].class), any(String.class)))
 				.thenReturn(admittedPatients);
 
 		MvcResult result = this.mockMvc
@@ -330,13 +333,16 @@ public void testDischargeAdmission_200() throws Exception {
 			String code = "B";
 			DischargeType dischargeType = DischargeTypeHelper.setup(code);
 			admission.setAdmitted(0);
-			admission.setDisDate(new GregorianCalendar());
+			Calendar cal = Calendar.getInstance();
+	        Date input = cal.getTime();
+	        LocalDateTime la = input.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+			admission.setDisDate(la);
 			admission.setDiseaseOut1(disease1);
 			admission.setDiseaseOut1(disease2);
 			admission.setDiseaseOut1(disease3);
 			admission.setDisType(dischargeType);
 			
-			when(admissionManagerMock.updateAdmission(admission)).thenReturn(true);
+			when(admissionManagerMock.updateAdmission(admission));
 			
 			AdmissionDTO admDTO = admissionMapper.map2DTO(admission);	
 			this.mockMvc
@@ -450,10 +456,8 @@ public void testUpdateAdmissions() throws Exception {
 		when(pregTraitTypeManagerMock.getPregnantTreatmentType())
 				.thenReturn(pregTTypes);
 
-		boolean isUpdated = true;
 
-		when(admissionManagerMock.updateAdmission(update))
-				.thenReturn(isUpdated);
+		when(admissionManagerMock.updateAdmission(update));
 
 		MvcResult result = this.mockMvc
 				.perform(put(request)
diff --git a/src/test/java/org/isf/disease/rest/DiseaseControllerTest.java b/src/test/java/org/isf/disease/rest/DiseaseControllerTest.java
index 41b46de1b..e304a99f2 100644
--- a/src/test/java/org/isf/disease/rest/DiseaseControllerTest.java
+++ b/src/test/java/org/isf/disease/rest/DiseaseControllerTest.java
@@ -263,7 +263,7 @@ public void testGetAllDiseases_200() throws Exception {
 	public void testGetDiseaseByCode() throws Exception {
 		String request = "/diseases/{code}";
 
-		int code = 1;
+		String code = "1";
 
 		Disease disease = DiseaseHelper.setup();
 		when(diseaseBrowserManagerMock.getDiseaseByCode(code))
@@ -339,7 +339,7 @@ public void testUpdateDisease_201() throws Exception {
 	public void testDeleteDisease() throws Exception {
 		String request = "/diseases/{code}";
 
-		int code = 1;
+		String code = "1";
 
 		Disease disease = DiseaseHelper.setup();
 		DiseaseDTO body = diseaseMapper.map2DTO(disease);
diff --git a/src/test/java/org/isf/lab/data/LaboratoryForPrintHelper.java b/src/test/java/org/isf/lab/data/LaboratoryForPrintHelper.java
new file mode 100644
index 000000000..3ee123c3e
--- /dev/null
+++ b/src/test/java/org/isf/lab/data/LaboratoryForPrintHelper.java
@@ -0,0 +1,5 @@
+package org.isf.lab.data;
+
+public class LaboratoryForPrintHelper {
+
+}
diff --git a/src/test/java/org/isf/lab/data/LaboratoryHelper.java b/src/test/java/org/isf/lab/data/LaboratoryHelper.java
new file mode 100644
index 000000000..3fb95cc0f
--- /dev/null
+++ b/src/test/java/org/isf/lab/data/LaboratoryHelper.java
@@ -0,0 +1,61 @@
+package org.isf.lab.data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.isf.accounting.data.BillHelper;
+import org.isf.accounting.model.Bill;
+import org.isf.exa.model.Exam;
+import org.isf.lab.dto.LaboratoryDTO;
+import org.isf.lab.model.Laboratory;
+import org.isf.lab.test.TestLaboratory;
+import org.isf.patient.model.Patient;
+import org.isf.utils.exception.OHException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class LaboratoryHelper {
+	public static Laboratory setup() throws OHException {
+		Patient patient = new Patient();
+		boolean usingSet = true;
+		Exam exam = new Exam();
+		return new TestLaboratory().setup( exam,  patient, usingSet);
+	}
+	public static Laboratory setup(Integer id) throws OHException {
+		Laboratory lab = LaboratoryHelper.setup();
+		lab.setCode(id);
+		return lab;
+	}
+
+
+	public static String asJsonString(LaboratoryDTO body) {
+		// TODO Auto-generated method stub
+		try {
+			return new ObjectMapper().writeValueAsString(body);
+		} catch (JsonProcessingException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	public static List<Laboratory> genList(int n) {
+
+		return IntStream.range(0, n)
+				.mapToObj(i -> {
+					try {
+						return LaboratoryHelper.setup(i);
+					} catch (OHException e) {
+						e.printStackTrace();
+					}
+					return null;
+				}).collect(Collectors.toList());
+
+	}
+
+	public static ArrayList<Laboratory> genArrayList(int n) {
+		return new ArrayList<>(LaboratoryHelper.genList(n));
+	}
+
+}
diff --git a/src/test/java/org/isf/lab/data/LaboratoryRowHelper.java b/src/test/java/org/isf/lab/data/LaboratoryRowHelper.java
new file mode 100644
index 000000000..803891030
--- /dev/null
+++ b/src/test/java/org/isf/lab/data/LaboratoryRowHelper.java
@@ -0,0 +1,29 @@
+package org.isf.lab.data;
+
+import org.isf.lab.dto.LaboratoryRowDTO;
+import org.isf.lab.model.Laboratory;
+import org.isf.lab.model.LaboratoryRow;
+import org.isf.lab.test.TestLaboratoryRow;
+import org.isf.utils.exception.OHException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class LaboratoryRowHelper {
+	public static LaboratoryRow setup() throws OHException {
+		Laboratory lab = new Laboratory();
+		boolean usingSet = true;
+		return new TestLaboratoryRow().setup(lab, usingSet);
+	}
+
+
+	public static String asJsonString(LaboratoryRowDTO body) {
+		// TODO Auto-generated method stub
+		try {
+			return new ObjectMapper().writeValueAsString(body);
+		} catch (JsonProcessingException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/src/test/java/org/isf/lab/rest/LaboratoryControllerTest.java b/src/test/java/org/isf/lab/rest/LaboratoryControllerTest.java
new file mode 100644
index 000000000..89378c57b
--- /dev/null
+++ b/src/test/java/org/isf/lab/rest/LaboratoryControllerTest.java
@@ -0,0 +1,150 @@
+package org.isf.lab.rest;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.log;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.isf.exa.manager.ExamBrowsingManager;
+import org.isf.lab.data.LaboratoryHelper;
+import org.isf.lab.dto.LaboratoryDTO;
+import org.isf.lab.manager.LabManager;
+import org.isf.lab.mapper.LaboratoryForPrintMapper;
+import org.isf.lab.mapper.LaboratoryMapper;
+import org.isf.lab.mapper.LaboratoryRowMapper;
+import org.isf.lab.model.Laboratory;
+import org.isf.patient.data.PatientHelper;
+import org.isf.patient.manager.PatientBrowserManager;
+import org.isf.patient.model.Patient;
+import org.isf.shared.exceptions.OHResponseEntityExceptionHandler;
+import org.isf.shared.mapper.converter.BlobToByteArrayConverter;
+import org.isf.shared.mapper.converter.ByteArrayToBlobConverter;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.modelmapper.ModelMapper;
+import org.slf4j.Logger;
+import org.springframework.http.MediaType;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+public class LaboratoryControllerTest {
+	
+	private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(LaboratoryControllerTest.class);
+
+	@Mock
+	protected LabManager labBrowserManagerMock;
+	@Mock
+    protected LabManager laboratoryManager;
+
+	@Mock
+    protected ExamBrowsingManager examManager;
+
+	@Mock
+    private PatientBrowserManager patientBrowserManager;
+
+	@Mock
+    private LaboratoryMapper laboratoryMapper;
+
+	@Mock
+    private LaboratoryRowMapper laboratoryRowMapper;
+
+	@Mock
+    private LaboratoryForPrintMapper laboratoryForPrintMapper;
+	
+	protected LaboratoryMapper labMapper = new LaboratoryMapper();
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		MockitoAnnotations.initMocks(this);
+		this.mockMvc = MockMvcBuilders
+				.standaloneSetup(new LaboratoryController(laboratoryManager, patientBrowserManager, examManager, laboratoryMapper, laboratoryRowMapper, laboratoryForPrintMapper))
+				.setControllerAdvice(new OHResponseEntityExceptionHandler())
+				.build();
+		ModelMapper modelMapper = new ModelMapper();
+		modelMapper.addConverter(new BlobToByteArrayConverter());
+		modelMapper.addConverter(new ByteArrayToBlobConverter());
+		ReflectionTestUtils.setField(laboratoryMapper, "modelMapper", modelMapper);
+	}
+
+	@Test
+	public void testNewLaboratory_201() throws Exception {
+		String request = "/laboratories";
+		
+		Laboratory lab = LaboratoryHelper.setup();
+		ArrayList<String> labRows =new ArrayList<String>();
+		labRows.add("good");
+		labRows.add("material");
+		LaboratoryDTO body = laboratoryMapper.map2DTO(lab);
+		when(laboratoryManager.newLaboratory(laboratoryMapper.map2Model(body), labRows));
+		MvcResult result = this.mockMvc
+				.perform(post(request)
+						.contentType(MediaType.APPLICATION_JSON)
+				)
+				.andDo(log())
+				.andExpect(status().is2xxSuccessful())
+				.andExpect(status().isCreated())
+				.andReturn();
+
+		LOGGER.debug("result: {}", result);
+	}
+	
+	@Test
+	public void testUpdateLaboratory_201() throws Exception {
+		String request = "/laboratories/{code}";
+		Integer code = 5;
+		
+		Laboratory lab = LaboratoryHelper.setup();
+		ArrayList<String> labRows =new ArrayList<String>();
+		labRows.add("lab");
+		labRows.add("material");
+		lab.setCode(code);
+		LaboratoryDTO body = laboratoryMapper.map2DTO(lab);
+		when(laboratoryManager.updateLaboratory(laboratoryMapper.map2Model(body), labRows));
+		MvcResult result = this.mockMvc
+				.perform(put(request, code)
+						.contentType(MediaType.APPLICATION_JSON)
+				)
+				.andDo(log())
+				.andExpect(status().is2xxSuccessful())
+				.andExpect(status().isCreated())
+				.andReturn();
+
+		LOGGER.debug("result: {}", result);
+	}
+	
+	@Test
+	public void testGetLaboratory_201() throws Exception {
+		String request = "/laboratories/byPatientId/{patId}";
+		Integer patId = 5;
+		
+		Patient patient =PatientHelper.setup();
+		when(patientBrowserManager.getPatientById(patId)).thenReturn(patient);
+		List<Laboratory> labList = LaboratoryHelper.genArrayList(4);
+		when(laboratoryManager.getLaboratory(patient)).thenReturn(labList);
+		MvcResult result = this.mockMvc
+				.perform(get(request,patId)
+						.contentType(MediaType.APPLICATION_JSON)
+				)
+				.andDo(log())
+				.andExpect(status().is2xxSuccessful())
+				.andExpect(status().isOk())
+				.andExpect(content().string(containsString(laboratoryMapper.map2DTOList(labList).toString())))
+				.andReturn();
+
+		LOGGER.debug("result: {}", result);
+	}
+
+}
diff --git a/src/test/java/org/isf/opd/rest/OpdControllerTest.java b/src/test/java/org/isf/opd/rest/OpdControllerTest.java
index de139e62d..70b55aade 100644
--- a/src/test/java/org/isf/opd/rest/OpdControllerTest.java
+++ b/src/test/java/org/isf/opd/rest/OpdControllerTest.java
@@ -28,7 +28,7 @@
 
 public class OpdControllerTest {
 	
-	private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(DeliveryTypeControllerTest.class);
+	private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(OpdControllerTest.class);
 
 	@Mock
 	protected OpdBrowserManager opdBrowserManagerMock;
@@ -57,9 +57,7 @@ public void testNewOperation_201() throws Exception {
 		Opd opd = OpdHelper.setup();
 		OpdDTO body = opdMapper.map2DTO(opd);
 
-		boolean isCreated = true;
-		when(opdBrowserManagerMock.newOpd(opdMapper.map2Model(body)))
-				.thenReturn(isCreated);
+		when(opdBrowserManagerMock.newOpd(opdMapper.map2Model(body)));
 		MvcResult result = this.mockMvc
 				.perform(post(request)
 						.contentType(MediaType.APPLICATION_JSON)
diff --git a/src/test/java/org/isf/operation/rest/OperationControllerTest.java b/src/test/java/org/isf/operation/rest/OperationControllerTest.java
index 2ce576893..166d8c83c 100644
--- a/src/test/java/org/isf/operation/rest/OperationControllerTest.java
+++ b/src/test/java/org/isf/operation/rest/OperationControllerTest.java
@@ -71,9 +71,7 @@ public void testNewOperation_201() throws Exception {
 		when(operationBrowserManagerMock.descriptionControl(body.getDescription(), body.getType().getCode()))
 				.thenReturn(false);
 
-		boolean isCreated = true;
-		when(operationBrowserManagerMock.newOperation(operationMapper.map2Model(body)))
-				.thenReturn(isCreated);
+		when(operationBrowserManagerMock.newOperation(operationMapper.map2Model(body)));
 		when(operationBrowserManagerMock.getOperationByCode(code))
 		    .thenReturn(operation);
 		MvcResult result = this.mockMvc
@@ -100,9 +98,7 @@ public void testUpdateOperation_200() throws Exception {
 		when(operationBrowserManagerMock.isCodePresent(code))
 				.thenReturn(true);
 
-		boolean isUpdated = true;
-		when(operationBrowserManagerMock.updateOperation(operation))
-				.thenReturn(isUpdated);
+		when(operationBrowserManagerMock.updateOperation(operation));
 
 		MvcResult result = this.mockMvc
 				.perform(put(request, code)
diff --git a/src/test/java/org/isf/patient/rest/PatientControllerTest.java b/src/test/java/org/isf/patient/rest/PatientControllerTest.java
index 8f73c6088..cf698303e 100644
--- a/src/test/java/org/isf/patient/rest/PatientControllerTest.java
+++ b/src/test/java/org/isf/patient/rest/PatientControllerTest.java
@@ -28,8 +28,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/src/test/java/org/isf/vactype/rest/VaccineTypeControllerTest.java b/src/test/java/org/isf/vactype/rest/VaccineTypeControllerTest.java
index d9dfdb995..a04aa3224 100644
--- a/src/test/java/org/isf/vactype/rest/VaccineTypeControllerTest.java
+++ b/src/test/java/org/isf/vactype/rest/VaccineTypeControllerTest.java
@@ -108,9 +108,7 @@ public void testNewVaccineType_200() throws Exception {
 		String code = "ZZ";
 		VaccineTypeDTO body = vaccineTypeMapper.map2DTO(VaccineTypeHelper.setup(code));
 
-		boolean isCreated = true;
-		when(vaccineTypeBrowserManagerMock.newVaccineType(vaccineTypeMapper.map2Model(body)))
-				.thenReturn(isCreated);
+		when(vaccineTypeBrowserManagerMock.newVaccineType(vaccineTypeMapper.map2Model(body)));
 
 		MvcResult result = this.mockMvc
 				.perform(post(request)
@@ -131,9 +129,8 @@ public void testUpdateVaccineType_200() throws Exception {
 		String code = "ZZ";
 		VaccineTypeDTO body = vaccineTypeMapper.map2DTO(VaccineTypeHelper.setup(code));
 
-		boolean isUpdated = true;
-		when(vaccineTypeBrowserManagerMock.updateVaccineType(vaccineTypeMapper.map2Model(body)))
-				.thenReturn(isUpdated);
+		
+		when(vaccineTypeBrowserManagerMock.updateVaccineType(vaccineTypeMapper.map2Model(body)));
 
 		MvcResult result = this.mockMvc
 				.perform(put(request)