Commit graph

1938 commits

Author SHA1 Message Date
kittapath
5ef484dce4 no message 2024-11-27 15:37:39 +07:00
kittapath
b6f72e879c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-27 13:54:01 +07:00
kittapath
9ec42fd5d9 no message 2024-11-27 13:53:49 +07:00
Bright
5e8b372323 fix find positionLevel 2024-11-27 11:38:09 +07:00
kittapath
1155be4116 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-27 11:06:18 +07:00
kittapath
d7c10e4d64 no message 2024-11-27 11:06:05 +07:00
Bright
0fa198a771 sort จังหวัด อำเภอ ตำบล 2024-11-27 10:37:26 +07:00
Bright
b4b49b7378 Merge branch 'develop' into develop-Bright 2024-11-27 10:21:19 +07:00
Bright
2df1e19dc3 sort ข้อมูลหลัก 2024-11-27 10:20:40 +07:00
kittapath
2689d86386 no message 2024-11-27 10:19:15 +07:00
kittapath
94f92b5c9a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-26 17:33:55 +07:00
kittapath
9067895450 no message 2024-11-26 17:33:39 +07:00
Bright
5c08ffb217 ปรับส่งค่า personId เป็น array 2024-11-26 16:36:10 +07:00
kittapath
acb3434154 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-11-26 15:20:07 +07:00
kittapath
56fa762139 no message 2024-11-26 15:18:00 +07:00
Bright
a9dd7d089a serch name สิทธิ์ 2024-11-26 14:35:14 +07:00
Bright
2b5a236e90 ปรับ posNo 2024-11-26 10:42:16 +07:00
kittapath
eef0f87b5c no message 2024-11-25 21:48:13 +07:00
Bright
542df70eb7 update #805 2024-11-25 21:02:43 +07:00
kittapath
859c61aa99 no message 2024-11-25 17:07:44 +07:00
kittapath
0b4e597a81 no message 2024-11-25 16:57:36 +07:00
kittapath
ade79873ed Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-25 15:11:06 +07:00
kittapath
517aa1495a sort posno 2024-11-25 15:10:52 +07:00
16d0e5545e ออกคำสั่ง ต้องกดออกคำสั่ง 2 รอบติดกันระบบถึงจะออกคำสั่งให้#97 2024-11-25 14:16:08 +07:00
2ebb3e9b2b Merge branch 'develop' into adiDev 2024-11-25 11:28:36 +07:00
e47d3a88ef test rabbit 2024-11-25 11:27:30 +07:00
Bright
416cd49a27 add createdAt, lastUpdatedAt, lastUpdateFullName #805 2024-11-22 18:11:15 +07:00
6f1e2339f5 Merge branch 'develop' into adiDev 2024-11-22 17:31:33 +07:00
e9554e14fa log test 2024-11-22 17:30:44 +07:00
Bright
1d6a590e43 no message 2024-11-22 14:25:04 +07:00
219a9ff104 Merge branch 'develop' into adiDev 2024-11-22 13:44:31 +07:00
5c2c898d82 fix rabbit 2024-11-22 13:43:00 +07:00
kittapath
d2708113bb Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-22 12:18:28 +07:00
kittapath
44b8b516eb no message 2024-11-22 12:18:12 +07:00
Bright
e9f645052a add default ช่องทางการส่งสำเนา #99 2024-11-22 12:05:39 +07:00
Bright
102f1f6646 เช็ค update role keycloak #802 2024-11-22 11:34:11 +07:00
71d5ad0ab9 Merge branch 'develop' into adiDev 2024-11-22 10:03:25 +07:00
f5dda8646c ระบบพัฒนาบุคลากร>>อัปโหลดไฟล์รายชื่อผู้ผ่านการฝึกอบรม (ลูกจ้างประจำ) #803 2024-11-22 10:02:27 +07:00
kittapath
336ce5ca07 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-21 18:23:35 +07:00
kittapath
5e7fa0eddf no message 2024-11-21 18:20:29 +07:00
ae165074a8 Merge branch 'develop' into adiDev 2024-11-21 17:33:31 +07:00
d01ca5f061 fix 2024-11-21 17:32:31 +07:00
Bright
f419693b1a Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-11-21 17:06:08 +07:00
Bright
9ed7447095 update #802 2024-11-21 17:05:01 +07:00
522de9a7da Merge branch 'develop' into adiDev 2024-11-21 17:02:44 +07:00
34b872d142 fix path email 2024-11-21 17:01:35 +07:00
Bright
27f82f3652 เช็ค update role keycloak #802 2024-11-21 16:22:08 +07:00
2d2f35847a Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileController.ts
2024-11-21 16:01:33 +07:00
4d081fc47a fix expire token 2024-11-21 15:58:49 +07:00
kittapath
d220430325 no message 2024-11-21 15:39:38 +07:00