Commit graph

308 commits

Author SHA1 Message Date
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
Kittapath
b747ecedde no message 2024-02-14 13:53:43 +07:00
Bright
022770c2c9 struct-chart 2024-02-14 12:18:24 +07:00
Kittapath
e85691019f แก้ path build server 2024-02-13 21:02:34 +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
2ae08f3986 Merge branch 'develop' into adiDev 2024-02-13 14:32:17 +07:00
0926594e33 fix org_068 2024-02-13 14:31:36 +07:00
Kittapath
89beced8cc แก้คิวรี่บัฐชี 1/2/3 2024-02-13 09:59:10 +07:00
Bright
019ded1aa3 orgTreeOrder เพิ่มหน่วยงาน 2024-02-12 17:31:02 +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
Kittapath
50205553dd Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-12 15:18:53 +07:00
Kittapath
7990efc12b no message 2024-02-12 15:18:09 +07:00