Commit graph

121 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
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
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
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
5df57fc4d6 เช็คตำแหน่งซ้ำ 2024-02-20 13:35:11 +07:00
Kittapath
885e1e725c บันที่กแก้ไขอัตราตำแหน่ง 2024-02-19 16:00:19 +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
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
ab3391b179 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-13 19:03:13 +07:00
Kittapath
d633e78058 no message 2024-02-13 18:37:58 +07:00
25b42ec3f8 delete log 2024-02-13 18:28:08 +07:00
9045ec339c fix order 2024-02-13 18:27:03 +07:00
Kittapath
60b25c6620 แก้ error สร้าง node 2024-02-13 17:21:33 +07:00
Kittapath
634c82eb5c แก้ api สืบทอดตำแหน่ง 2024-02-13 17:14:54 +07:00
Kittapath
179bd7f2d0 แก้ฟิววันที่ประวัติ 2024-02-13 17:09:06 +07:00
Kittapath
7f56d35876 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-02-13 15:37:41 +07:00
Kittapath
ed862a3802 no message 2024-02-13 15:36:23 +07:00
0926594e33 fix org_068 2024-02-13 14:31:36 +07:00
145e64b655 org_068 2024-02-12 17:06:31 +07:00
094c7775ea recovery function "summary" 2024-02-12 16:27:10 +07:00
e9e2fb5fd6 Merge branch 'adiDev' into develop 2024-02-12 15:45:20 +07:00
ff057c6824 fix org_053 2024-02-12 15:44:34 +07:00
Bright
59d3734184 posMasterOrder เพิ่มตำแหน่ง 2024-02-12 15:00:30 +07:00
2809626c45 fix word 2024-02-12 12:23:37 +07:00
2bfc926f4b fix default sortName 2024-02-12 12:08:43 +07:00
44fa203add fix bug 2024-02-12 11:02:42 +07:00