Commit graph

146 commits

Author SHA1 Message Date
Kittapath
391c98682f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-03-04 15:36:39 +07:00
Kittapath
5330fde6c5 แก้บัคย้ายตำแหน่ง 2024-03-04 15:34:38 +07:00
df752bed74 fix bug 2024-03-04 15:29:09 +07:00
131246f824 Merge branch 'develop' into adiDev 2024-03-04 14:54:58 +07:00
5e2e13d8e8 fix code 2024-03-04 14:54:15 +07:00
Kittapath
e329157cda Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-03-04 09:43:46 +07:00
Kittapath
5f97ab1ac7 no message 2024-03-04 09:43:02 +07:00
2bb68463be fix bug 2024-03-04 09:23:51 +07:00
3e8f43537f fix 2024-03-01 15:43:03 +07:00
4c2f7120ce fix 2024-03-01 15:37:30 +07:00
16d718baa4 fix 2024-03-01 15:17:35 +07:00
7b29823f9e fix 2024-03-01 13:58:04 +07:00
4d3769e4b4 label name 2024-03-01 12:16:54 +07:00
ba76e787b0 แก้ไขค้นหาชื่อคนครอง master/list 2024-03-01 11:17:57 +07:00
21aa51ff99 Merge branch 'develop' into adiDev 2024-02-29 17:50:17 +07:00
019bdfcd1d fix sort posMasterNo 2024-02-29 17:49:39 +07:00
Kittapath
b53176ed05 เพิ่มฟิว isretire 2024-02-29 11:29:16 +07:00
Bright
da6f901b81 แก้ caption ไอดี 2024-02-28 14:00:38 +07:00
e9ed8ff3f4 remove try catch 2024-02-28 11:31:01 +07:00
d5e318f8dc clear comment 2024-02-23 09:36:28 +07:00
Kittapath
1eb01fb4d8 ต้นหาเลขที่ตำแหน่ง 2024-02-23 09:26:16 +07:00
Kittapath
f1c7ddd393 no message 2024-02-22 17:00:43 +07:00
Kittapath
7eef964d48 เลขที่ตำแหน่งซ้ำ 2024-02-22 10:08:29 +07:00
Kittapath
b42af12a5f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-21 17:48:34 +07:00
Kittapath
4ea60efd1a no message 2024-02-21 17:10:30 +07:00
Bright
cd30175423 no message 2024-02-21 17:04:07 +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