Commit graph

1161 commits

Author SHA1 Message Date
kittapath
e862829246 no message 2024-10-03 15:10:58 +07:00
kittapath
79ce6fc569 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-10-03 15:03:46 +07:00
Bright
2f3a68254e no message 2024-10-03 14:58:48 +07:00
kittapath
93f8fa5832 no message 2024-10-03 14:58:01 +07:00
kittapath
569f0f7fd9 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop
# Conflicts:
#	BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
2024-10-03 14:53:13 +07:00
kittapath
ac60b954d4 no message 2024-10-03 14:52:39 +07:00
kittapath
63a9d4226c no message 2024-10-03 14:27:52 +07:00
Bright
7309ba9855 Merge branch 'develop' into develop-Bright 2024-10-03 14:11:08 +07:00
Bright
197bcd2307 no message 2024-10-03 14:10:35 +07:00
kittapath
9dc513f7a9 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-10-03 14:02:19 +07:00
kittapath
78ebcd3a4e no message 2024-10-03 14:02:06 +07:00
Bright
a2bc5f116b no message 2024-10-03 13:27:22 +07:00
kittapath
4cf3f15fb8 แก้คำสั่ง 2024-10-02 22:54:34 +07:00
kittapath
a09a732ff1 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-10-02 21:29:55 +07:00
kittapath
9567181117 no message 2024-10-02 21:29:44 +07:00
Bright
d5a2042d35 no message 2024-10-02 17:48:55 +07:00
Bright
3419a314e1 update 11 12 2024-10-02 16:24:02 +07:00
Bright
065d3e91bf Merge branch 'develop' into develop-Bright 2024-10-02 16:10:50 +07:00
Bright
f908a3b065 Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-BackEnd into develop 2024-10-02 16:10:31 +07:00
Bright
64f0e99283 no message 2024-10-02 16:10:16 +07:00
kittapath
1374757bf2 ออกคำสั่ง 2024-10-02 16:02:20 +07:00
kittapath
139969b324 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-10-02 15:16:06 +07:00
kittapath
bce6732bdb no message 2024-10-02 15:14:37 +07:00
Bright
0e5946db71 แนบท้าย 1 2 3 4 39 5 6 7 2024-10-02 14:51:16 +07:00
kittapath
874d310b35 no message 2024-10-02 13:24:16 +07:00
kittapath
a3ed79227b no message 2024-10-02 13:06:05 +07:00
Bright
27aa7a773d ส่งรายชื่อออกคำสั่ง 3, 4, 39, 5, 6 2024-10-02 12:04:06 +07:00
kittapath
9b6db93a5f no message 2024-10-02 11:25:45 +07:00
kittapath
14b3c386e0 no message 2024-10-02 09:48:59 +07:00
kittapath
938bfe0c4f ออกคำสั่ง 01 02 2024-10-01 23:34:01 +07:00
d3d7179c48 fix 2024-09-30 16:57:46 +07:00
a0cc233846 fix #617 2024-09-30 14:45:40 +07:00
47e8290cd2 fix #642 again 2024-09-30 11:50:29 +07:00
Bright
9f41ca5dd4 Merge branch 'develop' into develop-Bright 2024-09-27 17:43:26 +07:00
Bright
04b20e49c9 fix ใบสมัคร 2024-09-27 17:42:59 +07:00
0c80c69b12 fix เครื่องราช 2024-09-27 17:42:03 +07:00
kittapath
ec8a6de291 Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-09-26 17:27:17 +07:00
kittapath
c842aad1e9 แก้ noti 2024-09-26 17:26:39 +07:00
e030d54b9a เพิ่ม revisionId และแก้ตรวจสิทธิ์ 2024-09-26 17:24:29 +07:00
Bright
f5130a4c3c fix กรณีเรียกใช้ api มากกว่า 1 เมนู 2024-09-26 09:16:15 +07:00
Bright
0cb940a927 fix permission insignia #635, #636 2024-09-25 17:58:37 +07:00
e5bb186925 แก้สิทธิ์ #642 2024-09-25 17:43:55 +07:00
kittapath
bdded23e1a Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop 2024-09-25 15:17:05 +07:00
c954185717 Merge branch 'develop' into adiDev 2024-09-25 14:49:21 +07:00
05a5897dc7 แก้ไข #632 และ #633 2024-09-25 14:48:46 +07:00
Bright
7a96917926 fix รายการขอโอน เงินเดือนไม่แสดง 2024-09-25 11:29:49 +07:00
a1cd8ac9a3 ระบบจัดการสิทธิ์>>ระบบวินัย (กรณีเพิ่มรายชื่อกรรมการ) #630 2024-09-24 16:35:49 +07:00
a84a1a7776 Merge branch 'develop' into adiDev
# Conflicts:
#	BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
2024-09-24 15:59:55 +07:00
f1ab73fd39 fix สิทธิ์เครื่องราช รายงาน 2024-09-24 15:54:57 +07:00
Bright
90f3a7bfe5 add permission insignia 2024-09-24 15:40:07 +07:00