Commit graph

1914 commits

Author SHA1 Message Date
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
kittapath
9991b3c8ce no message 2024-11-21 12:13:24 +07:00
kittapath
a40a2a7f2b no message 2024-11-21 11:49:14 +07:00
fb3dd54518 Merge branch 'develop' into adiDev 2024-11-21 11:39:21 +07:00
657d885e32 sort and verify email 2024-11-21 11:38:24 +07:00
kittapath
fb5a30c699 no message 2024-11-21 11:33:35 +07:00
kittapath
04406080dc หมายเหตุเงื่อนไข 2024-11-21 11:11:16 +07:00
kittapath
15a9f6a376 no message 2024-11-21 10:54:09 +07:00
Bright
396440e4bc fix แนบท้ายคำสั่งรักษาการ 2024-11-20 18:57:03 +07:00
Bright
a30821acc3 REPORT 4 2024-11-20 18:17:17 +07:00
kittapath
9db1ca7492 no message 2024-11-20 16:40:00 +07:00
kittapath
dc6e157ffe Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-20 16:08:11 +07:00
kittapath
31fbfaed3b no message 2024-11-20 16:06:48 +07:00
6abb33ccff fix 2024-11-20 15:07:17 +07:00
854785434f fix 2024-11-20 15:05:18 +07:00
be2afbde3a Merge branch 'develop' into adiDev 2024-11-20 14:03:12 +07:00
9dac11934b checkpoint,แก้ไขชื่อฟิว 2024-11-20 14:02:01 +07:00
Bright
b85de85d7e no message 2024-11-19 18:13:08 +07:00
Bright
3803e593a5 Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 18:09:28 +07:00
Bright
530bce3505 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-11-19 18:07:27 +07:00
Bright
b1c88e9872 no message 2024-11-19 18:07:06 +07:00
8eae807a64 Merge branch 'develop' into adiDev 2024-11-19 14:35:38 +07:00
b456fe46ff sort data #798 2024-11-19 14:34:33 +07:00
kittapath
a967afeb87 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 12:57:14 +07:00
kittapath
3cd0b4e9da no message 2024-11-19 12:56:19 +07:00