AMM-1266 and lmpDateformat corrected (#59)

* AMM-1204

* AMM-1340

* AMM-1266 and lmpDate&EDD date corrected

* variable name corrected

Author: ravishanigarapu

src/main/java/com/iemr/ecd/controller/outboundworklist/OutBoundWorklistController.java

@@ -21,6 +21,7 @@
 */
 package com.iemr.ecd.controller.outboundworklist;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iemr.ecd.dao_temp.FetchChildOutboundWorklist;
 import com.iemr.ecd.dao_temp.FetchMotherOutboundWorklist;
 import com.iemr.ecd.service.outbound_worklist.OutboundWorkListServiceImpl;
@@ -60,8 +63,12 @@ public class OutBoundWorklistController {
 			@ApiResponse(responseCode = CustomExceptionResponse.INTERNAL_SERVER_ERROR_SC_V, description = CustomExceptionResponse.INTERNAL_SERVER_ERROR_SC),
 			@ApiResponse(responseCode = CustomExceptionResponse.DB_EXCEPTION_SC_V, description = CustomExceptionResponse.DB_EXCEPTION_SC),
 			@ApiResponse(responseCode = CustomExceptionResponse.BAD_REQUEST_SC_V, description = CustomExceptionResponse.BAD_REQUEST_SC) })
-	public ResponseEntity<List<FetchMotherOutboundWorklist>> getMotherWorklist(@PathVariable int userId) {
-		return new ResponseEntity<>(outboundWorkListServiceImpl.getMotherWorkList(userId), HttpStatus.OK);
+	public ResponseEntity<String> getMotherWorklist(@PathVariable int userId) throws JsonProcessingException {
+		List<FetchMotherOutboundWorklist> motherWorkList = outboundWorkListServiceImpl.getMotherWorkList(userId);
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+		String resp = objectMapper.writeValueAsString(motherWorkList);
+		return  new ResponseEntity<>(resp,HttpStatus.OK);
 	}
 
 	@GetMapping(value = "/get-child-data/{userId}", produces = MediaType.APPLICATION_JSON_VALUE)

src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java

@@ -173,16 +173,6 @@ public String closeCall(CallClosureDTO request) {
 
 				}
 
-				if (request.getIsHrp() != null) {
-					callObj.setIsHighRisk(request.getIsHrp());
-					/*
-					 * if (null != obj.getReceivedRoleName() &&
-					 * (obj.getReceivedRoleName().equalsIgnoreCase(Constants.ANM) ||
-					 * obj.getReceivedRoleName().equalsIgnoreCase(Constants.ASSOCIATE))) {
-					 * callObj.setCallStatus(Constants.OPEN); }
-					 */
-				}
-
 				if (request.getIsHrni() != null) {
 					callObj.setIsHrni(request.getIsHrni());
 				}
@@ -216,6 +206,12 @@ public String closeCall(CallClosureDTO request) {
 					callObj.setCallAttemptNo(0);
 					callObj.setAllocationStatus(Constants.UNALLOCATED);
 				}
+				if (request.getIsHrp() != null) {
+					callObj.setIsHighRisk(request.getIsHrp());
+					if(obj.getReceivedRoleName().equalsIgnoreCase(Constants.ANM)){
+						callObj.setCallStatus(Constants.OPEN);
+					}
+				}
 				outboundCallsRepo.save(callObj);
 			} else
 				throw new ECDException(