Merge 739d5b4 into a850bb6

SoftmedTanzania · Nov 10, 2021 · be2157a · be2157a
2 parents a850bb6 + 739d5b4
commit be2157a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 42 deletions.
diff --git a/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrCPTRequest.java b/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrCPTRequest.java
@@ -25,9 +25,6 @@ public class HdrCPTRequest {
     @JsonProperty("cpt_description")
     private String cptDescription;
 
-    @JsonProperty("status")
-    private String status;
-
     public int getCptCategoryCodeId() {
         return cptCategoryCodeId;
     }
@@ -84,11 +81,4 @@ public void setCptDescription(String cptDescription) {
         this.cptDescription = cptDescription;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }
diff --git a/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrICD10Request.java b/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrICD10Request.java
@@ -33,9 +33,6 @@ public class HdrICD10Request {
     @JsonProperty("icd10_sub_code_description")
     private String icd10SubCodeDescription;
 
-    @JsonProperty("status")
-    private String status;
-
     public int getIcd10CodeCategoryId() {
         return icd10CodeCategoryId;
     }
@@ -116,11 +113,4 @@ public void setIcd10SubCodeDescription(String icd10SubCodeDescription) {
         this.icd10SubCodeDescription = icd10SubCodeDescription;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }
diff --git a/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrResponse.java b/src/main/java/tz/go/moh/him/hdr/mediator/emr/domain/HdrResponse.java
@@ -12,14 +12,6 @@ public class HdrResponse {
     @JsonProperty("Status")
     private int status;
 
-    /**
-     * The HDR ICD10 Category ID.
-     */
-    @SerializedName("CategoryId")
-    @JsonProperty("CategoryId")
-    private int categoryId;
-
-
     /**
      * The Response Message.
      */
@@ -34,9 +26,8 @@ public class HdrResponse {
     @JsonProperty("MessageType")
     private String messageType;
 
-    public HdrResponse(int status, int categoryId, String message, String messaType) {
+    public HdrResponse(int status,String message, String messaType) {
         this.status = status;
-        this.categoryId = categoryId;
         this.message = message;
         this.messageType = messaType;
     }
@@ -52,14 +43,6 @@ public void setStatus(int status) {
         this.status = status;
     }
 
-    public int getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(int categoryId) {
-        this.categoryId = categoryId;
-    }
-
     public String getMessage() {
         return message;
     }

diff --git a/src/main/java/tz/go/moh/him/hdr/mediator/emr/orchestrators/CPTInboundOrchestrator.java b/src/main/java/tz/go/moh/him/hdr/mediator/emr/orchestrators/CPTInboundOrchestrator.java
@@ -24,11 +24,11 @@ public void onReceive(Object msg) throws Exception {
 
                 HdrCPTRequest HdrCPTRequest = mapper.readValue(((MediatorHTTPRequest) msg).getBody(), HdrCPTRequest.class);
 
-                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_OK, HdrCPTRequest.getCptCategoryCodeId(), "Success", "CPT");
+                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_OK, "Success", "CPT");
 
                 finishRequest = new FinishRequest(new Gson().toJson(hdrResponse), "text/json", HttpStatus.SC_OK);
             } catch (Exception e) {
-                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_BAD_REQUEST, 0, "Failed", "CPT");
+                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_BAD_REQUEST, "Failed", "CPT");
                 finishRequest = new FinishRequest(new Gson().toJson(hdrResponse), "text/json", HttpStatus.SC_BAD_REQUEST);
             } finally {
                 ((MediatorHTTPRequest) msg).getRequestHandler().tell(finishRequest, getSelf());

diff --git a/src/main/java/tz/go/moh/him/hdr/mediator/emr/orchestrators/ICD10InboundOrchestrator.java b/src/main/java/tz/go/moh/him/hdr/mediator/emr/orchestrators/ICD10InboundOrchestrator.java
@@ -25,11 +25,11 @@ public void onReceive(Object msg) throws Exception {
 
                 HdrICD10Request hdrICD10Request = mapper.readValue(((MediatorHTTPRequest) msg).getBody(), HdrICD10Request.class);
 
-                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_OK, hdrICD10Request.getIcd10CodeCategoryId(), "Success", "ICD10");
+                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_OK, "Success", "ICD10");
 
                 finishRequest = new FinishRequest(new Gson().toJson(hdrResponse), "text/json", HttpStatus.SC_OK);
             } catch (Exception e) {
-                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_BAD_REQUEST, 0, "Failed", "ICD10");
+                HdrResponse hdrResponse = new HdrResponse(HttpStatus.SC_BAD_REQUEST, "Failed", "ICD10");
                 finishRequest = new FinishRequest(new Gson().toJson(hdrResponse), "text/json", HttpStatus.SC_BAD_REQUEST);
             } finally {
                 ((MediatorHTTPRequest) msg).getRequestHandler().tell(finishRequest, getSelf());