diff --git a/src/main/java/com/balybus/galaxy/patient/basic/service/BasicServiceImpl.java b/src/main/java/com/balybus/galaxy/patient/basic/service/BasicServiceImpl.java index ae9a54a0..c7bc1fbc 100644 --- a/src/main/java/com/balybus/galaxy/patient/basic/service/BasicServiceImpl.java +++ b/src/main/java/com/balybus/galaxy/patient/basic/service/BasicServiceImpl.java @@ -177,7 +177,7 @@ public BasicResponseDto.GetPatientList getPatientList(String userEmail, BasicReq .address(codeService.fullAddressString(entity.getTblAddressFirst(), entity.getTblAddressSecond(), entity.getTblAddressThird())) .genderStr(careRepository.findCalNameListStr(TblCareTopEnum.GENDER.getCareSeq(), entity.getGender())) .careLevelStr(careRepository.findCalNameListStr(TblCareTopEnum.CARE_LEVEL.getCareSeq(), entity.getCareLevel())) - .workType(careRepository.findCalNameListStr(TblCareTopEnum.WORK_TYPE.getCareSeq(), entity.getInmateState())) + .workType(careRepository.findCalNameListStr(TblCareTopEnum.WORK_TYPE.getCareSeq(), entity.getWorkType())) .build()); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d55057bf..e67e5120 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,4 +24,5 @@ management: cors: allowed: - origins: http://54.180.195.94:8080, http://54.180.195.94:80, http://54.180.195.94:5173, http://54.180.195.94, https://54.180.195.94:443, http://54.180.195.94:443 + origins: http://dolbom-work.co.kr:8080, http://dolbom-work.co.kr:80, http://dolbom-work.co.kr:5173, http://dolbom-work.co.kr, https://dolbom-work.co.kr:443, http://dolbom-work.co.kr:443 +# origins: http://54.180.195.94:8080, http://dolbom-work.co.kr:80, http://54.180.195.94:5173, http://54.180.195.94, https://54.180.195.94:443, http://54.180.195.94:443