hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-07-26 20:47:54 +07:00
commit 99187d08b5
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ImportDataController.ts
View file

@ -1001,7 +1001,7 @@ export class ImportDataController extends Controller {
_item.registrationProvinceId = provinceId ? provinceId.id : null_; _item.registrationProvinceId = provinceId ? provinceId.id : null_;
} }
} }
if (existingProfile.AMPHUR_CODE) { if (existingProfile.AMPHUR_CODE && provinceRegis_) {
districtRegis_ = await this.amphurRepo.findOne({ districtRegis_ = await this.amphurRepo.findOne({
where: { where: {
AMPHUR_CODE: existingProfile.AMPHUR_CODE, AMPHUR_CODE: existingProfile.AMPHUR_CODE,
@ -1017,7 +1017,7 @@ export class ImportDataController extends Controller {
_item.registrationDistrictId = districtId ? districtId.id : null_; _item.registrationDistrictId = districtId ? districtId.id : null_;
} }
} }
if (existingProfile.DISTRICT_CODE) { if (existingProfile.DISTRICT_CODE && districtRegis_ && provinceRegis_) {
subDistrictRegis_ = await this.subDistrictRepo.findOne({ subDistrictRegis_ = await this.subDistrictRepo.findOne({
where: { where: {
DISTRICT_CODE: existingProfile.DISTRICT_CODE, DISTRICT_CODE: existingProfile.DISTRICT_CODE,
@ -1048,7 +1048,7 @@ export class ImportDataController extends Controller {
_item.currentProvinceId = provinceId ? provinceId.id : null_; _item.currentProvinceId = provinceId ? provinceId.id : null_;
} }
} }
if (existingProfile.CONTACT_AMPHUR_CODE) { if (existingProfile.CONTACT_AMPHUR_CODE && provinceCurr_) {
districtCurr_ = await this.amphurRepo.findOne({ districtCurr_ = await this.amphurRepo.findOne({
where: { where: {
AMPHUR_CODE: existingProfile.CONTACT_AMPHUR_CODE, AMPHUR_CODE: existingProfile.CONTACT_AMPHUR_CODE,
@ -1064,7 +1064,7 @@ export class ImportDataController extends Controller {
_item.currentDistrictId = districtId ? districtId.id : null_; _item.currentDistrictId = districtId ? districtId.id : null_;
} }
} }
if (existingProfile.CONTACT_DISTRICT_CODE) { if (existingProfile.CONTACT_DISTRICT_CODE && districtCurr_ && provinceCurr_) {
subDistrictCurr_ = await this.subDistrictRepo.findOne({ subDistrictCurr_ = await this.subDistrictRepo.findOne({
where: { where: {
DISTRICT_CODE: existingProfile.CONTACT_DISTRICT_CODE, DISTRICT_CODE: existingProfile.CONTACT_DISTRICT_CODE,