Commit graph

618 commits

Author SHA1 Message Date
b456b5ca72 fix 2024-05-17 11:09:04 +07:00
AnandaTon
6f74d3ddcc แก้ไขบัค employeeSalary 2024-05-17 09:42:49 +07:00
Kittapath
067231d291 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-17 09:32:23 +07:00
Kittapath
6525bbcb6f no message 2024-05-17 09:32:07 +07:00
Bright
61a68fdb19 เพิ่มฟิลด์ coupleCitizenId 2024-05-16 17:11:44 +07:00
Bright
c03fa76295 ตัดฟิลด์ couple 2024-05-16 16:06:11 +07:00
a39c33ae0d Merge branch 'develop' into adiDev 2024-05-16 15:24:08 +07:00
4dac692284 fix 2024-05-16 15:22:30 +07:00
AnandaTon
d26337caf3 แก้ชื่อ function 2024-05-16 15:16:00 +07:00
AnandaTon
3b5096c005 fix SalaryEmployee ลบไฟล์ รวมไฟล์ เพิ่ม field 2024-05-16 15:03:29 +07:00
AnandaTon
9603f895ad Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-16 14:10:20 +07:00
AnandaTon
fe6b5b5b04 Update ProfileDisciplineController.ts 2024-05-16 14:10:17 +07:00
Kittapath
feb8da3947 เพิ่มsearch avatar 2024-05-16 13:39:25 +07:00
Kittapath
61899e8431 no message 2024-05-16 12:18:51 +07:00
Kittapath
3ea5ec3486 อัพรูป 2024-05-16 12:13:46 +07:00
Kittapath
6010cc662c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-16 11:43:38 +07:00
Kittapath
17d9958882 no message 2024-05-16 11:41:26 +07:00
AnandaTon
701ab5af6e แก้ไขบัคปรับ salary 2024-05-16 11:36:17 +07:00
Bright
3e62126570 ปรับ family 2024-05-16 11:12:17 +07:00
Kittapath
0524653f4b แก้รูปเก่า false 2024-05-16 10:54:13 +07:00
0bbd172f2b Merge branch 'develop' into adiDev 2024-05-16 10:33:42 +07:00
ffb5b38936 empAddress and fix durationYear 2024-05-16 10:32:51 +07:00
Kittapath
73c91bd9b1 update_table_ProfileAvatar_add_isactive 2024-05-16 10:01:59 +07:00
9f2357b81c Merge branch 'develop' into adiDev 2024-05-15 18:07:12 +07:00
cf3c3feba2 fix entity and store dateRetire 2024-05-15 18:06:28 +07:00
Bright
4fa11d2aea ปรับ children 2024-05-15 18:02:16 +07:00
Kittapath
1a017dcd76 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-15 16:09:42 +07:00
Kittapath
277805791d no message 2024-05-15 16:09:25 +07:00
Bright
702ed615ea Family Controller 2024-05-15 15:41:51 +07:00
0df3191fcc Merge branch 'develop' into adiDev 2024-05-15 15:31:51 +07:00
Kittapath
9365c6c62e no message 2024-05-15 15:29:23 +07:00
c9c14f052b orderBy 2024-05-15 15:29:12 +07:00
67c54e3273 fix word 2024-05-15 13:44:17 +07:00
298d92666a Merge branch 'develop' into adiDev 2024-05-15 13:39:14 +07:00
89cdee99b3 validate citizenId 2024-05-15 13:38:00 +07:00
Kittapath
db06615e5a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-15 12:29:15 +07:00
Kittapath
3129cb10b0 no message 2024-05-15 12:28:58 +07:00
a6f575bff3 Merge branch 'develop' into adiDev 2024-05-15 11:46:31 +07:00
56960aeb47 คำนวนเลขบัตรประชาชน (ยังไม่ได้ validate) 2024-05-15 11:45:06 +07:00
Bright
e4d7c034e8 no message 2024-05-15 11:42:37 +07:00
Bright
20ccb3f26d Fix District/subDistrict 2024-05-15 10:04:19 +07:00
Kittapath
73ae98ce0e comment family 2024-05-14 17:32:36 +07:00
Kittapath
09b543763b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/entities/Profile.ts
2024-05-14 17:29:14 +07:00
Kittapath
0114e41c3a แก้ไขบุตร 2024-05-14 17:26:06 +07:00
40205a3a97 Merge branch 'develop' into adiDev 2024-05-14 17:25:38 +07:00
AnandaTon
fcbbdbf4d1 fix bug แก้ชื่อ 2024-05-14 17:24:38 +07:00
9506128842 changName update and validate citizenId 2024-05-14 17:24:33 +07:00
Kittapath
291d3199d2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-14 16:48:17 +07:00
Kittapath
b8cbbb3a6f no message 2024-05-14 16:20:36 +07:00
AnandaTon
dd06c1f71f fix bug salary / nopaid 2024-05-14 16:16:24 +07:00