Skip to content

Add and Map strength field in the report #104

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 1 commit into from
Oct 30, 2025
Merged

Add and Map strength field in the report #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@
<artifactId>jersey-media-multipart</artifactId>
<version>2.0-m11</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
</dependency>
</dependency> -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down Expand Up @@ -215,14 +215,26 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions>
<!-- <exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</exclusions> -->
<!-- <version>2.5.5</version> Use the latest stable version -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>


<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/iemr/inventory/mapper/report/InventoryReportMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public interface InventoryReportMapper {
@Mappings({ @Mapping(target = "facilityName", expression = "java(entryReport.getFacilityName())"),
@Mapping(target = "itemName", expression = "java(entryReport.getItemName())"),
@Mapping(target = "itemCategory", expression = "java(entryReport.getItemCategoryName())"),
@Mapping(target = "strength", expression = "java(entryReport.getStrength())"),
@Mapping(target = "batchNo", expression = "java(entryReport.getBatchNo())"),
@Mapping(target = "unitCostPrice", expression = "java(entryReport.getUnitCostPrice())"),
@Mapping(target = "expiryDate", expression = "java(entryReport.getExpiryDate())"),
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/iemr/inventory/model/report/ExpiryReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class ExpiryReport {

private String itemCategory;

private String strength;

private String batchNo;

private Double unitCostPrice;
Expand All @@ -52,12 +54,13 @@ public ExpiryReport() {

}

public ExpiryReport(String facilityName, String itemName, String itemCategory, String batchNo, Double unitCostPrice,
public ExpiryReport(String facilityName, String itemName, String itemCategory, String Strength, String batchNo, Double unitCostPrice,
Date expiryDate, Integer quantityInHand) {

this.facilityName = facilityName;
this.itemName = itemName;
this.itemCategory = itemCategory;
this.strength = Strength;
this.batchNo = batchNo;
this.unitCostPrice = unitCostPrice;
this.expiryDate = expiryDate;
Expand Down
22 changes: 16 additions & 6 deletions src/main/java/com/iemr/inventory/service/report/CRMReportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import java.util.Calendar;
import java.util.List;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -57,6 +59,8 @@ public class CRMReportServiceImpl implements CRMReportService {
@Autowired(required=false)
InventoryReportMapper mapper;

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

@Override
public String getInwardStockReport(ItemStockEntryReport entryReport) {

Expand Down Expand Up @@ -98,9 +102,10 @@ public String getExpiryReport(ItemStockEntryReport entryReport) {
object[1] != null ? object[1].toString() : null,
object[2] != null ? object[2].toString() : null,
object[3] != null ? object[3].toString() : null,
object[4] != null ? Double.valueOf(object[4].toString()) : null,
(Date) (object[5] != null ? object[5] : null),
(Integer) (object[6] != null ? object[6] : null));
object[4] != null ? object[4].toString() : null,
object[5] != null ? Double.valueOf(object[5].toString()) : null,
(Date) (object[6] != null ? object[6] : null),
(Integer) (object[7] != null ? object[7] : null));

report.setSlNo(slNo++);
reportList.add(report);
Expand Down Expand Up @@ -618,6 +623,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) {
list = itemStockReportRepo.getShortExpiryReport(startExpiry);
}

logger.info("Short Expiry Report Start Date: " + startExpiry + " End Date: " + endExpiry);

logger.info("Short Expiry Report List Size: " + list.size());

Long slNo = 1L;

for (Object[] object : list) {
Expand All @@ -627,9 +636,10 @@ public String getShortExpiryReport(ItemStockEntryReport entryReport) {
object[1] != null ? object[1].toString() : null,
object[2] != null ? object[2].toString() : null,
object[3] != null ? object[3].toString() : null,
object[4] != null ? ((BigDecimal) object[4]).doubleValue() : null,
(Date) (object[5] != null ? object[5] : null),
(Integer) (object[6] != null ? object[6] : null));
object[4] != null ? object[4].toString() : null,
object[5] != null ? ((BigDecimal) object[5]).doubleValue() : null,
(Date) (object[6] != null ? object[6] : null),
(Integer) (object[7] != null ? object[7] : null));

report.setSlNo(slNo++);
reportList.add(report);
Expand Down