Commit graph

330 commits

Author SHA1 Message Date
Kittapath
4ea60efd1a no message 2024-02-21 17:10:30 +07:00
Kittapath
6b2f1c99d8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 16:22:09 +07:00
Kittapath
121c7f56e8 แก้บักตำแหน่ง 2024-02-21 16:18:32 +07:00
Bright
ee6f2c8551 edit posMaster 2024-02-21 16:13:23 +07:00
Kittapath
ff46ce568b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 13:53:24 +07:00
Kittapath
614fe24e12 no message 2024-02-21 13:53:02 +07:00
feedc9b527 ckp 2024-02-21 13:33:55 +07:00
b04699e5f4 Merge branch 'adiDev' into develop 2024-02-20 18:04:52 +07:00
352ced8053 edit position 2024-02-20 18:04:13 +07:00
Kittapath
6e84a46ac3 no message 2024-02-20 17:50:02 +07:00
Kittapath
24f2adbb22 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-02-20 17:13:26 +07:00
Kittapath
8fe7d295fe Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-20 17:12:28 +07:00
7f01e34045 2024-02-20 17:09:11 +07:00
Kittapath
6a8f530b23 no message 2024-02-20 17:00:04 +07:00
bb79b0a3d0 2024-02-20 16:59:13 +07:00
a47f07110a fix bug 2024-02-20 16:12:59 +07:00
9bfc141e4b check point 2024-02-20 16:01:05 +07:00
c78548410b add body revisionId 2024-02-20 15:42:10 +07:00
4b1df34f5b Merge branch 'develop' into adiDev 2024-02-20 15:23:05 +07:00
f4305c895e check query 2024-02-20 15:21:26 +07:00
Kittapath
f86aee6428 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-20 14:02:44 +07:00
Kittapath
06ea561e78 no message 2024-02-20 14:02:19 +07:00
ac36b37612 update query master list 2024-02-20 13:51:05 +07:00
Kittapath
e5b8817cab Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-20 13:35:30 +07:00
Kittapath
5df57fc4d6 เช็คตำแหน่งซ้ำ 2024-02-20 13:35:11 +07:00
83a130b6f5 Merge branch 'develop' into adiDev 2024-02-20 11:55:49 +07:00
b413fbe193 org_069 ค้นหาผู้บังคับบัญชา 2024-02-20 11:55:11 +07:00
Kittapath
885e1e725c บันที่กแก้ไขอัตราตำแหน่ง 2024-02-19 16:00:19 +07:00
Kittapath
1a22d631aa no message 2024-02-16 12:16:47 +07:00
Kittapath
5fc7aa0938 ค้นหาทะเบียนประวัติ 2024-02-16 12:07:37 +07:00
14bc29b675 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/PositionController.ts
2024-02-15 13:10:25 +07:00
4f4a3d1353 fix search with concat fullname 2024-02-15 13:08:41 +07:00
Bright
a1610880f0 ปรับ api master/list 2024-02-15 12:13:34 +07:00
Kittapath
d76af2c88c เช็คค่าซ้ำ 2024-02-15 10:31:47 +07:00
Bright
8756279309 แก้เช็คซ้ำ posDict 2024-02-15 10:25:10 +07:00
Kittapath
45050a279f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-15 09:41:43 +07:00
Kittapath
951b5a936e no message 2024-02-15 09:41:27 +07:00
Bright
edd5fdb3aa add fields api master/list 2024-02-15 09:39:13 +07:00
Kittapath
507b527c5e no message 2024-02-15 09:26:40 +07:00
Kittapath
dc8aec848b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-15 09:26:11 +07:00
Kittapath
9750b62255 no message 2024-02-15 09:24:27 +07:00
dc85167d7f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-15 09:05:46 +07:00
Kittapath
3634687455 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-15 08:57:04 +07:00
Kittapath
85313a35a0 api struct-chart 2024-02-15 08:56:26 +07:00
763bc5e372 Merge branch 'develop' into adiDev 2024-02-14 17:43:16 +07:00
6762f69615 search org_053 รายการอัตรากำลัง 2024-02-14 17:42:17 +07:00
Bright
5fbbd687fe เช็คเพิ่มตำแหน่งซ้ำ 2024-02-14 17:09:05 +07:00
Kittapath
b1f4a568a4 no message 2024-02-14 13:57:36 +07:00
Kittapath
b640820608 no message 2024-02-14 13:55:54 +07:00
Kittapath
36462e2465 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-14 13:54:11 +07:00