Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d0d8b00
chore: remove common_local.properties.bkp
vishwab1 Sep 10, 2026
aaf9fd7
Merge pull request #338 from PSMRI/vb/remove-bkp-file
SauravBizbRolly Sep 10, 2026
60d6b16
fix hbnc visit isssue
SauravBizbRolly Sep 21, 2026
316ac0e
fix hbnc visit isssue
SauravBizbRolly Sep 21, 2026
dcacbd6
Merge pull request #349 from PSMRI/fix/hbnc_sync_issue
SauravBizbRolly Sep 21, 2026
87510b6
commit release-3.11.0
SauravBizbRolly Sep 22, 2026
f1f9970
commit release-3.11.0
SauravBizbRolly Sep 22, 2026
e71d470
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
171dfea
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
474980a
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
03fdf4e
Merge pull request #351 from PSMRI/fix/code_issue
SauravBizbRolly Sep 22, 2026
a07fdf2
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
c047293
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
c1a43f0
adolescentHealth issue fix
SauravBizbRolly Sep 22, 2026
0ff3706
add variable in common_example.properties
SauravBizbRolly Sep 22, 2026
6335f0f
fix mda synch issue
SauravBizbRolly Sep 22, 2026
3bdade8
Merge pull request #354 from PSMRI/fix/add_stop_tb_missing_variable_i…
SauravBizbRolly Sep 22, 2026
fce90d4
Merge pull request #352 from PSMRI/fix/adoselent_issue_fix
SauravBizbRolly Sep 22, 2026
c91e5e0
Merge pull request #344 from PSMRI/release-3.10.0
vishwab1 Sep 25, 2026
6d550b0
Merge pull request #339 from PSMRI/release-3.8.3
SauravBizbRolly Sep 25, 2026
a46784f
tb screen api changes
SauravBizbRolly Sep 28, 2026
59adb7d
tb screen api changes
SauravBizbRolly Sep 28, 2026
5272ef7
tb screen api changes
SauravBizbRolly Sep 28, 2026
a96c988
tb screen api changes
SauravBizbRolly Sep 28, 2026
6220f27
new api for tb referral follow up feature
SauravBizbRolly Sep 29, 2026
cd1af6b
new api for tb referral follow up feature
SauravBizbRolly Sep 29, 2026
4963ba8
new api for tb referral follow up feature
SauravBizbRolly Sep 29, 2026
5db0853
new api for tb referral follow up feature
SauravBizbRolly Sep 29, 2026
14a7cf7
new api for tb referral follow up feature
SauravBizbRolly Sep 29, 2026
5be34a8
add sync date and sync by column in every table
SauravBizbRolly Sep 29, 2026
1fc4688
new feature for tb tpt follow up
SauravBizbRolly Sep 30, 2026
01d5c3f
new feature for tb tpt follow up
SauravBizbRolly Sep 30, 2026
4c26b1f
new feature for tb tpt follow up
SauravBizbRolly Sep 30, 2026
1fd54ab
new feature for tb tpt follow up
SauravBizbRolly Sep 30, 2026
7c7d2ea
new feature for tb tpt follow up
SauravBizbRolly Sep 30, 2026
537520b
new feature for tb tpt follow up
SauravBizbRolly Oct 1, 2026
d0f7bc4
fix jsy incentive issue
SauravBizbRolly Oct 1, 2026
4f43175
fix jsy incentive issue
SauravBizbRolly Oct 1, 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
49 changes: 49 additions & 0 deletions src/main/environment/common_example.properties
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,52 @@ abha.xcmid=<sbx-or-prod>



# Diagnostic providers

# Provider names: use the values supported by your application
diagnostic.provider.xray=<XRAY_PROVIDER>
diagnostic.provider.truenat=<TRUENAT_PROVIDER>

# EMR Lite - Xray (base URL without trailing slash)
diagnostic.emrlite.xray.base-url=https://<EMRLITE_HOST>
diagnostic.emrlite.xray.login-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/login/
diagnostic.emrlite.xray.refresh-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/getAccessToken/
diagnostic.emrlite.xray.order-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/
diagnostic.emrlite.xray.result-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/result/
diagnostic.emrlite.xray.ping-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
diagnostic.emrlite.xray.username=<XRAY_USERNAME>
diagnostic.emrlite.xray.password=<XRAY_PASSWORD>

# EMR Lite - Truenat
diagnostic.emrlite.truenat.base-url=https://<EMRLITE_HOST>
diagnostic.emrlite.truenat.login-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/login/
diagnostic.emrlite.truenat.refresh-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/getAccessToken/
diagnostic.emrlite.truenat.order-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/
diagnostic.emrlite.truenat.result-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/result/
diagnostic.emrlite.truenat.ping-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/ping/
diagnostic.emrlite.truenat.username=<TRUENAT_USERNAME>
diagnostic.emrlite.truenat.password=<TRUENAT_PASSWORD>

# Token TTL: replace with vendor-configured durations in seconds
diagnostic.emrlite.refresh-ttl-seconds=86400

# Example: polling every 60 seconds
diagnostic.poll.xray.tick-ms=60000
diagnostic.poll.truenat.tick-ms=60000

# Example: daily expiry at 11:59 PM in scheduler timezone
diagnostic.poll.expiry-cron=0 59 23 * * *

# Local folder (Windows: use forward slashes)
diagnostic.documents.storage-root=C:/amrit/diagnostic-documents
stoptb.enforce.vanid=false
# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
stoptb.van.id=0



# GovThealth API Config
govthealth.user.details.url=@env.GOVTHEALTH_USER_DETAILS_URL@
govthealth.user.id=@env.GOVTHEALTH_USER_ID@
govthealth.password=@env.GOVTHEALTH_PASSWORD@
common-api-base-url=
116 changes: 0 additions & 116 deletions src/main/environment/common_local.properties.bkp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.iemr.flw.controller;

import com.google.gson.Gson;
import com.iemr.flw.domain.iemr.AdolescentHealth;
import com.iemr.flw.dto.identity.GetBenRequestHandler;
import com.iemr.flw.dto.iemr.AdolescentHealthDTO;
Expand All @@ -8,10 +9,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.List;
Expand All @@ -27,7 +25,7 @@ public class AdolescentHealthController {
private AdolescentHealthService adolescentHealthService;

@RequestMapping(value = "/saveAll", method = RequestMethod.POST, headers = "Authorization")
public ResponseEntity<Map<String,Object>> saveAdolescentHealth(@RequestBody AdolescentHealthDTO adolescentHealthDTO) {
public ResponseEntity<Map<String,Object>> saveAdolescentHealth(@RequestBody AdolescentHealthDTO adolescentHealthDTO,@RequestHeader(value = "JwtToken") String token) {
Map<String,Object> response = new HashMap<>();

try {
Expand All @@ -52,25 +50,61 @@ public ResponseEntity<Map<String,Object>> saveAdolescentHealth(@RequestBody Ado

}

@RequestMapping(value = "/getAll",method = RequestMethod.POST, headers = "Authorization")
public ResponseEntity<Map<String,Object>> getAllAdolescentHealth(@RequestBody GetBenRequestHandler getBenRequestHandler) {
Map<String,Object> response = new HashMap<>();
@RequestMapping(
value = "/getAll",
method = RequestMethod.POST,
headers = "Authorization"
)
public ResponseEntity<Map<String, Object>> getAllAdolescentHealth(
@RequestBody GetBenRequestHandler getBenRequestHandler) {

Map<String, Object> response = new HashMap<>();
long startTime = System.currentTimeMillis();
logger.info("========================================");

logger.info("getAllAdolescentHealth API called");
logger.info("========================================");

try {
List<AdolescentHealth> resultList = adolescentHealthService.getAllAdolescentHealth(getBenRequestHandler);

logger.info("getAllAdolescentHealth request: {}",
new Gson().toJson(getBenRequestHandler));

logger.debug("Fetching adolescent health records");

List<AdolescentHealth> resultList =
adolescentHealthService.getAllAdolescentHealth(getBenRequestHandler);

int recordCount = resultList == null ? 0 : resultList.size();

logger.info(
"getAllAdolescentHealth: fetched {} records",
recordCount
);

if (resultList != null && !resultList.isEmpty()) {
response.put("statusCode",200);
response.put("statusCode", 200);
response.put("data", resultList);
} else {
logger.warn("getAllAdolescentHealth: no records returned");

response.put("statusCode", 500);
response.put("error", "Invalid/NULL request obj");
}
} catch (Exception e) {
logger.error("Error in get data : " + e);
response.put("statusCode",500);
response.put("error","Error in get data : " + e);
// Logs the exception along with its full stack trace.
logger.error("getAllAdolescentHealth: failed to fetch records", e);

response.put("statusCode", 500);
response.put("error", "Unable to fetch adolescent health records");
} finally {
logger.info(
"getAllAdolescentHealth completed: statusCode={}, durationMs={}",
response.get("statusCode"),
System.currentTimeMillis() - startTime
);
}

return ResponseEntity.ok(response);
}
}
Loading
Loading