hl-core 0.0.9-beta.12 → 0.0.9-beta.14

package/api/base.api.ts

@@ -430,6 +430,13 @@ export class ApiClass {
     });
   }
 
+  async checkBeneficiariesInActualPolicy(iin: string) {
+    return await this.axiosCall<boolean>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/CheckBeneficiariesInActualPolicy?iin=${iin}`,
+    });
+  }
+
   async setMember(whichMember: keyof typeof MemberCodes, data: any) {
     return await this.axiosCall({
       method: Methods.POST,

package/components/Form/FormBlock.vue

@@ -6,7 +6,7 @@
         <div
           v-if="isMultiple && more && !isShort && isActionsAvailable"
           :class="[$styles.blueBg, $styles.whiteText, $styles.textSimple, disabled ? $styles.disabled : 'cursor-pointer']"
-          class="lg:flex transition-all rounded-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90 w-[120px]"
+          class="hidden lg:flex transition-all rounded-lg h-[36px] items-center font-medium justify-center opacity-50 hover:opacity-90 w-[120px]"
           @click="!disabled && memberStore.addMember(whichForm)"
         >
           {{ $dataStore.t('buttons.add') }}
@@ -33,7 +33,7 @@
         :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
       >
         <span :class="[getMemberInfo(each).fullName === null && $styles.emptyBlockCol]">{{ getMemberInfo(each).fullName }}</span>
-        <span :class="[getMemberInfo(each).iin === null && $styles.emptyBlockCol]">{{ getMemberInfo(each).iin }}</span>
+        <span :class="[getMemberInfo(each).iin === null && $styles.emptyBlockCol]">{{ getMemberIIN(each) }}</span>
         <span v-if="!isShort" :class="[getMemberInfo(each).gender === null && $styles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(each).gender }} </span>
         <span v-if="!isShort" :class="[getMemberInfo(each).birthDate === null && $styles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
         <span v-if="!isShort" :class="[getMemberInfo(each).birthPlace === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
@@ -75,7 +75,7 @@
     <div
       v-if="isMultiple && more && !isShort && isActionsAvailable"
       :class="[$styles.blueBg, $styles.whiteText, $styles.textSimple, disabled ? $styles.disabled : 'cursor-pointer']"
-      class="lg:hidden transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
+      class="flex lg:hidden transition-all rounded-b-lg h-[36px] items-center font-medium justify-center opacity-50 hover:opacity-90"
       @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $dataStore.t('buttons.add') }}
@@ -116,6 +116,7 @@ export default defineComponent({
   },
   emits: ['onMore', 'addMember'],
   setup(props) {
+    const dataStore = useDataStore();
     const formStore = useFormStore();
     const memberStore = useMemberStore();
     const isMultiple = computed(() => [StoreMembers.insuredForm, StoreMembers.beneficiaryForm, StoreMembers.beneficialOwnerForm].includes(props.whichForm as StoreMembers));
@@ -128,6 +129,13 @@ export default defineComponent({
 
     const isShort = computed(() => props.type === 'short');
     const isActionsAvailable = computed(() => memberStore.isStatementEditible(props.whichForm));
+    const getMemberIIN = (each: Member) => {
+      const iin = getMemberInfo(each).iin;
+      if (dataStore.isFinCenter() && iin) {
+        return iin.replaceAll('-', '');
+      }
+      return iin;
+    };
 
     const getMemberInfo = (memberData: Member) => {
       return {
@@ -153,6 +161,7 @@ export default defineComponent({
       isActionsAvailable,
 
       // Functions
+      getMemberIIN,
       getMemberInfo,
     };
   },

package/components/Pages/Anketa.vue

@@ -10,7 +10,7 @@
           @clicked="handleToggler"
         />
       </section>
-      <v-form ref="vForm" class="max-h-[70vh] overflow-y-scroll" @submit="submitForm">
+      <v-form ref="vForm" class="max-h-[65svh] overflow-y-scroll" @submit="submitForm">
         <section
           v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'N').length"
           :class="[$styles.blueBgLight, $styles.rounded]"
@@ -128,7 +128,7 @@
       <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
     </div>
   </Teleport>
-  <base-scroll-buttons @up="scrollForm('up')" @down="scrollForm('down')" />
+  <base-scroll-buttons v-if="firstQuestionList && firstQuestionList.length" @up="scrollForm('up')" @down="scrollForm('down')" />
 </template>
 
 <script lang="ts">

package/components/Pages/ContragentForm.vue

@@ -1,6 +1,6 @@
 <template>
   <section v-show="showForm" class="flex flex-col gap-4 px-[10px]">
-    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[75vh] overflow-y-scroll">
+    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[75svh] overflow-y-scroll">
       <base-form-section :title="$dataStore.t('form.personalData')" class="mt-[14px]">
         <base-form-input
           v-model="member.phoneNumber"

package/components/Pages/InvoiceInfo.vue

@@ -8,7 +8,7 @@
     </lazy-base-form-section>
     <lazy-base-form-section v-if="invoiceData.paymentLink && invoiceData.status !== 1" :title="$dataStore.t('labels.epayPage')" class="flex items-center">
       <div class="w-full lg:w-[70%] bg-white">
-        <iframe :src="invoiceData.paymentLink" frameborder="0" class="w-full h-[70vh]"></iframe>
+        <iframe :src="invoiceData.paymentLink" frameborder="0" class="w-full h-[70svh]"></iframe>
       </div>
     </lazy-base-form-section>
   </section>

package/components/Pages/MemberForm.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
-    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
+    <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
       <div v-if="memberSetting && memberSetting.has === true && memberSetting.isMultiple === true" class="flex items-center mt-[14px] min-h-[54px]">
         <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
           <div
@@ -17,7 +17,7 @@
               :disabled="!memberStore.canMemberDeleted(whichForm, index) && !memberStore.canMemberCleared(whichForm, index)"
               variant="plain"
               :color="Number(whichIndex) === index ? '#FFF' : '#A0B3D8'"
-              @click.prevent="memberStore.canMemberDeleted(whichForm, index) || memberStore.canMemberCleared(whichForm, index) ? deleteMember(index) : null"
+              @click.prevent="memberStore.canMemberDeleted(whichForm, index) || memberStore.canMemberCleared(whichForm, index) ? openDeletionDialog(index) : null"
             />
           </div>
         </div>
@@ -44,7 +44,7 @@
           :maska="$maska.iin"
           :readonly="!!isDisabled || !!isIinPhoneDisabled"
           :clearable="!isDisabled"
-          :append-inner-icon="showSaveButton ? 'mdi mdi-magnify' : ''"
+          :append-inner-icon="hasMemberSearch ? 'mdi mdi-magnify' : ''"
           @append="searchMember"
           @input="onIinInput"
           :rules="$rules.required.concat($rules.iinRight)"
@@ -527,6 +527,7 @@
         <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.check')" @click="checkOtp()" />
       </div>
     </Teleport>
+    <base-dialog v-model="deletionDialog" :subtitle="$dataStore.t('dialog.delete')" actions="default" @yes="deleteMember(selectedIndex)" @no="deletionDialog = false" />
     <base-dialog v-model="familyDialog" :title="$dataStore.t('dialog.familyMember')" actions="familyDialog">
       <template #actions>
         <base-family-dialog :selected="selectedFamilyMember" @selectFamilyMember="selectFamilyMember" @reset="closeFamilyDialog(true)" />
@@ -566,6 +567,8 @@ export default {
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
+    const deletionDialog = ref<boolean>(false);
+    const selectedIndex = ref<number>(0);
     const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
@@ -607,6 +610,9 @@ export default {
             if (dataStore.isBolashak || dataStore.isGons) {
               return false;
             }
+            if (member.value.age !== null && Number(member.value.age) < 18) {
+              return false;
+            }
             return true;
           }
           case formStore.insuredFormKey:
@@ -640,7 +646,7 @@ export default {
       };
       return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
-
+    const hasMemberSearch = computed(() => showSaveButton.value && (hasGBDFL.value || hasGKB.value || hasInsis.value));
     const hasFamilyStatus = computed(() => {
       if (whichForm.value === formStore.beneficiaryFormKey) {
         if (dataStore.isBolashak) {
@@ -708,10 +714,7 @@ export default {
     const phoneRule = computed(() => {
       const basePhoneRule = dataStore.rules.required.concat(dataStore.rules.phoneFormat);
       if (whichForm.value === formStore.beneficiaryFormKey) {
-        if (dataStore.isGons || dataStore.isBolashak) {
-          return [];
-        }
-        if ((dataStore.isKazyna || dataStore.isLiferenta) && Number(member.value.age) < 18) {
+        if (member.value.age !== null && Number(member.value.age) < 18) {
           return [];
         }
       }
@@ -742,6 +745,7 @@ export default {
     const otpCondition = computed(() => {
       // Add conditions by product
       if (member.value.hasAgreement) return false;
+      if (whichForm.value === formStore.beneficiaryFormKey && member.value.age !== null && Number(member.value.age) < 18) return false;
       if (!member.value.phoneNumber || (member.value.phoneNumber && member.value.phoneNumber.length !== useMask().phone.length)) return false;
       return getOtpConditionByMember();
     });
@@ -1071,14 +1075,8 @@ export default {
     };
 
     const validateAgreement = () => {
-      if (dataStore.isGons || dataStore.isBolashak) {
-        if (whichForm.value === formStore.beneficiaryFormKey) {
-          // TODO уточнить
-          return true;
-        }
-      }
-      if (dataStore.isKazyna || dataStore.isLiferenta) {
-        if (whichForm.value === formStore.beneficiaryFormKey && Number(member.value.age) < 18) {
+      if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (member.value.age !== null && Number(member.value.age) < 18) {
           return true;
         }
       }
@@ -1212,6 +1210,11 @@ export default {
       isButtonLoading.value = false;
     };
 
+    const openDeletionDialog = (index: number) => {
+      deletionDialog.value = true;
+      selectedIndex.value = index;
+    };
+
     const deleteMember = async (index: number) => {
       await memberStore.deleteMember(route.params.taskId as string, whichForm.value, index);
       const currentIndex = Number(whichIndex.value);
@@ -1219,6 +1222,7 @@ export default {
         const newIndex = ref<number>(currentIndex - 1 > 0 ? currentIndex - 1 : 0);
         await selectMember(newIndex.value, index === currentIndex ? true : undefined);
       }
+      deletionDialog.value = false;
     };
 
     const onInit = async () => {
@@ -1342,6 +1346,8 @@ export default {
       Value,
       memberDocument,
       familyDialog,
+      deletionDialog,
+      selectedIndex,
       selectedFamilyMember,
       sameAddress,
 
@@ -1363,6 +1369,7 @@ export default {
       hasInsurancePay,
       hasSignOfIPDL,
       hasSameAddressToggle,
+      hasMemberSearch,
 
       // Rules
       ageRule,
@@ -1385,6 +1392,7 @@ export default {
       getFile,
       selectFamilyMember,
       closeFamilyDialog,
+      openDeletionDialog,
       scrollForm,
       onIinInput,
       onOtpCodeInput,

package/components/Pages/ProductConditions.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
-    <v-form ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
+    <v-form ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
       <base-message-block
         v-if="isCalculator"
         class="mt-4"
@@ -181,8 +181,8 @@
         <base-form-input
           v-model="productConditionsForm.requestedSumInsured"
           :readonly="isDisabledSum"
-          :clearable="!isDisabled"
-          :rules="requestedSumInsured"
+          :clearable="!isDisabledSum"
+          :rules="requestedSumInsuredRule"
           :label="requestedSumInsuredLabel"
           :suffix="$constants.currencySymbols.kzt"
           @input="onInputSum"
@@ -192,8 +192,8 @@
           v-if="hasRequestedSumInsuredInDollar"
           v-model="productConditionsForm.requestedSumInsuredInDollar"
           :readonly="isDisabledSumDollar"
-          :clearable="!isDisabled"
-          :rules="requestedSumInsured"
+          :clearable="!isDisabledSumDollar"
+          :rules="requestedSumInsuredRule"
           :label="$dataStore.t('productConditionsForm.requestedSumInsuredInDollar')"
           :suffix="$constants.currencySymbols.usd"
           @input="onInputSumDollar"
@@ -201,14 +201,32 @@
         />
         <base-form-input
           v-model="productConditionsForm.insurancePremiumPerMonth"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
-          :rules="insurancePremiumPerMonth"
+          :readonly="insurancePremiumPerMonthDisabled"
+          :clearable="!insurancePremiumPerMonthDisabled"
+          :rules="insurancePremiumPerMonthRule"
           :label="insurancePremiumPerMonthLabel"
           :suffix="$constants.currencySymbols.kzt"
           @input="onInputInsurancePremiumPerMonth"
           @onClear="onClearPremium"
         />
+        <base-form-input
+          v-if="hasInsurancePremiumPerMonthInDollar"
+          v-model="productConditionsForm.insurancePremiumPerMonthInDollar"
+          :readonly="insurancePremiumPerMonthDisabled"
+          :clearable="!insurancePremiumPerMonthDisabled"
+          :rules="insurancePremiumPerMonthRule"
+          :label="$dataStore.t('productConditionsForm.insurancePremiumAmountInDollar')"
+          :suffix="$constants.currencySymbols.usd"
+          @input="onInputInsurancePremiumPerMonthInDollar"
+          @onClear="onClearPremiumDollar"
+        />
+        <base-form-input
+          v-if="hasCurrency && $dataStore.currencies.usd"
+          v-model="$dataStore.currencies.usd"
+          :readonly="true"
+          :label="$dataStore.t('productConditionsForm.dollarExchangeRateNBRK')"
+          :suffix="$constants.currencySymbols.kzt"
+        />
         <base-form-input
           v-if="whichProduct === 'gons' && isCalculator"
           v-model="productConditionsForm.totalAmount5"
@@ -237,24 +255,6 @@
           :label="$dataStore.t('productConditionsForm.statePremium7')"
           :suffix="$constants.currencySymbols.kzt"
         />
-        <base-form-input
-          v-if="hasInsurancePremiumPerMonthInDollar"
-          v-model="productConditionsForm.insurancePremiumPerMonthInDollar"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
-          :rules="insurancePremiumPerMonth"
-          :label="$dataStore.t('productConditionsForm.insurancePremiumAmountInDollar')"
-          :suffix="$constants.currencySymbols.usd"
-          @input="onInputInsurancePremiumPerMonthInDollar"
-          @onClear="onClearPremiumDollar"
-        />
-        <base-form-input
-          v-if="hasCurrency && $dataStore.currencies.usd"
-          v-model="$dataStore.currencies.usd"
-          :readonly="true"
-          :label="$dataStore.t('productConditionsForm.dollarExchangeRateNBRK')"
-          :suffix="$constants.currencySymbols.kzt"
-        />
       </base-form-section>
       <base-form-section :title="$dataStore.t('calculationAnnuityPayments')" v-if="hasAnnuityPayments">
         <base-form-toggle
@@ -431,10 +431,16 @@ export default defineComponent({
       return isDisabled.value;
     });
     const isTask = computed(() => (route.params.taskId === '0' && props.isCalculator === true) || dataStore.isTask());
-    const isRecalculationDisabled = computed(() => formStore.isDisabled.recalculationForm);
+    const isRecalculationDisabled = computed(() => formStore.isDisabled.recalculationForm || formStore.canBeClaimed === true);
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
-    const insurancePremiumPerMonth = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
-    const requestedSumInsured = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const insurancePremiumPerMonthRule = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const insurancePremiumPerMonthDisabled = computed(() => {
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
+      return isDisabled.value;
+    });
+    const requestedSumInsuredRule = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasCalculated = computed(() => !!productConditionsForm.requestedSumInsured && !!productConditionsForm.insurancePremiumPerMonth);
     const amountAnnuityPayments = computed(() => (!!productConditionsForm.amountAnnuityPayments ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasProcessIndexRate = computed(() => {
@@ -565,12 +571,18 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
       return isDisabled.value;
     });
     const isDisabledSumDollar = computed(() => {
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
       return isDisabled.value;
     });
     const isDisabledCoverPeriod = computed(() => {
@@ -991,8 +1003,9 @@ export default defineComponent({
       isDisabled,
       isTermsDisabled,
       isUnderwriterForm,
-      insurancePremiumPerMonth,
-      requestedSumInsured,
+      insurancePremiumPerMonthRule,
+      insurancePremiumPerMonthDisabled,
+      requestedSumInsuredRule,
       isRecalculationDisabled,
       isUnderwriterRole,
       hasProcessIndexRate,

package/composables/styles.ts

@@ -98,7 +98,7 @@ export class Styles {
     // Complex
     this.flexColNav = 'flex flex-col gap-[10px] px-2 pt-[14px]';
     this.emptyBlockCol = 'w-[60px] sm:w-[100px] h-[30%] rounded-[8px] bg-[#f5f5f5]';
-    this.scrollPage = 'max-h-[90vh] overflow-y-scroll';
+    this.scrollPage = 'max-h-[85svh] overflow-y-scroll';
   }
 }
 

package/locales/ru.json

@@ -111,7 +111,8 @@
     "underageShouldBeLess18": "Несовершеннолетний не может быть старше 18 лет",
     "needAgent": "Поле агент должно быть заполнено",
     "tripInsuredAmountCalculated": "Высчитана страховая сумма для выбора",
-    "calcSumForUnder": "Внимание! Требуется пересчет страховой суммы андеррайтером. Заявка будет направлена Андеррайтеру"
+    "calcSumForUnder": "Внимание! Требуется пересчет страховой суммы андеррайтером. Заявка будет направлена Андеррайтеру",
+    "doesHaveActiveContract": "Заключение договора невозможно. У Выгодоприобретателя имеется действующий договор"
   },
   "buttons": {
     "dataInput": "Ввод данных",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.12",
+  "version": "0.0.9-beta.14",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -42,9 +42,9 @@
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.4.5",
-    "@vueuse/components": "^10.2.1",
-    "@vueuse/core": "^10.2.1",
-    "@vueuse/nuxt": "^10.2.1",
+    "@vueuse/components": "^10.3.0",
+    "@vueuse/core": "^10.3.0",
+    "@vueuse/nuxt": "^10.3.0",
     "nuxt": "^3.6.2",
     "prettier": "^2.8.8"
   },
@@ -66,6 +66,6 @@
     "vue-json-pretty": "^2.2.4",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.3.7"
+    "vuetify": "^3.3.11"
   }
 }

package/plugins/vuetifyPlugin.ts

@@ -4,12 +4,14 @@ import 'vuetify/styles';
 import { createVuetify } from 'vuetify';
 import * as components from 'vuetify/components';
 import * as directives from 'vuetify/directives';
+import { VDataTable } from 'vuetify/labs/VDataTable';
 
 export default defineNuxtPlugin(nuxtApp => {
   const vuetify = createVuetify({
     ssr: false,
     components: {
       ...components,
+      VDataTable,
     },
     directives,
     defaults: {

package/store/data.store.ts

@@ -589,6 +589,13 @@ export const useDataStore = defineStore('data', {
       }
     },
     async saveContragent(user: Member, whichForm: keyof typeof StoreMembers | 'contragent', whichIndex: number | null, onlySaveAction: boolean = true) {
+      if (this.isGons && user.iin) {
+        const doesHaveActiveContract = await this.api.checkBeneficiariesInActualPolicy(user.iin.replace(/-/g, ''));
+        if (doesHaveActiveContract) {
+          this.showToaster('error', this.t('toaster.doesHaveActiveContract'), 6000);
+          return false;
+        }
+      }
       this.isLoading = !onlySaveAction;
       const hasInsisId = await this.alreadyInInsis(user);
       if (typeof hasInsisId === 'number') {
@@ -1289,33 +1296,29 @@ export const useDataStore = defineStore('data', {
       baseField: 'surveyByHealthBase' | 'surveyByCriticalBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBasePolicyholder',
       whichMember: 'insured' | 'policyholder' = 'insured',
     ) {
-      if (!this.formStore[baseField]) {
-        try {
-          const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
-            whichMember === 'insured'
-              ? this.api.getQuestionList(surveyType, processInstanceId, insuredId)
-              : this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
-            whichMember === 'insured'
-              ? this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId)
-              : this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
-            ,
-          ]);
-          if (baseQuestions.status === 'fulfilled') {
-            this.formStore[baseField] = baseQuestions.value;
-          }
-          if (secondaryQuestions.status === 'fulfilled') {
-            const baseAnketa = this.formStore[baseField];
-            if (baseAnketa && baseAnketa.body && baseAnketa.body.length) {
-              baseAnketa.body.forEach(i => {
-                if (i.first.definedAnswers === 'Y' && i.second === null && secondaryQuestions.value) {
-                  i.second = structuredClone(secondaryQuestions.value);
-                }
-              });
-            }
+      try {
+        const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
+          whichMember === 'insured' ? this.api.getQuestionList(surveyType, processInstanceId, insuredId) : this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
+          whichMember === 'insured'
+            ? this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId)
+            : this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+          ,
+        ]);
+        if (baseQuestions.status === 'fulfilled') {
+          this.formStore[baseField] = baseQuestions.value;
+        }
+        if (secondaryQuestions.status === 'fulfilled') {
+          const baseAnketa = this.formStore[baseField];
+          if (baseAnketa && baseAnketa.body && baseAnketa.body.length) {
+            baseAnketa.body.forEach(i => {
+              if (i.first.definedAnswers === 'Y' && i.second === null && secondaryQuestions.value) {
+                i.second = structuredClone(secondaryQuestions.value);
+              }
+            });
           }
-        } catch (err) {
-          ErrorHandler(err);
         }
+      } catch (err) {
+        ErrorHandler(err);
       }
       return this.formStore[baseField];
     },
@@ -2448,6 +2451,20 @@ export const useDataStore = defineStore('data', {
           this.isLoading = false;
           return false;
         }
+        if (!gbdResponse.content) {
+          let errMsg: string = '';
+          if (gbdResponse.status) {
+            errMsg += gbdResponse.status;
+          }
+          if (gbdResponse.statusName) {
+            errMsg += gbdResponse.statusName;
+          }
+          if (!!errMsg) {
+            this.showToaster('error', errMsg, 5000);
+          }
+          this.isLoading = false;
+          return false;
+        }
         const { person } = parseXML(gbdResponse.content, true, 'person');
         const { responseInfo } = parseXML(gbdResponse.content, true, 'responseInfo');
         if (member.gosPersonData !== null && member.gosPersonData.iin !== member.iin!.replace(/-/g, '')) {