Merge pull request #34 from SoftmedTanzania/new_payloads

changes in inbound payload
SoftmedTanzania · Nov 10, 2021 · 92abab3 · 92abab3
2 parents a850bb6 + b8bcb5c
commit 92abab3
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 140 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
@@ -4,68 +4,32 @@
 
 public class HdrCPTRequest {
 
-    @JsonProperty("cpt_category_code_id")
-    private int cptCategoryCodeId;
+    @JsonProperty("cpt_category_description")
+    private String cptCategoryDescription;
 
-    @JsonProperty("cpt_code_category_description")
-    private String cptCodeCategoryDescription;
-
-    @JsonProperty("cpt_code_sub_category_id")
-    private int cptCodeSubCategoryId;
-
-    @JsonProperty("cpt_code_sub_category_description")
-    private String cptCodeSubCategoryDescription;
-
-    @JsonProperty("cpt_code_id")
-    private int cptCodeId;
+    @JsonProperty("cpt_sub_category_description")
+    private String cptSubCategoryDescription;
 
     @JsonProperty("cpt_code")
     private String cptCode;
 
-    @JsonProperty("cpt_description")
-    private String cptDescription;
-
-    @JsonProperty("status")
-    private String status;
-
-    public int getCptCategoryCodeId() {
-        return cptCategoryCodeId;
-    }
-
-    public void setCptCategoryCodeId(int cptCategoryCodeId) {
-        this.cptCategoryCodeId = cptCategoryCodeId;
-    }
-
-    public String getCptCodeCategoryDescription() {
-        return cptCodeCategoryDescription;
-    }
-
-    public void setCptCodeCategoryDescription(String cptCodeCategoryDescription) {
-        this.cptCodeCategoryDescription = cptCodeCategoryDescription;
-    }
-
-    public int getCptCodeSubCategoryId() {
-        return cptCodeSubCategoryId;
-    }
-
-    public void setCptCodeSubCategoryId(int cptCodeSubCategoryId) {
-        this.cptCodeSubCategoryId = cptCodeSubCategoryId;
-    }
+    @JsonProperty("cpt_code_description")
+    private String cptCodeDescription;
 
-    public String getCptCodeSubCategoryDescription() {
-        return cptCodeSubCategoryDescription;
+    public String getCptCategoryDescription() {
+        return cptCategoryDescription;
     }
 
-    public void setCptCodeSubCategoryDescription(String cptCodeSubCategoryDescription) {
-        this.cptCodeSubCategoryDescription = cptCodeSubCategoryDescription;
+    public void setCptCategoryDescription(String cptCategoryDescription) {
+        this.cptCategoryDescription = cptCategoryDescription;
     }
 
-    public int getCptCodeId() {
-        return cptCodeId;
+    public String getCptSubCategoryDescription() {
+        return cptSubCategoryDescription;
     }
 
-    public void setCptCodeId(int cptCodeId) {
-        this.cptCodeId = cptCodeId;
+    public void setCptSubCategoryDescription(String cptSubCategoryDescription) {
+        this.cptSubCategoryDescription = cptSubCategoryDescription;
     }
 
     public String getCptCode() {
@@ -76,19 +40,11 @@ public void setCptCode(String cptCode) {
         this.cptCode = cptCode;
     }
 
-    public String getCptDescription() {
-        return cptDescription;
-    }
-
-    public void setCptDescription(String cptDescription) {
-        this.cptDescription = cptDescription;
-    }
-
-    public String getStatus() {
-        return status;
+    public String getCptCodeDescription() {
+        return cptCodeDescription;
     }
 
-    public void setStatus(String status) {
-        this.status = status;
+    public void setCptCodeDescription(String cptCodeDescription) {
+        this.cptCodeDescription = cptCodeDescription;
     }
 }
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
@@ -3,61 +3,52 @@
 
 public class HdrICD10Request {
 
-    @JsonProperty("icd10_code_category_id")
-    private int icd10CodeCategoryId;
+    @JsonProperty("icd10_category_identifier")
+    private String icd10CategoryIdentifier;
 
     @JsonProperty("icd10_category_description")
-    private String icd10CodeCategoryDescription;
+    private String icd10CategoryDescription;
 
-    @JsonProperty("icd10_sub_category_id")
-    private int icd10SubCategoryId;
+    @JsonProperty("icd10_sub_category_identifier")
+    private String icd10SubCategoryIdentifier;
 
     @JsonProperty("icd10_sub_category_description")
     private String icd10SubCategoryDescription;
 
-    @JsonProperty("icd10_id")
-    private int icd10Id;
-
     @JsonProperty("icd10_code")
     private String icd10Code;
 
-    @JsonProperty("icd10_description")
-    private String icd10Description;
-
-    @JsonProperty("icd10_sub_code_id")
-    private int icd10SubCodeId;
+    @JsonProperty("icd10_code_description")
+    private String icd10CodeDescription;
 
     @JsonProperty("icd10_sub_code")
     private String icd10SubCode;
 
     @JsonProperty("icd10_sub_code_description")
     private String icd10SubCodeDescription;
 
-    @JsonProperty("status")
-    private String status;
-
-    public int getIcd10CodeCategoryId() {
-        return icd10CodeCategoryId;
+    public String getIcd10CategoryIdentifier() {
+        return icd10CategoryIdentifier;
     }
 
-    public void setIcd10CodeCategoryId(int icd10CodeCategoryId) {
-        this.icd10CodeCategoryId = icd10CodeCategoryId;
+    public void setIcd10CategoryIdentifier(String icd10CategoryIdentifier) {
+        this.icd10CategoryIdentifier = icd10CategoryIdentifier;
     }
 
-    public String getIcd10CodeCategoryDescription() {
-        return icd10CodeCategoryDescription;
+    public String getIcd10CategoryDescription() {
+        return icd10CategoryDescription;
     }
 
-    public void setIcd10CodeCategoryDescription(String icd10CodeCategoryDescription) {
-        this.icd10CodeCategoryDescription = icd10CodeCategoryDescription;
+    public void setIcd10CategoryDescription(String icd10CategoryDescription) {
+        this.icd10CategoryDescription = icd10CategoryDescription;
     }
 
-    public int getIcd10SubCategoryId() {
-        return icd10SubCategoryId;
+    public String getIcd10SubCategoryIdentifier() {
+        return icd10SubCategoryIdentifier;
     }
 
-    public void setIcd10SubCategoryId(int icd10SubCategoryId) {
-        this.icd10SubCategoryId = icd10SubCategoryId;
+    public void setIcd10SubCategoryIdentifier(String icd10SubCategoryIdentifier) {
+        this.icd10SubCategoryIdentifier = icd10SubCategoryIdentifier;
     }
 
     public String getIcd10SubCategoryDescription() {
@@ -68,14 +59,6 @@ public void setIcd10SubCategoryDescription(String icd10SubCategoryDescription) {
         this.icd10SubCategoryDescription = icd10SubCategoryDescription;
     }
 
-    public int getIcd10Id() {
-        return icd10Id;
-    }
-
-    public void setIcd10Id(int icd10Id) {
-        this.icd10Id = icd10Id;
-    }
-
     public String getIcd10Code() {
         return icd10Code;
     }
@@ -84,20 +67,12 @@ public void setIcd10Code(String icd10Code) {
         this.icd10Code = icd10Code;
     }
 
-    public String getIcd10Description() {
-        return icd10Description;
+    public String getIcd10CodeDescription() {
+        return icd10CodeDescription;
     }
 
-    public void setIcd10Description(String icd10Description) {
-        this.icd10Description = icd10Description;
-    }
-
-    public int getIcd10SubCodeId() {
-        return icd10SubCodeId;
-    }
-
-    public void setIcd10SubCodeId(int icd10SubCodeId) {
-        this.icd10SubCodeId = icd10SubCodeId;
+    public void setIcd10CodeDescription(String icd10CodeDescription) {
+        this.icd10CodeDescription = icd10CodeDescription;
     }
 
     public String getIcd10SubCode() {
@@ -115,12 +90,4 @@ public String getIcd10SubCodeDescription() {
     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());