Commit graph

238 commits

Author SHA1 Message Date
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
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
Bright
022770c2c9 struct-chart 2024-02-14 12:18:24 +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
Bright
59d3734184 posMasterOrder เพิ่มตำแหน่ง 2024-02-12 15:00:30 +07:00
Kittapath
632dc300da report1 report3 2024-02-12 14:43:38 +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
80a5ca01cb Merge branch 'adiDev' into develop 2024-02-12 10:58:24 +07:00
1ed37b770c fix api org_053 isAll ทำงานผิดพลาด 2024-02-12 10:57:35 +07:00
Kittapath
748c91747e แก้ชื่อ report2 2024-02-12 09:50:04 +07:00
Kittapath
0819836932 แก้api clone org 2024-02-11 22:30:12 +07:00
Kittapath
b2d8fa6bf8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-09 22:56:00 +07:00
Kittapath
bc86f4d2d9 no message 2024-02-09 22:55:42 +07:00
Bright
0e71ba98ea ปรับ api ตำแหน่งทั้งหมด 2024-02-09 16:35:01 +07:00
3bfbb93691 fullNameCurrentHolder และ fullNameNextHolder สลับกัน org_053 (master/list) 2024-02-09 09:27:11 +07:00
Kittapath
ca9a699d42 no message 2024-02-08 19:46:18 +07:00
Kittapath
a1b4d054c0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-08 18:05:10 +07:00
Kittapath
2c86badef2 no message 2024-02-08 18:04:54 +07:00
961677cb19 เผื่อต้องเช็คค่าว่าง next_holderId 2024-02-08 17:06:21 +07:00
0648eb486b Merge branch 'adiDev' into develop 2024-02-08 16:48:49 +07:00
126eced955 เพิ่มเงื่อนไข cron-job และ เพิ่ม validate ProfileController 2024-02-08 16:48:11 +07:00
Kittapath
a98170ff0a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-08 15:48:23 +07:00
Kittapath
81ae8876d4 no message 2024-02-08 15:47:22 +07:00
fa36abfe85 Merge branch 'adiDev' into develop
# Conflicts:
#	src/controllers/ProfileController.ts
2024-02-08 15:43:32 +07:00
72abe0cae5 checkpoint 2024-02-08 15:40:47 +07:00