Commit graph

1824 commits

Author SHA1 Message Date
kittapath
93b0dff070 no message 2024-11-15 11:34:42 +07:00
kittapath
4880522497 download kk1 2024-11-15 09:29:24 +07:00
kittapath
0e0cfda81c no message 2024-11-14 18:39:19 +07:00
kittapath
1c991a5ad8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
2024-11-14 18:05:30 +07:00
kittapath
c0bfd46fc3 no message 2024-11-14 18:03:56 +07:00
Bright
efff0bf99f แก้วุฒิ/สาขา 2024-11-14 17:29:54 +07:00
kittapath
ff49b53713 no message 2024-11-14 16:25:46 +07:00
kittapath
d1f8c6fc14 no message 2024-11-14 15:39:52 +07:00
kittapath
81a9a019c3 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-14 15:00:23 +07:00
kittapath
5530c36f93 no message 2024-11-14 14:58:31 +07:00
Bright
e5aa44408c fix ระงับใช้งานเข้าสู่ระบบ Command08,09,25,26 2024-11-14 14:42:32 +07:00
kittapath
bc6e43a700 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-14 11:52:03 +07:00
kittapath
413444fe34 no message 2024-11-14 11:51:16 +07:00
24b716eb27 Merge branch 'adiDev' into develop 2024-11-14 11:43:08 +07:00
0dc12fdfe7 fix 2024-11-14 11:41:58 +07:00
kittapath
19ffc8f084 แก้ สิทธิ์ 2024-11-14 11:41:52 +07:00
kittapath
98a1d2d4dc Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-14 11:17:53 +07:00
kittapath
942b66d2ac เพิ่มตำแหน่งเงื่อนไข 2024-11-14 11:17:41 +07:00
b2126debc0 no message 2024-11-14 11:04:52 +07:00
kittapath
14d2b45588 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-14 10:59:43 +07:00
2511da3898 ปรับเครื่องราช #1154 2024-11-14 10:36:16 +07:00
kittapath
3d379846da Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-14 10:32:02 +07:00
kittapath
398c4d6994 หา สกจ root 2024-11-14 10:31:14 +07:00
4edf59ecd1 Merge branch 'develop' into adiDev 2024-11-14 09:45:51 +07:00
8026a1de80 สิทธิ์การเห็นข้อมูล uesr #781 2024-11-14 09:45:00 +07:00
Bright
9a0348dada fix issue #679 2024-11-13 18:39:16 +07:00
Bright
eab9b79aa7 no message 2024-11-13 17:04:28 +07:00
kittapath
04928bb83a no message 2024-11-13 16:07:37 +07:00
kittapath
a354fe74fe bug create user 2024-11-13 15:59:08 +07:00
Bright
f953ba6d27 fix ส่วนราชการภายใต้หน่วยงานไม่แสดง 2024-11-13 14:47:27 +07:00
Bright
174be3a53a fix 2024-11-13 13:31:41 +07:00
kittapath
b96b06cc0a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-13 11:56:35 +07:00
kittapath
c38eae7498 หา root 2024-11-13 11:56:22 +07:00
Bright
5bba5822ea api เช็คสถานะโครงสร้าง 2024-11-13 11:32:45 +07:00
8d48dc8af7 Merge branch 'develop' into adiDev 2024-11-13 10:23:10 +07:00
577e228165 log sso and comment 2024-11-13 10:22:20 +07:00
Bright
ba43e19aa5 remove comment 2024-11-13 09:07:44 +07:00
9f48e5df1d Merge branch 'develop' into adiDev 2024-11-12 17:52:25 +07:00
4608ff14de เพิ่ม where search #776 2024-11-12 17:50:04 +07:00
Bright
87531f19ba test 2024-11-12 17:39:14 +07:00
kittapath
6e7f5f5af2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-12 17:21:53 +07:00
kittapath
9880bf912f no message 2024-11-12 17:19:07 +07:00
da9e89147c Merge branch 'develop' into adiDev 2024-11-12 17:11:31 +07:00
87ca9aa73a add commander name 2024-11-12 17:08:43 +07:00
kittapath
0324205206 noti all admin 2024-11-12 16:51:48 +07:00
kittapath
23f351a135 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-12 16:51:19 +07:00
kittapath
8d5b125dd0 noti admin 2024-11-12 16:51:06 +07:00
Bright
0f757f10e7 fix issue #708 2024-11-12 14:09:20 +07:00
kittapath
07e1a94da0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-12 13:38:20 +07:00
kittapath
5f947d4924 no message 2024-11-12 13:38:07 +07:00