Skip to content

Added the Signature for hwc #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vanitha1822 merged 3 commits into from
Jan 9, 2026
Merged

Added the Signature for hwc #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dcc05c
fix:prescription drug for hwc
vishwab1 Jan 9, 2026
565a568
fix:doctor signature
vishwab1 Jan 9, 2026
11badd8
fix:doctor signature
vishwab1 Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
*/
package com.iemr.hwc.controller.anc;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -35,6 +40,7 @@
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down Expand Up @@ -118,7 +124,23 @@ public String saveBenANCDoctorData(@RequestBody String requestObj,
if (jsnOBJ != null) {
Long r = ancService.saveANCDoctorData(jsnOBJ, Authorization);
if (r != null && r > 0) {
response.setResponse("Data saved successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data saved successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setError(5000, "Unable to save data");
}
Expand Down Expand Up @@ -540,7 +562,23 @@ public String updateANCDoctorData(@RequestBody String requestObj,
try {
Long result = ancService.updateANCDoctorData(jsnOBJ, Authorization);
if (null != result && result > 0) {
response.setResponse("Data updated successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data updated successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setError(500, "Unable to modify data");
}
Expand Down
43 changes: 41 additions & 2 deletions src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
*/
package com.iemr.hwc.controller.cancerscreening;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -34,6 +39,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down Expand Up @@ -119,7 +126,23 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
if (jsnOBJ != null) {
Long csDocDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningDoctorData(jsnOBJ, Authorization);
if (csDocDataSaveSuccessFlag != null && csDocDataSaveSuccessFlag > 0) {
response.setResponse("Data saved successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data saved successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setError(5000, "Unable to save data");
}
Expand Down Expand Up @@ -574,7 +597,23 @@ public String updateCancerScreeningDoctorData(@RequestBody String requestObj) {
try {
int result = cSServiceImpl.updateCancerScreeningDoctorData(jsnOBJ);
if (result > 0) {
response.setResponse("Data updated successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data updated successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setError(500, "Unable to modify data");
}
Expand Down
42 changes: 40 additions & 2 deletions src/main/java/com/iemr/hwc/controller/covid19/CovidController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
*/
package com.iemr.hwc.controller.covid19;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.json.JSONObject;
Expand All @@ -37,6 +39,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down Expand Up @@ -109,7 +113,24 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj,
if (jsnOBJ != null) {
Long ncdCareRes = covid19ServiceImpl.saveDoctorData(jsnOBJ, Authorization);
if (null != ncdCareRes && ncdCareRes > 0) {
response.setResponse("Data saved successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data saved successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);

} else {
response.setResponse("Unable to save data");
}
Expand Down Expand Up @@ -348,7 +369,24 @@ public String updateCovid19DoctorData(@RequestBody String requestObj,
try {
Long result = covid19ServiceImpl.updateCovid19DoctorData(jsnOBJ, Authorization);
if (null != result && result > 0) {
response.setResponse("Data updated successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data updated successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);

} else {
response.setError(500, "Unable to modify data");
}
Expand Down
47 changes: 45 additions & 2 deletions src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
*/
package com.iemr.hwc.controller.generalOPD;

import java.util.ArrayList;
import java.util.HashMap;

import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -35,12 +38,20 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.iemr.hwc.service.generalOPD.GeneralOPDServiceImpl;
import com.iemr.hwc.utils.response.OutputResponse;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.gson.Gson;
import com.google.gson.JsonArray;

import io.swagger.v3.oas.annotations.Operation;

/***
Expand Down Expand Up @@ -118,7 +129,23 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj,
if (jsnOBJ != null) {
Long genOPDRes = generalOPDServiceImpl.saveDoctorData(jsnOBJ, Authorization);
if (null != genOPDRes && genOPDRes > 0) {
response.setResponse("Data saved successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data saved successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setResponse("Unable to save data");
}
Expand Down Expand Up @@ -422,7 +449,23 @@ public String updateGeneralOPDDoctorData(@RequestBody String requestObj,
try {
Long result = generalOPDServiceImpl.updateGeneralOPDDoctorData(jsnOBJ, Authorization);
if (null != result && result > 0) {
response.setResponse("Data updated successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data updated successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);
} else {
response.setError(500, "Unable to modify data");
}
Expand Down
42 changes: 40 additions & 2 deletions src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
*/
package com.iemr.hwc.controller.ncdCare;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.json.JSONObject;
Expand All @@ -37,6 +39,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
Expand Down Expand Up @@ -114,7 +118,24 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj,
if (jsnOBJ != null) {
Long ncdCareRes = ncdCareServiceImpl.saveDoctorData(jsnOBJ, Authorization);
if (null != ncdCareRes && ncdCareRes > 0) {
response.setResponse("Data saved successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data saved successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);

} else {
response.setResponse("Unable to save data");
}
Expand Down Expand Up @@ -353,7 +374,24 @@ public String updateNCDCareDoctorData(@RequestBody String requestObj,
try {
Long result = ncdCareServiceImpl.updateNCDCareDoctorData(jsnOBJ, Authorization);
if (null != result && result > 0) {
response.setResponse("Data updated successfully");
// Extract drug IDs from JsonObject
List<Long> prescribedDrugIDs = new ArrayList<>();
if (jsnOBJ.has("savedDrugIDs") && !jsnOBJ.get("savedDrugIDs").isJsonNull()) {
JsonArray drugIDsArray = jsnOBJ.getAsJsonArray("savedDrugIDs");
for (int j = 0; j < drugIDsArray.size(); j++) {
prescribedDrugIDs.add(drugIDsArray.get(j).getAsLong());
}
}

// Create response with message and IDs
Map<String, Object> responseData = new HashMap<>();
responseData.put("message", "Data updated successfully");
responseData.put("prescribedDrugIDs", prescribedDrugIDs);

Gson gson = new Gson();
String responseJson = gson.toJson(responseData);
response.setResponse(responseJson);

} else {
response.setError(500, "Unable to modify data");
}
Expand Down
Loading