fix report เพิ่มเตืม

This commit is contained in:
Suphonchai Phoonsawat 2023-09-21 16:58:29 +07:00
parent 5dc7504323
commit 197bd53426
12 changed files with 4 additions and 4 deletions

View file

@ -257,7 +257,7 @@ namespace BMA.EHR.Application.Repositories.Commands
NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,
NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
NewSalary = p.Amount == null ? 0 : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber()
})
.ToList();

View file

@ -35,9 +35,9 @@ RUN apt-get update && apt-get -y install fontconfig && apt-get install -y --allo
#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewBoldItalic.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabun.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabun Bold.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabun Italic.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabun BoldItalic.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabunBold.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabunItalic.ttf /usr/share/fonts/truetype/
COPY ./BMA.EHR.Report.Service/Fonts/THSarabunBoldItalic.ttf /usr/share/fonts/truetype/
RUN fc-cache -f -v
WORKDIR /app