Commit graph

1503 commits

Author SHA1 Message Date
Bright
ef01602285 no message 2024-11-19 11:46:53 +07:00
Bright
ab07e0485f update report4 2024-11-19 11:45:10 +07:00
kittapath
8f0624d27b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 18:20:18 +07:00
kittapath
0e16114d60 no message 2024-11-18 18:20:07 +07:00
Bright
ae47c72569 mock report4 2024-11-18 17:51:26 +07:00
kittapath
5e4ea343dc no message 2024-11-18 17:40:38 +07:00
kittapath
5fcaf51908 no message 2024-11-18 17:29:36 +07:00
kittapath
9e78cf7345 no message 2024-11-18 17:23:40 +07:00
kittapath
3c9698f606 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 14:34:14 +07:00
kittapath
58c371b888 draft org 2024-11-18 14:34:01 +07:00
Bright
8f2b8568ef add salary 2024-11-18 13:38:41 +07:00
kittapath
8001a4b138 get detail profile 2024-11-18 10:45:05 +07:00
Bright
5bc6101e12 change profile.salary 2024-11-15 16:57:20 +07:00
Bright
c7c32be069 no message 2024-11-15 16:35:18 +07:00
Bright
722dc85509 fix 2024-11-15 16:26:26 +07:00
kittapath
f757e5aeeb Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 15:34:49 +07:00
kittapath
d4ef9e0702 add commander 2024-11-15 15:34:37 +07:00
3cb06d9e19 Merge branch 'develop' into adiDev 2024-11-15 15:14:59 +07:00
a130cc71a1 testRabbit 2024-11-15 15:10:34 +07:00
kittapath
23d3cabc88 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:57:08 +07:00
Bright
7e87cec833 api อัพเดทเงินเดือน 2024-11-15 14:55:59 +07:00
kittapath
b94c5c2f09 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:55:56 +07:00
kittapath
8dc18d744d no message 2024-11-15 14:54:58 +07:00
Bright
5ac8da1057 update profile.amount & fix lock 2024-11-15 13:48:24 +07:00
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