From 50dc8bad084561fdebfe35b9f8f30627ddbe6a10 Mon Sep 17 00:00:00 2001
From: chetansaroya <chetan.saroya@unthinkable.co>
Date: Tue, 6 Oct 2026 18:33:54 +0530
Subject: [PATCH 1/3] feat: stop-542 extra fields consumer changes

---
 pom.xml                                       | 264 +++++++++---------
 .../environment/common_example.properties     |  47 ++--
 .../service/impl/BeneficiaryServiceImpl.java  |  40 +--
 .../flw/service/impl/StopTBServiceImpl.java   |  28 +-
 4 files changed, 204 insertions(+), 175 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fc0bc731..d7ba21d7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.iemr.common.flw</groupId>
-    <artifactId>flw-api</artifactId>
-    <version>3.12.0</version>
-    <packaging>war</packaging>
+	<groupId>com.iemr.common.flw</groupId>
+	<artifactId>flw-api</artifactId>
+	<version>3.12.0</version>
+	<packaging>war</packaging>
 
-    <name>FLW-API</name>
-    <description>Iemr Flw Service</description>
+	<name>FLW-API</name>
+	<description>Iemr Flw Service</description>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.2</version>
-        <relativePath />
-    </parent>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <build.timestamp>${maven.build.timestamp}</build.timestamp>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <java.version>17</java.version>
-        <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
-        <org.projectlombok.version>1.16.18</org.projectlombok.version>
-        <environment>${ENV_VAR}</environment>
-        <target-properties>target/classes/application.properties</target-properties>
-        <source-properties>target/classes/common_${environment}.properties</source-properties>
-        <maven.test.skip>true</maven.test.skip>
-        <sonar.java.binaries>target</sonar.java.binaries>
-    </properties>
-    <dependencies>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>3.2.2</version>
+		<relativePath />
+	</parent>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<build.timestamp>${maven.build.timestamp}</build.timestamp>
+		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+		<java.version>17</java.version>
+		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
+		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
+		<org.projectlombok.version>1.16.18</org.projectlombok.version>
+		<environment>example</environment>
+		<target-properties>target/classes/application.properties</target-properties>
+		<source-properties>target/classes/common_${environment}.properties</source-properties>
+		<maven.test.skip>true</maven.test.skip>
+		<sonar.java.binaries>target</sonar.java.binaries>
+	</properties>
+	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -56,10 +56,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-		<dependency> 
-			<groupId>co.elastic.logging</groupId> 
-			<artifactId>logback-ecs-encoder</artifactId> 
-			<version>1.3.2</version> 
+		<dependency>
+			<groupId>co.elastic.logging</groupId>
+			<artifactId>logback-ecs-encoder</artifactId>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -234,10 +234,10 @@
 			<artifactId>tomcat-jdbc</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>org.modelmapper</groupId>
-            <artifactId>modelmapper</artifactId>
-            <version>2.4.4</version>
-        </dependency>
+			<groupId>org.modelmapper</groupId>
+			<artifactId>modelmapper</artifactId>
+			<version>2.4.4</version>
+		</dependency>
 		<!-- end newly added dependencies -->
 		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
 		<dependency>
@@ -261,56 +261,56 @@
 		</dependency>
 	</dependencies>
 
-    <profiles>
-        <profile>
-            <id>1097_flw</id>
-            <properties>
-                <final-name>1097flwapi-v1.0</final-name>
-                <target-properties>target/classes/application.properties</target-properties>
-                <source-properties>src/main/environment/1097_${environment}.properties</source-properties>
-            </properties>
-            <build>
-                <finalName>1097flwapi-v1.0</finalName>
-            </build>
-        </profile>
-    </profiles>
+	<profiles>
+		<profile>
+			<id>1097_flw</id>
+			<properties>
+				<final-name>1097flwapi-v1.0</final-name>
+				<target-properties>target/classes/application.properties</target-properties>
+				<source-properties>src/main/environment/1097_${environment}.properties</source-properties>
+			</properties>
+			<build>
+				<finalName>1097flwapi-v1.0</finalName>
+			</build>
+		</profile>
+	</profiles>
 
 
 
-    <build>
-        <finalName>${artifactId}-${version}</finalName>
-        <plugins>
-			
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version><!--$NO-MVN-MAN-VER$ -->
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                        <path>
-                            <groupId>org.mapstruct</groupId>
-                            <artifactId>mapstruct-processor</artifactId>
-                            <version>${org.mapstruct.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
+	<build>
+		<finalName>${artifactId}-${version}</finalName>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version><!--$NO-MVN-MAN-VER$ -->
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
+						</path>
+						<path>
+							<groupId>org.mapstruct</groupId>
+							<artifactId>mapstruct-processor</artifactId>
+							<version>${org.mapstruct.version}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -363,31 +363,31 @@
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version><!--$NO-MVN-MAN-VER$ -->
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <id>properties-updated</id>
-                        <configuration>
-                            <target>
-                                <echo>
-                                    concatinating properties file ${target-properties} and
-                                    ${source-properties}
-                                </echo>
-                                <concat destfile="${target-properties}" append="yes"
-                                        force="yes">
-                                    <fileset file="${source-properties}">
-                                    </fileset>
-                                </concat>
-                            </target>
-                        </configuration>
-                    </execution>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version><!--$NO-MVN-MAN-VER$ -->
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>properties-updated</id>
+						<configuration>
+							<target>
+								<echo>
+									concatinating properties file ${target-properties} and
+									${source-properties}
+								</echo>
+								<concat destfile="${target-properties}" append="yes"
+										force="yes">
+									<fileset file="${source-properties}">
+									</fileset>
+								</concat>
+							</target>
+						</configuration>
+					</execution>
 					<execution>
 						<phase>process-resources</phase>
 						<goals>
@@ -402,16 +402,16 @@
 							</tasks>
 						</configuration>
 					</execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <testFailureIgnore>true</testFailureIgnore>
-                </configuration>
-            </plugin>
-            <!--<plugin>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<testFailureIgnore>true</testFailureIgnore>
+				</configuration>
+			</plugin>
+			<!--<plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
@@ -435,15 +435,15 @@
 					</execution>
 				</executions>
 			</plugin>
-        </plugins>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.20.1</version>
-            </plugin>
-        </plugins>
-    </reporting>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.20.1</version>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index a1d4ebe55..79534d598 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -7,14 +7,14 @@ tm-url=http://localhost:8089/
 
 spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
 spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ##--------------------------------------------## Secondary db-------------------------------------------------------------------
 
 secondary.datasource.url=jdbc:mysql://localhost:3306/db_identity
 secondary.datasource.username=root
-secondary.datasource.password=1234
+secondary.datasource.password=root
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 springdoc.api-docs.enabled=true
@@ -50,45 +50,48 @@ abha.token.url=<abha-token-url>
 abha.xcmid=<sbx-or-prod>
 
 # GovThealth API Config
-govthealth.user.details.url=${GOVTHEALTH_USER_DETAILS_URL}
-govthealth.user.id=${GOVTHEALTH_USER_ID}
-govthealth.password=${GOVTHEALTH_PASSWORD}
+govthealth.user.details.url=$GOVTHEALTH_USER_DETAILS_URL}
+govthealth.user.id=$GOVTHEALTH_USER_ID}
+govthealth.password=$GOVTHEALTH_PASSWORD}
 
 # ── Diagnostic Device Integration ────────────────────────────────────────────
+# diagnostic.active-provider must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode (currently: EMRLITE)
+diagnostic.active-provider=EMRLITE
 # diagnostic.provider.xray / diagnostic.provider.truenat select the vendor per orderType family
 # (XRAY_CHEST vs MTB/MTB_PLUS/MDR_RIF), each must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode
-diagnostic.provider.xray=${DIAGNOSTIC_PROVIDER_XRAY}
-diagnostic.provider.truenat=${DIAGNOSTIC_PROVIDER_TRUENAT}
+diagnostic.provider.xray=EMRLITE
+diagnostic.provider.truenat=EMRLITE
 
-# EMR Lite - xray group (same base-url as truenat for now; split so a distinct vendor/tenant can be
+# EMR Lite - xray group (base-url same as truenat for now; split so a distinct vendor/tenant can be
 # swapped in for either group later without a code change)
-diagnostic.emrlite.xray.base-url=${DIAGNOSTIC_EMRLITE_XRAY_BASE_URL}
+diagnostic.emrlite.xray.base-url=http://152.67.167.101:8000
 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.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/cancel/
-diagnostic.emrlite.xray.username=${DIAGNOSTIC_EMRLITE_XRAY_USERNAME}
-diagnostic.emrlite.xray.password=${DIAGNOSTIC_EMRLITE_XRAY_PASSWORD}
+diagnostic.emrlite.xray.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
+diagnostic.emrlite.xray.username=piramal
+diagnostic.emrlite.xray.password=piramal@123
+
 
 # EMR Lite - truenat group (MTB/MTB_PLUS/MDR_RIF); same value as xray for now
-diagnostic.emrlite.truenat.base-url=${DIAGNOSTIC_EMRLITE_TRUENAT_BASE_URL}
+diagnostic.emrlite.truenat.base-url=http://152.67.167.101:8000
 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.cancel-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/cancel/
-diagnostic.emrlite.truenat.username=${DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME}
-diagnostic.emrlite.truenat.password=${DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD}
+diagnostic.emrlite.truenat.username=piramal
+diagnostic.emrlite.truenat.password=piramal@123
 
-diagnostic.emrlite.token-ttl-seconds=${DIAGNOSTIC_EMRLITE_TOKEN_TTL_SECONDS}
-diagnostic.emrlite.refresh-ttl-seconds=${DIAGNOSTIC_EMRLITE_REFRESH_TTL_SECONDS}
+diagnostic.emrlite.token-ttl-seconds=3600
+diagnostic.emrlite.refresh-ttl-seconds=36000
 
-diagnostic.poll.xray.tick-ms=${DIAGNOSTIC_POLL_XRAY_TICK_MS}
-diagnostic.poll.truenat.tick-ms=${DIAGNOSTIC_POLL_TRUENAT_TICK_MS}
+diagnostic.poll.xray.tick-ms=30000
+diagnostic.poll.truenat.tick-ms=60000
 # Daily cutoff (cron expression) after which all outstanding PENDING/IN_PROGRESS orders are marked EXPIRED
-diagnostic.poll.expiry-cron=${DIAGNOSTIC_POLL_EXPIRY_CRON}
+diagnostic.poll.expiry-cron =0 0 18 * * *
 
-diagnostic.documents.storage-root=${DIAGNOSTIC_DOCUMENTS_STORAGE_ROOT}
+diagnostic.documents.storage-root=/home/unthinkable-lap/Desktop/diagnostic-documt
\ No newline at end of file
diff --git a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
index 396c79a2d..d96ab930f 100644
--- a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
@@ -535,8 +535,10 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                         if (benDetailsOBJ != null && benDetailsOBJ.getOccupation() != null)
                             benDetailsRMNCH_OBJ.setOccupation(benDetailsOBJ.getOccupation());
 
-                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals
-                        // fallback to otherFields if exam not yet saved for this beneficiary
+                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals — latest non-null
+                        // value per field, so a later row with some columns empty doesn't hide older values.
+                        // otherFields fills whatever is still missing (beneficiaries registered before
+                        // Identity-API started writing these tables).
                         Long benRegIdLong = m.getBenRegId() != null ? m.getBenRegId().longValue() : null;
                         if (benRegIdLong != null) {
                             List<BenAnthropometryDetail> anthroList =
@@ -545,29 +547,27 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                                     benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(benRegIdLong);
 
                             Map<String, Object> anthropometry = new HashMap<>();
-                            if (!anthroList.isEmpty()) {
-                                BenAnthropometryDetail anthro = anthroList.get(0);
-                                if (anthro.getHeightCm() != null) anthropometry.put("height", anthro.getHeightCm());
-                                if (anthro.getWeightKg() != null) anthropometry.put("weight", anthro.getWeightKg());
-                                if (anthro.getBmi()      != null) anthropometry.put("bmi",    anthro.getBmi());
+                            for (BenAnthropometryDetail anthro : anthroList) {
+                                if (anthro.getHeightCm() != null) anthropometry.putIfAbsent("height", anthro.getHeightCm());
+                                if (anthro.getWeightKg() != null) anthropometry.putIfAbsent("weight", anthro.getWeightKg());
+                                if (anthro.getBmi()      != null) anthropometry.putIfAbsent("bmi",    anthro.getBmi());
                             }
-                            if (!vitalList.isEmpty()) {
-                                BenPhysicalVitalDetail vital = vitalList.get(0);
-                                if (vital.getTemperature()        != null) anthropometry.put("temperatureValue",    vital.getTemperature());
-                                if (vital.getPulseRate()          != null) anthropometry.put("pulseRate",           vital.getPulseRate());
-                                if (vital.getSystolicBP()         != null) anthropometry.put("systolicBP",          vital.getSystolicBP());
-                                if (vital.getDiastolicBP()        != null) anthropometry.put("diastolicBP",         vital.getDiastolicBP());
-                                if (vital.getBloodGlucoseRandom() != null) anthropometry.put("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
+                            for (BenPhysicalVitalDetail vital : vitalList) {
+                                if (vital.getTemperature()        != null) anthropometry.putIfAbsent("temperatureValue",    vital.getTemperature());
+                                if (vital.getPulseRate()          != null) anthropometry.putIfAbsent("pulseRate",           vital.getPulseRate());
+                                if (vital.getSystolicBP()         != null) anthropometry.putIfAbsent("systolicBP",          vital.getSystolicBP());
+                                if (vital.getDiastolicBP()        != null) anthropometry.putIfAbsent("diastolicBP",         vital.getDiastolicBP());
+                                if (vital.getBloodGlucoseRandom() != null) anthropometry.putIfAbsent("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
                             }
 
-                            // fallback: if no exam saved yet, read from registration otherFields
-                            if (anthropometry.isEmpty() && benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
+                            // fallback per field: registration otherFields
+                            if (benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
                                 try {
                                     Map<?, ?> extraFields = new Gson().fromJson(benDetailsOBJ.getOtherFields(), Map.class);
-                                    if (extraFields.containsKey("weight")) anthropometry.put("weight", extraFields.get("weight"));
-                                    if (extraFields.containsKey("height")) anthropometry.put("height", extraFields.get("height"));
-                                    if (extraFields.containsKey("bmi"))    anthropometry.put("bmi",    extraFields.get("bmi"));
-                                    if (extraFields.containsKey("temperatureValue")) anthropometry.put("temperatureValue", extraFields.get("temperatureValue"));
+                                    if (extraFields.get("weight") != null) anthropometry.putIfAbsent("weight", extraFields.get("weight"));
+                                    if (extraFields.get("height") != null) anthropometry.putIfAbsent("height", extraFields.get("height"));
+                                    if (extraFields.get("bmi")    != null) anthropometry.putIfAbsent("bmi",    extraFields.get("bmi"));
+                                    if (extraFields.get("temperatureValue") != null) anthropometry.putIfAbsent("temperatureValue", extraFields.get("temperatureValue"));
                                 } catch (Exception ex) {
                                     logger.warn("Could not parse otherFields for fallback anthropometry: " + benDetailsOBJ.getBeneficiaryDetailsId());
                                 }
diff --git a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
index c95364ee9..891827b5c 100644
--- a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
@@ -575,10 +575,33 @@ private Map<String, Object> getRegistrationExtras(Long beneficiaryRegID) {
         return Collections.emptyMap();
     }
 
+    // Latest non-null height/weight/bmi/temperatureValue for the beneficiary. Identity-API's
+    // syncDataToAmrit writes these to t_phy_anthropometry / t_phy_vitals at registration;
+    // otherFields is only a fallback for beneficiaries registered before that.
+    private Map<String, Object> getLatestAnthropometry(Long beneficiaryRegID) {
+        Map<String, Object> values = new HashMap<>();
+        for (BenAnthropometryDetail a : benAnthropometryRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
+            if (a.getHeightCm() != null) values.putIfAbsent("height", a.getHeightCm());
+            if (a.getWeightKg() != null) values.putIfAbsent("weight", a.getWeightKg());
+            if (a.getBmi() != null) values.putIfAbsent("bmi", a.getBmi());
+        }
+        for (BenPhysicalVitalDetail v : benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
+            if (v.getTemperature() != null) {
+                values.put("temperatureValue", v.getTemperature());
+                break;
+            }
+        }
+        Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
+        for (String key : List.of("height", "weight", "bmi", "temperatureValue")) {
+            if (extras.get(key) instanceof Number) values.putIfAbsent(key, extras.get(key));
+        }
+        return values;
+    }
+
     private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
         try {
-            Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
+            Map<String, Object> extras = getLatestAnthropometry(beneficiaryRegID);
             writeAnthropometry(extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writeVitals(exam, extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writePhyGeneralExam(exam, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
@@ -592,6 +615,9 @@ private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long b
 
     private void writeAnthropometry(Map<String, Object> extras, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
+        // An all-null row would become the latest one and hide the registration values
+        if (!(extras.get("height") instanceof Number) && !(extras.get("weight") instanceof Number)
+                && !(extras.get("bmi") instanceof Number)) return;
         try {
             BenAnthropometryDetail a = new BenAnthropometryDetail();
             a.setBeneficiaryRegID(beneficiaryRegID);

From f61b09a8254703ae199af40fbc639b1c44aae0ac Mon Sep 17 00:00:00 2001
From: chetansaroya <chetan.saroya@unthinkable.co>
Date: Tue, 6 Oct 2026 18:34:12 +0530
Subject: [PATCH 2/3] Revert "feat: stop-542 extra fields consumer changes"

This reverts commit 50dc8bad084561fdebfe35b9f8f30627ddbe6a10.
---
 pom.xml                                       | 264 +++++++++---------
 .../environment/common_example.properties     |  47 ++--
 .../service/impl/BeneficiaryServiceImpl.java  |  40 +--
 .../flw/service/impl/StopTBServiceImpl.java   |  28 +-
 4 files changed, 175 insertions(+), 204 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7ba21d7e..5fc0bc731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.iemr.common.flw</groupId>
-	<artifactId>flw-api</artifactId>
-	<version>3.12.0</version>
-	<packaging>war</packaging>
+    <groupId>com.iemr.common.flw</groupId>
+    <artifactId>flw-api</artifactId>
+    <version>3.12.0</version>
+    <packaging>war</packaging>
 
-	<name>FLW-API</name>
-	<description>Iemr Flw Service</description>
+    <name>FLW-API</name>
+    <description>Iemr Flw Service</description>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.2</version>
-		<relativePath />
-	</parent>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<build.timestamp>${maven.build.timestamp}</build.timestamp>
-		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-		<java.version>17</java.version>
-		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
-		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
-		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>example</environment>
-		<target-properties>target/classes/application.properties</target-properties>
-		<source-properties>target/classes/common_${environment}.properties</source-properties>
-		<maven.test.skip>true</maven.test.skip>
-		<sonar.java.binaries>target</sonar.java.binaries>
-	</properties>
-	<dependencies>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.2.2</version>
+        <relativePath />
+    </parent>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <build.timestamp>${maven.build.timestamp}</build.timestamp>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <java.version>17</java.version>
+        <m2e.apt.activation>jdt_apt</m2e.apt.activation>
+        <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
+        <org.projectlombok.version>1.16.18</org.projectlombok.version>
+        <environment>${ENV_VAR}</environment>
+        <target-properties>target/classes/application.properties</target-properties>
+        <source-properties>target/classes/common_${environment}.properties</source-properties>
+        <maven.test.skip>true</maven.test.skip>
+        <sonar.java.binaries>target</sonar.java.binaries>
+    </properties>
+    <dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -56,10 +56,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>co.elastic.logging</groupId>
-			<artifactId>logback-ecs-encoder</artifactId>
-			<version>1.3.2</version>
+		<dependency> 
+			<groupId>co.elastic.logging</groupId> 
+			<artifactId>logback-ecs-encoder</artifactId> 
+			<version>1.3.2</version> 
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -234,10 +234,10 @@
 			<artifactId>tomcat-jdbc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.modelmapper</groupId>
-			<artifactId>modelmapper</artifactId>
-			<version>2.4.4</version>
-		</dependency>
+            <groupId>org.modelmapper</groupId>
+            <artifactId>modelmapper</artifactId>
+            <version>2.4.4</version>
+        </dependency>
 		<!-- end newly added dependencies -->
 		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
 		<dependency>
@@ -261,56 +261,56 @@
 		</dependency>
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>1097_flw</id>
-			<properties>
-				<final-name>1097flwapi-v1.0</final-name>
-				<target-properties>target/classes/application.properties</target-properties>
-				<source-properties>src/main/environment/1097_${environment}.properties</source-properties>
-			</properties>
-			<build>
-				<finalName>1097flwapi-v1.0</finalName>
-			</build>
-		</profile>
-	</profiles>
-
+    <profiles>
+        <profile>
+            <id>1097_flw</id>
+            <properties>
+                <final-name>1097flwapi-v1.0</final-name>
+                <target-properties>target/classes/application.properties</target-properties>
+                <source-properties>src/main/environment/1097_${environment}.properties</source-properties>
+            </properties>
+            <build>
+                <finalName>1097flwapi-v1.0</finalName>
+            </build>
+        </profile>
+    </profiles>
 
 
-	<build>
-		<finalName>${artifactId}-${version}</finalName>
-		<plugins>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version><!--$NO-MVN-MAN-VER$ -->
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-							<version>${lombok.version}</version>
-						</path>
-						<path>
-							<groupId>org.mapstruct</groupId>
-							<artifactId>mapstruct-processor</artifactId>
-							<version>${org.mapstruct.version}</version>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
+    <build>
+        <finalName>${artifactId}-${version}</finalName>
+        <plugins>
+			
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version><!--$NO-MVN-MAN-VER$ -->
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -363,31 +363,31 @@
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version><!--$NO-MVN-MAN-VER$ -->
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<id>properties-updated</id>
-						<configuration>
-							<target>
-								<echo>
-									concatinating properties file ${target-properties} and
-									${source-properties}
-								</echo>
-								<concat destfile="${target-properties}" append="yes"
-										force="yes">
-									<fileset file="${source-properties}">
-									</fileset>
-								</concat>
-							</target>
-						</configuration>
-					</execution>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version><!--$NO-MVN-MAN-VER$ -->
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <id>properties-updated</id>
+                        <configuration>
+                            <target>
+                                <echo>
+                                    concatinating properties file ${target-properties} and
+                                    ${source-properties}
+                                </echo>
+                                <concat destfile="${target-properties}" append="yes"
+                                        force="yes">
+                                    <fileset file="${source-properties}">
+                                    </fileset>
+                                </concat>
+                            </target>
+                        </configuration>
+                    </execution>
 					<execution>
 						<phase>process-resources</phase>
 						<goals>
@@ -402,16 +402,16 @@
 							</tasks>
 						</configuration>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<testFailureIgnore>true</testFailureIgnore>
-				</configuration>
-			</plugin>
-			<!--<plugin>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+            <!--<plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
@@ -435,15 +435,15 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>2.20.1</version>
-			</plugin>
-		</plugins>
-	</reporting>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.20.1</version>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
index 79534d598..a1d4ebe55 100644
--- a/src/main/environment/common_example.properties
+++ b/src/main/environment/common_example.properties
@@ -7,14 +7,14 @@ tm-url=http://localhost:8089/
 
 spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 ##--------------------------------------------## Secondary db-------------------------------------------------------------------
 
 secondary.datasource.url=jdbc:mysql://localhost:3306/db_identity
 secondary.datasource.username=root
-secondary.datasource.password=root
+secondary.datasource.password=1234
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 springdoc.api-docs.enabled=true
@@ -50,48 +50,45 @@ abha.token.url=<abha-token-url>
 abha.xcmid=<sbx-or-prod>
 
 # GovThealth API Config
-govthealth.user.details.url=$GOVTHEALTH_USER_DETAILS_URL}
-govthealth.user.id=$GOVTHEALTH_USER_ID}
-govthealth.password=$GOVTHEALTH_PASSWORD}
+govthealth.user.details.url=${GOVTHEALTH_USER_DETAILS_URL}
+govthealth.user.id=${GOVTHEALTH_USER_ID}
+govthealth.password=${GOVTHEALTH_PASSWORD}
 
 # ── Diagnostic Device Integration ────────────────────────────────────────────
-# diagnostic.active-provider must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode (currently: EMRLITE)
-diagnostic.active-provider=EMRLITE
 # diagnostic.provider.xray / diagnostic.provider.truenat select the vendor per orderType family
 # (XRAY_CHEST vs MTB/MTB_PLUS/MDR_RIF), each must be one of com.iemr.flw.masterEnum.DiagnosticProviderCode
-diagnostic.provider.xray=EMRLITE
-diagnostic.provider.truenat=EMRLITE
+diagnostic.provider.xray=${DIAGNOSTIC_PROVIDER_XRAY}
+diagnostic.provider.truenat=${DIAGNOSTIC_PROVIDER_TRUENAT}
 
-# EMR Lite - xray group (base-url same as truenat for now; split so a distinct vendor/tenant can be
+# EMR Lite - xray group (same base-url as truenat for now; split so a distinct vendor/tenant can be
 # swapped in for either group later without a code change)
-diagnostic.emrlite.xray.base-url=http://152.67.167.101:8000
+diagnostic.emrlite.xray.base-url=${DIAGNOSTIC_EMRLITE_XRAY_BASE_URL}
 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.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/ping/
-diagnostic.emrlite.xray.username=piramal
-diagnostic.emrlite.xray.password=piramal@123
-
+diagnostic.emrlite.xray.cancel-url=${diagnostic.emrlite.xray.base-url}/api/v1/integrations/orders/cancel/
+diagnostic.emrlite.xray.username=${DIAGNOSTIC_EMRLITE_XRAY_USERNAME}
+diagnostic.emrlite.xray.password=${DIAGNOSTIC_EMRLITE_XRAY_PASSWORD}
 
 # EMR Lite - truenat group (MTB/MTB_PLUS/MDR_RIF); same value as xray for now
-diagnostic.emrlite.truenat.base-url=http://152.67.167.101:8000
+diagnostic.emrlite.truenat.base-url=${DIAGNOSTIC_EMRLITE_TRUENAT_BASE_URL}
 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=piramal
-diagnostic.emrlite.truenat.password=piramal@123
+diagnostic.emrlite.truenat.cancel-url=${diagnostic.emrlite.truenat.base-url}/api/v1/integrations/orders/cancel/
+diagnostic.emrlite.truenat.username=${DIAGNOSTIC_EMRLITE_TRUENAT_USERNAME}
+diagnostic.emrlite.truenat.password=${DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD}
 
-diagnostic.emrlite.token-ttl-seconds=3600
-diagnostic.emrlite.refresh-ttl-seconds=36000
+diagnostic.emrlite.token-ttl-seconds=${DIAGNOSTIC_EMRLITE_TOKEN_TTL_SECONDS}
+diagnostic.emrlite.refresh-ttl-seconds=${DIAGNOSTIC_EMRLITE_REFRESH_TTL_SECONDS}
 
-diagnostic.poll.xray.tick-ms=30000
-diagnostic.poll.truenat.tick-ms=60000
+diagnostic.poll.xray.tick-ms=${DIAGNOSTIC_POLL_XRAY_TICK_MS}
+diagnostic.poll.truenat.tick-ms=${DIAGNOSTIC_POLL_TRUENAT_TICK_MS}
 # Daily cutoff (cron expression) after which all outstanding PENDING/IN_PROGRESS orders are marked EXPIRED
-diagnostic.poll.expiry-cron =0 0 18 * * *
+diagnostic.poll.expiry-cron=${DIAGNOSTIC_POLL_EXPIRY_CRON}
 
-diagnostic.documents.storage-root=/home/unthinkable-lap/Desktop/diagnostic-documt
\ No newline at end of file
+diagnostic.documents.storage-root=${DIAGNOSTIC_DOCUMENTS_STORAGE_ROOT}
diff --git a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
index d96ab930f..396c79a2d 100644
--- a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
@@ -535,10 +535,8 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                         if (benDetailsOBJ != null && benDetailsOBJ.getOccupation() != null)
                             benDetailsRMNCH_OBJ.setOccupation(benDetailsOBJ.getOccupation());
 
-                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals — latest non-null
-                        // value per field, so a later row with some columns empty doesn't hide older values.
-                        // otherFields fills whatever is still missing (beneficiaries registered before
-                        // Identity-API started writing these tables).
+                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals
+                        // fallback to otherFields if exam not yet saved for this beneficiary
                         Long benRegIdLong = m.getBenRegId() != null ? m.getBenRegId().longValue() : null;
                         if (benRegIdLong != null) {
                             List<BenAnthropometryDetail> anthroList =
@@ -547,27 +545,29 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                                     benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(benRegIdLong);
 
                             Map<String, Object> anthropometry = new HashMap<>();
-                            for (BenAnthropometryDetail anthro : anthroList) {
-                                if (anthro.getHeightCm() != null) anthropometry.putIfAbsent("height", anthro.getHeightCm());
-                                if (anthro.getWeightKg() != null) anthropometry.putIfAbsent("weight", anthro.getWeightKg());
-                                if (anthro.getBmi()      != null) anthropometry.putIfAbsent("bmi",    anthro.getBmi());
+                            if (!anthroList.isEmpty()) {
+                                BenAnthropometryDetail anthro = anthroList.get(0);
+                                if (anthro.getHeightCm() != null) anthropometry.put("height", anthro.getHeightCm());
+                                if (anthro.getWeightKg() != null) anthropometry.put("weight", anthro.getWeightKg());
+                                if (anthro.getBmi()      != null) anthropometry.put("bmi",    anthro.getBmi());
                             }
-                            for (BenPhysicalVitalDetail vital : vitalList) {
-                                if (vital.getTemperature()        != null) anthropometry.putIfAbsent("temperatureValue",    vital.getTemperature());
-                                if (vital.getPulseRate()          != null) anthropometry.putIfAbsent("pulseRate",           vital.getPulseRate());
-                                if (vital.getSystolicBP()         != null) anthropometry.putIfAbsent("systolicBP",          vital.getSystolicBP());
-                                if (vital.getDiastolicBP()        != null) anthropometry.putIfAbsent("diastolicBP",         vital.getDiastolicBP());
-                                if (vital.getBloodGlucoseRandom() != null) anthropometry.putIfAbsent("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
+                            if (!vitalList.isEmpty()) {
+                                BenPhysicalVitalDetail vital = vitalList.get(0);
+                                if (vital.getTemperature()        != null) anthropometry.put("temperatureValue",    vital.getTemperature());
+                                if (vital.getPulseRate()          != null) anthropometry.put("pulseRate",           vital.getPulseRate());
+                                if (vital.getSystolicBP()         != null) anthropometry.put("systolicBP",          vital.getSystolicBP());
+                                if (vital.getDiastolicBP()        != null) anthropometry.put("diastolicBP",         vital.getDiastolicBP());
+                                if (vital.getBloodGlucoseRandom() != null) anthropometry.put("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
                             }
 
-                            // fallback per field: registration otherFields
-                            if (benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
+                            // fallback: if no exam saved yet, read from registration otherFields
+                            if (anthropometry.isEmpty() && benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
                                 try {
                                     Map<?, ?> extraFields = new Gson().fromJson(benDetailsOBJ.getOtherFields(), Map.class);
-                                    if (extraFields.get("weight") != null) anthropometry.putIfAbsent("weight", extraFields.get("weight"));
-                                    if (extraFields.get("height") != null) anthropometry.putIfAbsent("height", extraFields.get("height"));
-                                    if (extraFields.get("bmi")    != null) anthropometry.putIfAbsent("bmi",    extraFields.get("bmi"));
-                                    if (extraFields.get("temperatureValue") != null) anthropometry.putIfAbsent("temperatureValue", extraFields.get("temperatureValue"));
+                                    if (extraFields.containsKey("weight")) anthropometry.put("weight", extraFields.get("weight"));
+                                    if (extraFields.containsKey("height")) anthropometry.put("height", extraFields.get("height"));
+                                    if (extraFields.containsKey("bmi"))    anthropometry.put("bmi",    extraFields.get("bmi"));
+                                    if (extraFields.containsKey("temperatureValue")) anthropometry.put("temperatureValue", extraFields.get("temperatureValue"));
                                 } catch (Exception ex) {
                                     logger.warn("Could not parse otherFields for fallback anthropometry: " + benDetailsOBJ.getBeneficiaryDetailsId());
                                 }
diff --git a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
index 891827b5c..c95364ee9 100644
--- a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
@@ -575,33 +575,10 @@ private Map<String, Object> getRegistrationExtras(Long beneficiaryRegID) {
         return Collections.emptyMap();
     }
 
-    // Latest non-null height/weight/bmi/temperatureValue for the beneficiary. Identity-API's
-    // syncDataToAmrit writes these to t_phy_anthropometry / t_phy_vitals at registration;
-    // otherFields is only a fallback for beneficiaries registered before that.
-    private Map<String, Object> getLatestAnthropometry(Long beneficiaryRegID) {
-        Map<String, Object> values = new HashMap<>();
-        for (BenAnthropometryDetail a : benAnthropometryRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
-            if (a.getHeightCm() != null) values.putIfAbsent("height", a.getHeightCm());
-            if (a.getWeightKg() != null) values.putIfAbsent("weight", a.getWeightKg());
-            if (a.getBmi() != null) values.putIfAbsent("bmi", a.getBmi());
-        }
-        for (BenPhysicalVitalDetail v : benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
-            if (v.getTemperature() != null) {
-                values.put("temperatureValue", v.getTemperature());
-                break;
-            }
-        }
-        Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
-        for (String key : List.of("height", "weight", "bmi", "temperatureValue")) {
-            if (extras.get(key) instanceof Number) values.putIfAbsent(key, extras.get(key));
-        }
-        return values;
-    }
-
     private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
         try {
-            Map<String, Object> extras = getLatestAnthropometry(beneficiaryRegID);
+            Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
             writeAnthropometry(extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writeVitals(exam, extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writePhyGeneralExam(exam, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
@@ -615,9 +592,6 @@ private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long b
 
     private void writeAnthropometry(Map<String, Object> extras, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
-        // An all-null row would become the latest one and hide the registration values
-        if (!(extras.get("height") instanceof Number) && !(extras.get("weight") instanceof Number)
-                && !(extras.get("bmi") instanceof Number)) return;
         try {
             BenAnthropometryDetail a = new BenAnthropometryDetail();
             a.setBeneficiaryRegID(beneficiaryRegID);

From 87d909faa32de263ea8891069877eabd60cbaae9 Mon Sep 17 00:00:00 2001
From: chetansaroya <chetan.saroya@unthinkable.co>
Date: Tue, 6 Oct 2026 18:36:26 +0530
Subject: [PATCH 3/3] feat: stop-542 extra fields consumer changes

---
 .../service/impl/BeneficiaryServiceImpl.java  | 40 +++++++++----------
 .../flw/service/impl/StopTBServiceImpl.java   | 28 ++++++++++++-
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
index 396c79a2d..d96ab930f 100644
--- a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
@@ -535,8 +535,10 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                         if (benDetailsOBJ != null && benDetailsOBJ.getOccupation() != null)
                             benDetailsRMNCH_OBJ.setOccupation(benDetailsOBJ.getOccupation());
 
-                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals
-                        // fallback to otherFields if exam not yet saved for this beneficiary
+                        // anthropometry from t_phy_anthropometry, vitals from t_phy_vitals — latest non-null
+                        // value per field, so a later row with some columns empty doesn't hide older values.
+                        // otherFields fills whatever is still missing (beneficiaries registered before
+                        // Identity-API started writing these tables).
                         Long benRegIdLong = m.getBenRegId() != null ? m.getBenRegId().longValue() : null;
                         if (benRegIdLong != null) {
                             List<BenAnthropometryDetail> anthroList =
@@ -545,29 +547,27 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                                     benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(benRegIdLong);
 
                             Map<String, Object> anthropometry = new HashMap<>();
-                            if (!anthroList.isEmpty()) {
-                                BenAnthropometryDetail anthro = anthroList.get(0);
-                                if (anthro.getHeightCm() != null) anthropometry.put("height", anthro.getHeightCm());
-                                if (anthro.getWeightKg() != null) anthropometry.put("weight", anthro.getWeightKg());
-                                if (anthro.getBmi()      != null) anthropometry.put("bmi",    anthro.getBmi());
+                            for (BenAnthropometryDetail anthro : anthroList) {
+                                if (anthro.getHeightCm() != null) anthropometry.putIfAbsent("height", anthro.getHeightCm());
+                                if (anthro.getWeightKg() != null) anthropometry.putIfAbsent("weight", anthro.getWeightKg());
+                                if (anthro.getBmi()      != null) anthropometry.putIfAbsent("bmi",    anthro.getBmi());
                             }
-                            if (!vitalList.isEmpty()) {
-                                BenPhysicalVitalDetail vital = vitalList.get(0);
-                                if (vital.getTemperature()        != null) anthropometry.put("temperatureValue",    vital.getTemperature());
-                                if (vital.getPulseRate()          != null) anthropometry.put("pulseRate",           vital.getPulseRate());
-                                if (vital.getSystolicBP()         != null) anthropometry.put("systolicBP",          vital.getSystolicBP());
-                                if (vital.getDiastolicBP()        != null) anthropometry.put("diastolicBP",         vital.getDiastolicBP());
-                                if (vital.getBloodGlucoseRandom() != null) anthropometry.put("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
+                            for (BenPhysicalVitalDetail vital : vitalList) {
+                                if (vital.getTemperature()        != null) anthropometry.putIfAbsent("temperatureValue",    vital.getTemperature());
+                                if (vital.getPulseRate()          != null) anthropometry.putIfAbsent("pulseRate",           vital.getPulseRate());
+                                if (vital.getSystolicBP()         != null) anthropometry.putIfAbsent("systolicBP",          vital.getSystolicBP());
+                                if (vital.getDiastolicBP()        != null) anthropometry.putIfAbsent("diastolicBP",         vital.getDiastolicBP());
+                                if (vital.getBloodGlucoseRandom() != null) anthropometry.putIfAbsent("bloodGlucoseRandom",  vital.getBloodGlucoseRandom());
                             }
 
-                            // fallback: if no exam saved yet, read from registration otherFields
-                            if (anthropometry.isEmpty() && benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
+                            // fallback per field: registration otherFields
+                            if (benDetailsOBJ != null && benDetailsOBJ.getOtherFields() != null) {
                                 try {
                                     Map<?, ?> extraFields = new Gson().fromJson(benDetailsOBJ.getOtherFields(), Map.class);
-                                    if (extraFields.containsKey("weight")) anthropometry.put("weight", extraFields.get("weight"));
-                                    if (extraFields.containsKey("height")) anthropometry.put("height", extraFields.get("height"));
-                                    if (extraFields.containsKey("bmi"))    anthropometry.put("bmi",    extraFields.get("bmi"));
-                                    if (extraFields.containsKey("temperatureValue")) anthropometry.put("temperatureValue", extraFields.get("temperatureValue"));
+                                    if (extraFields.get("weight") != null) anthropometry.putIfAbsent("weight", extraFields.get("weight"));
+                                    if (extraFields.get("height") != null) anthropometry.putIfAbsent("height", extraFields.get("height"));
+                                    if (extraFields.get("bmi")    != null) anthropometry.putIfAbsent("bmi",    extraFields.get("bmi"));
+                                    if (extraFields.get("temperatureValue") != null) anthropometry.putIfAbsent("temperatureValue", extraFields.get("temperatureValue"));
                                 } catch (Exception ex) {
                                     logger.warn("Could not parse otherFields for fallback anthropometry: " + benDetailsOBJ.getBeneficiaryDetailsId());
                                 }
diff --git a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
index c95364ee9..891827b5c 100644
--- a/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/StopTBServiceImpl.java
@@ -575,10 +575,33 @@ private Map<String, Object> getRegistrationExtras(Long beneficiaryRegID) {
         return Collections.emptyMap();
     }
 
+    // Latest non-null height/weight/bmi/temperatureValue for the beneficiary. Identity-API's
+    // syncDataToAmrit writes these to t_phy_anthropometry / t_phy_vitals at registration;
+    // otherFields is only a fallback for beneficiaries registered before that.
+    private Map<String, Object> getLatestAnthropometry(Long beneficiaryRegID) {
+        Map<String, Object> values = new HashMap<>();
+        for (BenAnthropometryDetail a : benAnthropometryRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
+            if (a.getHeightCm() != null) values.putIfAbsent("height", a.getHeightCm());
+            if (a.getWeightKg() != null) values.putIfAbsent("weight", a.getWeightKg());
+            if (a.getBmi() != null) values.putIfAbsent("bmi", a.getBmi());
+        }
+        for (BenPhysicalVitalDetail v : benPhysicalVitalRepo.findByBeneficiaryRegIDOrderByCreatedDateDesc(beneficiaryRegID)) {
+            if (v.getTemperature() != null) {
+                values.put("temperatureValue", v.getTemperature());
+                break;
+            }
+        }
+        Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
+        for (String key : List.of("height", "weight", "bmi", "temperatureValue")) {
+            if (extras.get(key) instanceof Number) values.putIfAbsent(key, extras.get(key));
+        }
+        return values;
+    }
+
     private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
         try {
-            Map<String, Object> extras = getRegistrationExtras(beneficiaryRegID);
+            Map<String, Object> extras = getLatestAnthropometry(beneficiaryRegID);
             writeAnthropometry(extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writeVitals(exam, extras, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
             writePhyGeneralExam(exam, beneficiaryRegID, visit, createdBy, vanID, parkingPlaceID);
@@ -592,6 +615,9 @@ private void dualWriteExamToStandardTables(StopTBGeneralExamination exam, Long b
 
     private void writeAnthropometry(Map<String, Object> extras, Long beneficiaryRegID,
             BenVisitDetail visit, String createdBy, Integer vanID, Integer parkingPlaceID) {
+        // An all-null row would become the latest one and hide the registration values
+        if (!(extras.get("height") instanceof Number) && !(extras.get("weight") instanceof Number)
+                && !(extras.get("bmi") instanceof Number)) return;
         try {
             BenAnthropometryDetail a = new BenAnthropometryDetail();
             a.setBeneficiaryRegID(beneficiaryRegID);