From e3d1d74584c8f98727907c43c8b1e4dda5c38a08 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Fri, 25 Sep 2026 19:00:54 +0530 Subject: [PATCH] fix: add EntryType and item form to stock detail reports PR_StockDetail returns EntryType and item form, but the daily stock details, monthly and yearly reports dropped them. Map both into all three reports, and add Item Entered Date to the yearly report. Co-Authored-By: Claude Opus 5.5 (1M context) --- .../inventory/model/report/DailyStockDetails.java | 4 ++++ .../iemr/inventory/model/report/MonthlyReport.java | 4 ++++ .../com/iemr/inventory/model/report/YearlyReport.java | 7 +++++++ .../service/report/CRMReportServiceImpl.java | 11 +++++++++++ 4 files changed, 26 insertions(+) diff --git a/src/main/java/com/iemr/inventory/model/report/DailyStockDetails.java b/src/main/java/com/iemr/inventory/model/report/DailyStockDetails.java index 341a97c7..ffd143d7 100644 --- a/src/main/java/com/iemr/inventory/model/report/DailyStockDetails.java +++ b/src/main/java/com/iemr/inventory/model/report/DailyStockDetails.java @@ -36,8 +36,12 @@ public class DailyStockDetails { private Timestamp date; + private String entryType; + private String facilityName; + private String itemForm; + private String itemName; private String itemCategory; diff --git a/src/main/java/com/iemr/inventory/model/report/MonthlyReport.java b/src/main/java/com/iemr/inventory/model/report/MonthlyReport.java index 8aa1e05f..d784aed5 100644 --- a/src/main/java/com/iemr/inventory/model/report/MonthlyReport.java +++ b/src/main/java/com/iemr/inventory/model/report/MonthlyReport.java @@ -38,8 +38,12 @@ public class MonthlyReport { private Integer year; + private String entryType; + private String facilityName; + private String itemForm; + private String itemName; private String itemCategory; diff --git a/src/main/java/com/iemr/inventory/model/report/YearlyReport.java b/src/main/java/com/iemr/inventory/model/report/YearlyReport.java index 058debe4..c9599381 100644 --- a/src/main/java/com/iemr/inventory/model/report/YearlyReport.java +++ b/src/main/java/com/iemr/inventory/model/report/YearlyReport.java @@ -22,6 +22,7 @@ package com.iemr.inventory.model.report; import java.sql.Date; +import java.sql.Timestamp; import com.google.gson.GsonBuilder; import com.google.gson.LongSerializationPolicy; @@ -35,8 +36,12 @@ public class YearlyReport { private Integer year; + private String entryType; + private String facilityName; + private String itemForm; + private String itemName; private String itemCategory; @@ -63,6 +68,8 @@ public class YearlyReport { private Long closingStock; + private Timestamp itemEnteredDate; + @Override public String toString() { diff --git a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java index 5bd5d809..b41a6403 100644 --- a/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java +++ b/src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java @@ -69,7 +69,9 @@ private StockDetailRow mapStockDetailRow(Object[] row) { } StockDetailRow detail = new StockDetailRow(); + detail.entryType = text(row[2]); detail.facilityName = text(row[3]); + detail.itemForm = text(row[4]); detail.itemName = text(row[5]); detail.strength = text(row[6]); detail.uom = text(row[7]); @@ -128,7 +130,9 @@ private Timestamp sqlTimestamp(Object value) { } private static class StockDetailRow { + private String entryType; private String facilityName; + private String itemForm; private String itemName; private String strength; private String uom; @@ -301,7 +305,9 @@ public String getDailyStockDetailsReport(ItemStockEntryReport entryReport) { DailyStockDetails stockDetail = new DailyStockDetails(); stockDetail.setSlNo(slNo++); stockDetail.setDate(entryReport.getStartDate()); + stockDetail.setEntryType(detail.entryType); stockDetail.setFacilityName(detail.facilityName); + stockDetail.setItemForm(detail.itemForm); stockDetail.setItemName(detail.itemName); stockDetail.setItemCategory(detail.itemCategoryName); stockDetail.setStrength(detail.strength); @@ -440,7 +446,9 @@ public String getMonthlyReport(ItemStockEntryReport entryReport) { stockDetail.setSlNo(slNo++); stockDetail.setMonth(entryReport.getMonthName()); stockDetail.setYear(entryReport.getYear()); + stockDetail.setEntryType(detail.entryType); stockDetail.setFacilityName(detail.facilityName); + stockDetail.setItemForm(detail.itemForm); stockDetail.setItemName(detail.itemName); stockDetail.setItemCategory(detail.itemCategoryName); stockDetail.setStrength(detail.strength); @@ -497,7 +505,9 @@ public String getYearlyReport(ItemStockEntryReport entryReport) { YearlyReport stockDetail = new YearlyReport(); stockDetail.setSlNo(slNo++); stockDetail.setYear(entryReport.getYear()); + stockDetail.setEntryType(detail.entryType); stockDetail.setFacilityName(detail.facilityName); + stockDetail.setItemForm(detail.itemForm); stockDetail.setItemName(detail.itemName); stockDetail.setItemCategory(detail.itemCategoryName); stockDetail.setStrength(detail.strength); @@ -509,6 +519,7 @@ public String getYearlyReport(ItemStockEntryReport entryReport) { stockDetail.setQuantityReceived(detail.quantityReceived); stockDetail.setDispensedQuantity(detail.dispensedQuantity); stockDetail.setClosingStock(detail.closingStock); + stockDetail.setItemEnteredDate(detail.itemEnteredDate); stockDetail.setAdjustmentIssue(detail.adjustmentIssue); stockDetail.setAdjustmentReceipt(detail.adjustmentReceipt); list.add(stockDetail);