เพิ่มเติม field mark ต่างๆของเครื่องราชย์
This commit is contained in:
Suphonchai Phoonsawat
parent
afb7b60a19
commit
3a09367e88
2 changed files with 359 additions and 59 deletions
|
|
@ -2769,7 +2769,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -2820,7 +2825,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -2918,7 +2928,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -2971,7 +2986,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -3069,7 +3089,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -3122,7 +3147,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ม. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -3305,7 +3335,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -3356,7 +3391,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -3500,7 +3540,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -3551,7 +3596,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -3648,7 +3698,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.SalaryCondition >= 22140)
|
||||
|
|
@ -3702,7 +3757,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
$"เงินเดือน ณ วันที่ {(new DateTime(period.Year, 4, 29)).ToThaiFullDate3()} เป็นเงิน {p.SalaryCondition} บาท"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -3799,7 +3859,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.SalaryCondition >= 22140)
|
||||
|
|
@ -3853,7 +3918,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
$"เงินเดือนก่อนวันที่ {(new DateTime(period.Year - 5, 4, 29)).ToThaiFullDate3()} เป็นเงิน {p.SalaryCondition} บาท"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4034,7 +4104,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -4068,7 +4143,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4166,7 +4246,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.SalaryCondition >= 58390)
|
||||
|
|
@ -4227,7 +4312,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4389,7 +4479,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -4440,7 +4535,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4539,7 +4639,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -4592,7 +4697,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4689,7 +4799,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -4742,7 +4857,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ม. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -4923,7 +5043,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -4982,7 +5107,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -5080,7 +5210,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -5139,7 +5274,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -5237,7 +5377,13 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -5296,7 +5442,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -5475,7 +5626,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(x => x.FirstRecvInsigniaYear != 0 && x.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -5534,7 +5690,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -5632,7 +5793,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -5691,7 +5857,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -5787,7 +5958,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -5846,7 +6022,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6022,7 +6203,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Select(p => new InsigniaResultSet
|
||||
|
|
@ -6073,7 +6259,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6171,7 +6362,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.SalaryCondition >= 58390)
|
||||
|
|
@ -6232,7 +6428,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6389,7 +6590,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -6442,7 +6648,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6540,7 +6751,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -6593,7 +6809,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ม. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6692,7 +6913,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -6745,7 +6971,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -6923,7 +7154,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -6976,7 +7212,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ท.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -7074,7 +7315,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -7127,7 +7373,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ม. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -7225,7 +7476,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -7278,7 +7534,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับ ป.ช. ในปี {p.FirstRecvInsigniaYear.Value.ToThaiYear()}"
|
||||
},
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -7427,7 +7688,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -7486,7 +7752,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -7584,7 +7855,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 3)
|
||||
|
|
@ -7643,7 +7919,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -7739,7 +8020,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4Id = p.Child4Id,
|
||||
Child4DnaId = p.Child4DnaId,
|
||||
Child4 = p.Child4,
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList()
|
||||
.Where(p => p.FirstRecvInsigniaYear != 0 && p.FirstRecvInsigniaYear <= period.Year - 5)
|
||||
|
|
@ -7798,7 +8084,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
Result = $"ได้รับเงินประจำตำแหน่ง {p.SalaryPosition} บาท"
|
||||
}
|
||||
},
|
||||
ProfileType = p.ProfileType
|
||||
ProfileType = p.ProfileType,
|
||||
|
||||
MarkDiscipline = p.MarkDiscipline,
|
||||
MarkInsignia = p.MarkInsignia,
|
||||
MarkLeave = p.MarkLeave,
|
||||
MarkRate = p.MarkRate
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -8560,6 +8851,11 @@ namespace BMA.EHR.Application.Repositories
|
|||
Child4 = item.Child4,
|
||||
Child4Id = item.Child4Id,
|
||||
Child4DnaId = item.Child4DnaId,
|
||||
|
||||
MarkDiscipline = item.MarkDiscipline,
|
||||
MarkInsignia = item.MarkInsignia,
|
||||
MarkLeave = item.MarkLeave,
|
||||
MarkRate = item.MarkRate
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -265,7 +265,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
requestDoc = "", //irp.DocumentStatus,
|
||||
requestNote = "", // irp.Note,
|
||||
requestSalary = irp.Salary,
|
||||
matchingConditions = JsonConvert.DeserializeObject<List<MatchingCondition>>(irp.MatchingConditions)
|
||||
matchingConditions = JsonConvert.DeserializeObject<List<MatchingCondition>>(irp.MatchingConditions),
|
||||
irp.MarkRate,
|
||||
irp.MarkLeave,
|
||||
irp.MarkInsignia,
|
||||
irp.MarkDiscipline
|
||||
})
|
||||
.OrderBy(x => x.citizenId)
|
||||
.ToList();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue