av6-core 1.0.25 → 1.1.1

package/dist/index.d.mts

@@ -80,6 +80,7 @@ type DynamicShortCode = {
     tableName: string;
     isDTO?: boolean;
     isCacheable?: boolean;
+    isSingleDto?: boolean;
     isDropDown?: boolean;
     permission?: string | null;
     whereClause?: JsonValue | null;
@@ -139,6 +140,7 @@ interface FixedSearchRequestService<T extends DynamicShortCode> extends FixedSea
 interface FetchRequest {
     shortCode: string;
     id: number;
+    includes?: Record<string, unknown>;
 }
 interface FetchRequestRepository<T extends DynamicShortCode> extends FetchRequest {
     shortCodeData: T;
@@ -178,7 +180,7 @@ interface CalculationRes {
     netTax: number;
     totalAmount: number;
 }
-type DtoMappingFunction = (data: unknown) => unknown;
+type DtoMappingFunction = (data: any) => any;
 interface Helpers {
     generateErrorMessage(type: keyof typeof ErrorMessageType, ...variables: string[]): string;
     ErrorHandler: new (status: number, message: string, errors?: ValidationErrorItem[]) => Error;
@@ -346,6 +348,7 @@ interface BillingCalcResult {
  *           then header rounding
  */
 declare function calculateBillingFromChildren(inputs: ChildCalcInput[], masterExtra: MasterAdditionalDiscount, options?: CalcOptions): BillingCalcResult;
+declare function calculateSingleChild(it: ChildCalcInput, coPayMode: CoPayMode, options?: CalcOptions): ChildCalculated;
 
 interface CreateTransaction {
     field: string;
@@ -466,4 +469,4 @@ declare class NotificationEmitter {
     notifyNow(eventName: string, body: Omit<EmitPayload, "eventName">): Promise<void>;
 }
 
-export { type AdditionalDiscountMode, type BillingCalcResult, type CacheAdapter, type CalcOptions, type CalculationRes, type ChildCalcInput, type ChildCalculated, type CoPayMode, type CoPayType, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DiscountMode, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type MasterAdditionalDiscount, type MasterCalculated, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, RoundFormat, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type TaxMethod, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, calculateBillingFromChildren, commonService, customOmit, findDifferences, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AdditionalDiscountMode, type BillingCalcResult, type CacheAdapter, type CalcOptions, type CalculationRes, type ChildCalcInput, type ChildCalculated, type CoPayMode, type CoPayType, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DiscountMode, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type MasterAdditionalDiscount, type MasterCalculated, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, RoundFormat, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type TaxMethod, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, calculateBillingFromChildren, calculateSingleChild, commonService, customOmit, findDifferences, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.d.ts

@@ -80,6 +80,7 @@ type DynamicShortCode = {
     tableName: string;
     isDTO?: boolean;
     isCacheable?: boolean;
+    isSingleDto?: boolean;
     isDropDown?: boolean;
     permission?: string | null;
     whereClause?: JsonValue | null;
@@ -139,6 +140,7 @@ interface FixedSearchRequestService<T extends DynamicShortCode> extends FixedSea
 interface FetchRequest {
     shortCode: string;
     id: number;
+    includes?: Record<string, unknown>;
 }
 interface FetchRequestRepository<T extends DynamicShortCode> extends FetchRequest {
     shortCodeData: T;
@@ -178,7 +180,7 @@ interface CalculationRes {
     netTax: number;
     totalAmount: number;
 }
-type DtoMappingFunction = (data: unknown) => unknown;
+type DtoMappingFunction = (data: any) => any;
 interface Helpers {
     generateErrorMessage(type: keyof typeof ErrorMessageType, ...variables: string[]): string;
     ErrorHandler: new (status: number, message: string, errors?: ValidationErrorItem[]) => Error;
@@ -346,6 +348,7 @@ interface BillingCalcResult {
  *           then header rounding
  */
 declare function calculateBillingFromChildren(inputs: ChildCalcInput[], masterExtra: MasterAdditionalDiscount, options?: CalcOptions): BillingCalcResult;
+declare function calculateSingleChild(it: ChildCalcInput, coPayMode: CoPayMode, options?: CalcOptions): ChildCalculated;
 
 interface CreateTransaction {
     field: string;
@@ -466,4 +469,4 @@ declare class NotificationEmitter {
     notifyNow(eventName: string, body: Omit<EmitPayload, "eventName">): Promise<void>;
 }
 
-export { type AdditionalDiscountMode, type BillingCalcResult, type CacheAdapter, type CalcOptions, type CalculationRes, type ChildCalcInput, type ChildCalculated, type CoPayMode, type CoPayType, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DiscountMode, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type MasterAdditionalDiscount, type MasterCalculated, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, RoundFormat, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type TaxMethod, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, calculateBillingFromChildren, commonService, customOmit, findDifferences, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AdditionalDiscountMode, type BillingCalcResult, type CacheAdapter, type CalcOptions, type CalculationRes, type ChildCalcInput, type ChildCalculated, type CoPayMode, type CoPayType, type ColValue, type CommonExcelRequest, type CommonFilterRequest, type CommonServiceResponse, type Config, type Context, type CreateUINConfigRequest, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DiscountMode, type DropdownRequest, type DropdownRequestService, type DynamicShortCode, type EmitPayload, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type Mapper, type MasterAdditionalDiscount, type MasterCalculated, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type PaginatedResponse, type Recipient, RoundFormat, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Store, type TaxMethod, type ToggleActive, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, calculateBillingFromChildren, calculateSingleChild, commonService, customOmit, findDifferences, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.js

@@ -33,6 +33,7 @@ __export(index_exports, {
   NotificationEmitter: () => NotificationEmitter,
   RoundFormat: () => RoundFormat,
   calculateBillingFromChildren: () => calculateBillingFromChildren,
+  calculateSingleChild: () => calculateSingleChild,
   commonService: () => commonService,
   customOmit: () => customOmit,
   findDifferences: () => findDifferences,
@@ -305,7 +306,12 @@ var commonRepository = (serviceDeps) => {
       const totalPages = Math.ceil(totalRecords / pageSize);
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords,
@@ -381,7 +387,7 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonSearch::repository");
       return results;
     },
-    async commonFetch({ id, shortCodeData }) {
+    async commonFetch({ id, shortCodeData, includes }) {
       logger.info("entering::commonFetch::repository");
       const tableName = shortCodeData.tableName;
       const model = db[tableName];
@@ -389,7 +395,8 @@ var commonRepository = (serviceDeps) => {
         throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
       }
       const results = model.findUnique({
-        where: { id, isActive: true }
+        where: { id, isActive: true },
+        include: includes ? includes : void 0
       });
       logger.info("exiting::commonFetch::repository");
       return results;
@@ -596,7 +603,12 @@ var commonRepository = (serviceDeps) => {
       const totalPages = Math.ceil(totalRecords / pageSize);
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords,
@@ -657,7 +669,12 @@ var commonRepository = (serviceDeps) => {
       });
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords
@@ -981,7 +998,7 @@ var commonService = (serviceDeps) => {
       logger.info("entering::fetch::service");
       const shortCodeData = fetchParams.shortCodeData;
       let commonData;
-      if (shortCodeData.isCacheable && fetchParams.shortCode !== "UIN_CONFIG") {
+      if (shortCodeData.isCacheable && fetchParams.shortCode !== "UIN_CONFIG" && !fetchParams.includes) {
         commonData = await getCacheById(
           `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
           fetchParams.id
@@ -1000,7 +1017,12 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
       }
       if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
-        const DtoResult = await dtoMapping[shortCodeData.shortCode](commonData);
+        let DtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DtoResult = await dtoMapping[shortCodeData.shortCode](commonData);
+        } else {
+          DtoResult = (await dtoMapping[shortCodeData.shortCode]([commonData]))?.[0];
+        }
         return DtoResult;
       }
       logger.info("exiting::fetch::service");
@@ -1140,71 +1162,7 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const headFmt = options.headerRound ?? lineFmt;
   const precision = options.precision ?? 2;
   const children = inputs.map((it) => {
-    let baseRate = it.rate;
-    if (it.addonPercentage) {
-      baseRate = baseRate + percentage(baseRate, it.addonPercentage);
-      baseRate = applyRound(baseRate, lineFmt, precision);
-    }
-    const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
-    const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
-    const basePreTax = applyRound(subtotal + other, lineFmt, precision);
-    let copayAmount2 = 0;
-    if (masterExtra.coPayMode === "PERCENTAGE-AMOUNT") {
-      const copayType = it.coPaymentType ?? "AMOUNT";
-      const copayValue = it.coPayValue ?? 0;
-      copayAmount2 = copayType === "PERCENTAGE" ? percentage(subtotal, copayValue) : Math.min(copayValue, subtotal);
-    }
-    const dMode = it.discountMode ?? "AMOUNT";
-    const dVal = it.discountValue ?? 0;
-    const tMethod = it.taxMethod ?? "NONE";
-    const tVal = Math.max(0, it.taxValue ?? 0);
-    let baseAfterTaxDisc = basePreTax;
-    let discountValue = 0;
-    if (tMethod === "INCLUSIVE") {
-      const inclusiveTaxMultiplier = (100 + tVal) / 100;
-      baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
-    }
-    baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
-    const inxInclusiveDiff = applyRound(basePreTax - baseAfterTaxDisc, lineFmt, precision);
-    if (dMode === "AMOUNT") {
-      discountValue = dVal;
-    } else if (dMode === "PERCENTAGE") {
-      discountValue = percentage(baseAfterTaxDisc, dVal);
-    }
-    discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
-    let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
-    afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
-    let calculatedTax = percentage(afterDisc, tVal);
-    calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
-    let grossAmount2 = afterDisc + calculatedTax;
-    grossAmount2 = maybeStep(grossAmount2, stepwise, lineFmt, precision);
-    if (masterExtra.coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
-      copayAmount2 = grossAmount2;
-    }
-    copayAmount2 = applyRound(copayAmount2, lineFmt, precision);
-    const copay = clamp(Math.max(0, copayAmount2), 0, grossAmount2);
-    const patientRaw = applyRound(grossAmount2 - copay, "TO_FIXED", 2);
-    const patientRounded = applyRound(patientRaw, lineFmt, precision);
-    const lineRoundOff = patientRounded - patientRaw;
-    return {
-      baseRate: applyRound(baseRate, lineFmt, precision),
-      subtotalAmount: applyRound(subtotal + other - inxInclusiveDiff, lineFmt, precision),
-      otherChargeAmount: other,
-      discountMode: dMode,
-      discountValue: dVal,
-      discountAmount: applyRound(discountValue, lineFmt, precision),
-      // item-only discount
-      taxMethod: tMethod,
-      taxValue: tVal,
-      taxAmount: applyRound(calculatedTax, lineFmt, precision),
-      grossAmount: applyRound(grossAmount2, lineFmt, precision),
-      netAmount: patientRounded,
-      // patient payable at line
-      roundOffAmount: applyRound(lineRoundOff, "TO_FIXED", 2),
-      // rounded - raw
-      copayAmount: copay
-      // insurer covered at line
-    };
+    return calculateSingleChild(it, masterExtra.coPayMode ?? "PERCENTAGE-AMOUNT", options);
   });
   const subtotalAmount = children.reduce((a, c) => a + c.subtotalAmount, 0);
   const otherChargeAmount = children.reduce((a, c) => a + c.otherChargeAmount, 0);
@@ -1242,6 +1200,73 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   };
   return { master, children };
 }
+function calculateSingleChild(it, coPayMode, options = {}) {
+  const stepwise = options.calculationMethod === "STEP_WISE";
+  const lineFmt = options.lineRound ?? RoundFormat.TO_FIXED;
+  const precision = options.precision ?? 2;
+  let baseRate = it.rate;
+  if (it.addonPercentage) {
+    baseRate = baseRate + percentage(baseRate, it.addonPercentage);
+    baseRate = applyRound(baseRate, lineFmt, precision);
+  }
+  const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
+  const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
+  const basePreTax = applyRound(subtotal + other, lineFmt, precision);
+  let copayAmount = 0;
+  if (coPayMode === "PERCENTAGE-AMOUNT") {
+    const copayType = it.coPaymentType ?? "AMOUNT";
+    const copayValue = it.coPayValue ?? 0;
+    copayAmount = copayType === "PERCENTAGE" ? percentage(subtotal, copayValue) : Math.min(copayValue, subtotal);
+  }
+  const dMode = it.discountMode ?? "AMOUNT";
+  const dVal = it.discountValue ?? 0;
+  const tMethod = it.taxMethod ?? "NONE";
+  const tVal = Math.max(0, it.taxValue ?? 0);
+  let baseAfterTaxDisc = basePreTax;
+  if (tMethod === "INCLUSIVE") {
+    const inclusiveTaxMultiplier = (100 + tVal) / 100;
+    baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
+  }
+  baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
+  const inclDiff = applyRound(basePreTax - baseAfterTaxDisc, lineFmt, precision);
+  let discountValue = 0;
+  if (dMode === "AMOUNT") {
+    discountValue = dVal;
+  } else if (dMode === "PERCENTAGE") {
+    discountValue = percentage(baseAfterTaxDisc, dVal);
+  }
+  discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
+  let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
+  afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
+  let calculatedTax = percentage(afterDisc, tVal);
+  calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
+  let grossAmount = afterDisc + calculatedTax;
+  grossAmount = maybeStep(grossAmount, stepwise, lineFmt, precision);
+  if (coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
+    copayAmount = grossAmount;
+  }
+  copayAmount = applyRound(copayAmount, lineFmt, precision);
+  const copay = clamp(Math.max(0, copayAmount), 0, grossAmount);
+  const patientRaw = applyRound(grossAmount - copay, RoundFormat.TO_FIXED, 2);
+  const patientRounded = applyRound(patientRaw, lineFmt, precision);
+  const lineRoundOff = applyRound(patientRounded - patientRaw, RoundFormat.TO_FIXED, 2);
+  return {
+    // include baseRate if your ChildCalculated type has it (as in your bulk function)
+    baseRate: applyRound(baseRate, lineFmt, precision),
+    subtotalAmount: applyRound(subtotal + other - inclDiff, lineFmt, precision),
+    otherChargeAmount: other,
+    discountMode: dMode,
+    discountValue: dVal,
+    discountAmount: applyRound(discountValue, lineFmt, precision),
+    taxMethod: tMethod,
+    taxValue: tVal,
+    taxAmount: applyRound(calculatedTax, lineFmt, precision),
+    grossAmount: applyRound(grossAmount, lineFmt, precision),
+    netAmount: patientRounded,
+    roundOffAmount: lineRoundOff,
+    copayAmount: copay
+  };
+}
 
 // src/utils/audit.utils.ts
 function isValidDate(value) {
@@ -2108,6 +2133,7 @@ var NotificationEmitter = class {
   NotificationEmitter,
   RoundFormat,
   calculateBillingFromChildren,
+  calculateSingleChild,
   commonService,
   customOmit,
   findDifferences,

package/dist/index.mjs

@@ -257,7 +257,12 @@ var commonRepository = (serviceDeps) => {
       const totalPages = Math.ceil(totalRecords / pageSize);
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords,
@@ -333,7 +338,7 @@ var commonRepository = (serviceDeps) => {
       logger.info("exiting::commonSearch::repository");
       return results;
     },
-    async commonFetch({ id, shortCodeData }) {
+    async commonFetch({ id, shortCodeData, includes }) {
       logger.info("entering::commonFetch::repository");
       const tableName = shortCodeData.tableName;
       const model = db[tableName];
@@ -341,7 +346,8 @@ var commonRepository = (serviceDeps) => {
         throw new ErrorHandler(400, generateErrorMessage("INVALID_TABLE"));
       }
       const results = model.findUnique({
-        where: { id, isActive: true }
+        where: { id, isActive: true },
+        include: includes ? includes : void 0
       });
       logger.info("exiting::commonFetch::repository");
       return results;
@@ -548,7 +554,12 @@ var commonRepository = (serviceDeps) => {
       const totalPages = Math.ceil(totalRecords / pageSize);
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords,
@@ -609,7 +620,12 @@ var commonRepository = (serviceDeps) => {
       });
       const DTOClass = dtoMapping[shortCodeData.shortCode];
       if (shortCodeData.isDTO && DTOClass) {
-        const DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        let DTOs = [];
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DTOs = await Promise.all(results.map((record) => DTOClass(record)));
+        } else {
+          DTOs = await DTOClass(results);
+        }
         return {
           data: DTOs,
           totalRecords
@@ -933,7 +949,7 @@ var commonService = (serviceDeps) => {
       logger.info("entering::fetch::service");
       const shortCodeData = fetchParams.shortCodeData;
       let commonData;
-      if (shortCodeData.isCacheable && fetchParams.shortCode !== "UIN_CONFIG") {
+      if (shortCodeData.isCacheable && fetchParams.shortCode !== "UIN_CONFIG" && !fetchParams.includes) {
         commonData = await getCacheById(
           `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`,
           fetchParams.id
@@ -952,7 +968,12 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(404, generateErrorMessage("NOT_FOUND", `${shortCodeData.tableName}`));
       }
       if (shortCodeData.isDTO && dtoMapping[shortCodeData.shortCode]) {
-        const DtoResult = await dtoMapping[shortCodeData.shortCode](commonData);
+        let DtoResult;
+        if (shortCodeData.isSingleDto === void 0 || shortCodeData.isSingleDto === true) {
+          DtoResult = await dtoMapping[shortCodeData.shortCode](commonData);
+        } else {
+          DtoResult = (await dtoMapping[shortCodeData.shortCode]([commonData]))?.[0];
+        }
         return DtoResult;
       }
       logger.info("exiting::fetch::service");
@@ -1092,71 +1113,7 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   const headFmt = options.headerRound ?? lineFmt;
   const precision = options.precision ?? 2;
   const children = inputs.map((it) => {
-    let baseRate = it.rate;
-    if (it.addonPercentage) {
-      baseRate = baseRate + percentage(baseRate, it.addonPercentage);
-      baseRate = applyRound(baseRate, lineFmt, precision);
-    }
-    const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
-    const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
-    const basePreTax = applyRound(subtotal + other, lineFmt, precision);
-    let copayAmount2 = 0;
-    if (masterExtra.coPayMode === "PERCENTAGE-AMOUNT") {
-      const copayType = it.coPaymentType ?? "AMOUNT";
-      const copayValue = it.coPayValue ?? 0;
-      copayAmount2 = copayType === "PERCENTAGE" ? percentage(subtotal, copayValue) : Math.min(copayValue, subtotal);
-    }
-    const dMode = it.discountMode ?? "AMOUNT";
-    const dVal = it.discountValue ?? 0;
-    const tMethod = it.taxMethod ?? "NONE";
-    const tVal = Math.max(0, it.taxValue ?? 0);
-    let baseAfterTaxDisc = basePreTax;
-    let discountValue = 0;
-    if (tMethod === "INCLUSIVE") {
-      const inclusiveTaxMultiplier = (100 + tVal) / 100;
-      baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
-    }
-    baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
-    const inxInclusiveDiff = applyRound(basePreTax - baseAfterTaxDisc, lineFmt, precision);
-    if (dMode === "AMOUNT") {
-      discountValue = dVal;
-    } else if (dMode === "PERCENTAGE") {
-      discountValue = percentage(baseAfterTaxDisc, dVal);
-    }
-    discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
-    let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
-    afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
-    let calculatedTax = percentage(afterDisc, tVal);
-    calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
-    let grossAmount2 = afterDisc + calculatedTax;
-    grossAmount2 = maybeStep(grossAmount2, stepwise, lineFmt, precision);
-    if (masterExtra.coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
-      copayAmount2 = grossAmount2;
-    }
-    copayAmount2 = applyRound(copayAmount2, lineFmt, precision);
-    const copay = clamp(Math.max(0, copayAmount2), 0, grossAmount2);
-    const patientRaw = applyRound(grossAmount2 - copay, "TO_FIXED", 2);
-    const patientRounded = applyRound(patientRaw, lineFmt, precision);
-    const lineRoundOff = patientRounded - patientRaw;
-    return {
-      baseRate: applyRound(baseRate, lineFmt, precision),
-      subtotalAmount: applyRound(subtotal + other - inxInclusiveDiff, lineFmt, precision),
-      otherChargeAmount: other,
-      discountMode: dMode,
-      discountValue: dVal,
-      discountAmount: applyRound(discountValue, lineFmt, precision),
-      // item-only discount
-      taxMethod: tMethod,
-      taxValue: tVal,
-      taxAmount: applyRound(calculatedTax, lineFmt, precision),
-      grossAmount: applyRound(grossAmount2, lineFmt, precision),
-      netAmount: patientRounded,
-      // patient payable at line
-      roundOffAmount: applyRound(lineRoundOff, "TO_FIXED", 2),
-      // rounded - raw
-      copayAmount: copay
-      // insurer covered at line
-    };
+    return calculateSingleChild(it, masterExtra.coPayMode ?? "PERCENTAGE-AMOUNT", options);
   });
   const subtotalAmount = children.reduce((a, c) => a + c.subtotalAmount, 0);
   const otherChargeAmount = children.reduce((a, c) => a + c.otherChargeAmount, 0);
@@ -1194,6 +1151,73 @@ function calculateBillingFromChildren(inputs, masterExtra, options = {}) {
   };
   return { master, children };
 }
+function calculateSingleChild(it, coPayMode, options = {}) {
+  const stepwise = options.calculationMethod === "STEP_WISE";
+  const lineFmt = options.lineRound ?? RoundFormat.TO_FIXED;
+  const precision = options.precision ?? 2;
+  let baseRate = it.rate;
+  if (it.addonPercentage) {
+    baseRate = baseRate + percentage(baseRate, it.addonPercentage);
+    baseRate = applyRound(baseRate, lineFmt, precision);
+  }
+  const subtotal = applyRound(it.qty * baseRate, lineFmt, precision);
+  const other = applyRound(it.otherCharge ?? 0, lineFmt, precision);
+  const basePreTax = applyRound(subtotal + other, lineFmt, precision);
+  let copayAmount = 0;
+  if (coPayMode === "PERCENTAGE-AMOUNT") {
+    const copayType = it.coPaymentType ?? "AMOUNT";
+    const copayValue = it.coPayValue ?? 0;
+    copayAmount = copayType === "PERCENTAGE" ? percentage(subtotal, copayValue) : Math.min(copayValue, subtotal);
+  }
+  const dMode = it.discountMode ?? "AMOUNT";
+  const dVal = it.discountValue ?? 0;
+  const tMethod = it.taxMethod ?? "NONE";
+  const tVal = Math.max(0, it.taxValue ?? 0);
+  let baseAfterTaxDisc = basePreTax;
+  if (tMethod === "INCLUSIVE") {
+    const inclusiveTaxMultiplier = (100 + tVal) / 100;
+    baseAfterTaxDisc = basePreTax / inclusiveTaxMultiplier;
+  }
+  baseAfterTaxDisc = maybeStep(baseAfterTaxDisc, stepwise, lineFmt, precision);
+  const inclDiff = applyRound(basePreTax - baseAfterTaxDisc, lineFmt, precision);
+  let discountValue = 0;
+  if (dMode === "AMOUNT") {
+    discountValue = dVal;
+  } else if (dMode === "PERCENTAGE") {
+    discountValue = percentage(baseAfterTaxDisc, dVal);
+  }
+  discountValue = maybeStep(discountValue, stepwise, lineFmt, precision);
+  let afterDisc = Math.max(0, baseAfterTaxDisc - discountValue);
+  afterDisc = maybeStep(afterDisc, stepwise, lineFmt, precision);
+  let calculatedTax = percentage(afterDisc, tVal);
+  calculatedTax = maybeStep(calculatedTax, stepwise, lineFmt, precision);
+  let grossAmount = afterDisc + calculatedTax;
+  grossAmount = maybeStep(grossAmount, stepwise, lineFmt, precision);
+  if (coPayMode === "EXCLUSIVE-INCLUSIVE" && it.coPayMethod === "INCLUSIVE") {
+    copayAmount = grossAmount;
+  }
+  copayAmount = applyRound(copayAmount, lineFmt, precision);
+  const copay = clamp(Math.max(0, copayAmount), 0, grossAmount);
+  const patientRaw = applyRound(grossAmount - copay, RoundFormat.TO_FIXED, 2);
+  const patientRounded = applyRound(patientRaw, lineFmt, precision);
+  const lineRoundOff = applyRound(patientRounded - patientRaw, RoundFormat.TO_FIXED, 2);
+  return {
+    // include baseRate if your ChildCalculated type has it (as in your bulk function)
+    baseRate: applyRound(baseRate, lineFmt, precision),
+    subtotalAmount: applyRound(subtotal + other - inclDiff, lineFmt, precision),
+    otherChargeAmount: other,
+    discountMode: dMode,
+    discountValue: dVal,
+    discountAmount: applyRound(discountValue, lineFmt, precision),
+    taxMethod: tMethod,
+    taxValue: tVal,
+    taxAmount: applyRound(calculatedTax, lineFmt, precision),
+    grossAmount: applyRound(grossAmount, lineFmt, precision),
+    netAmount: patientRounded,
+    roundOffAmount: lineRoundOff,
+    copayAmount: copay
+  };
+}
 
 // src/utils/audit.utils.ts
 function isValidDate(value) {
@@ -2059,6 +2083,7 @@ export {
   NotificationEmitter,
   RoundFormat,
   calculateBillingFromChildren,
+  calculateSingleChild,
   commonService,
   customOmit,
   findDifferences,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.0.25",
+  "version": "1.1.1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",