diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 66273cc37..f95fb8244 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -3502,11 +3502,56 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         Map<String, Object> resultMap = new HashMap<>();
 //        resultMap.put("data", dataMap);
 //        resultMap.put("items", addGroups);
+
+        // 获取当前放方案信息
+        InsuranceArchivesSocialSchemePO socialSchemePO = new InsuranceArchivesSocialSchemePO();
+        InsuranceArchivesFundSchemePO fundSchemePO = new InsuranceArchivesFundSchemePO();
+        InsuranceArchivesOtherSchemePO otherSchemePO = new InsuranceArchivesOtherSchemePO();
+
         List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = new ArrayList<>();
         List<Long> schemeIdList = new ArrayList<>();
-        schemeIdList.add(insuranceAccountDetailPO.getSocialSchemeId());
-        schemeIdList.add(insuranceAccountDetailPO.getFundSchemeId());
-        schemeIdList.add(insuranceAccountDetailPO.getOtherSchemeId());
+        if (insuranceAccountDetailPO.getSocialSchemeId() == null) {
+            List<InsuranceArchivesSocialSchemePO> socialSchemePOList = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder()
+                    .employeeId(insuranceAccountDetailPO.getEmployeeId())
+                    .paymentOrganization(insuranceAccountDetailPO.getPaymentOrganization())
+                    .build());
+            if (socialSchemePOList.size() > 0) {
+                encryptUtil.decryptList(socialSchemePOList, InsuranceArchivesSocialSchemePO.class);
+                socialSchemePO = socialSchemePOList.get(0);
+            }
+            schemeIdList.add(socialSchemePO.getSocialSchemeId());
+        } else {
+            schemeIdList.add(insuranceAccountDetailPO.getSocialSchemeId());
+        }
+
+        if (insuranceAccountDetailPO.getFundSchemeId() == null) {
+            List<InsuranceArchivesFundSchemePO> fundSchemePOList = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder()
+                    .employeeId(insuranceAccountDetailPO.getEmployeeId())
+                    .paymentOrganization(insuranceAccountDetailPO.getPaymentOrganization())
+                    .build());
+            if (fundSchemePOList.size() > 0) {
+                encryptUtil.decryptList(fundSchemePOList, InsuranceArchivesFundSchemePO.class);
+                fundSchemePO = fundSchemePOList.get(0);
+            }
+            schemeIdList.add(fundSchemePO.getFundSchemeId());
+        } else {
+            schemeIdList.add(insuranceAccountDetailPO.getFundSchemeId());
+        }
+
+        if (insuranceAccountDetailPO.getOtherSchemeId() == null) {
+            List<InsuranceArchivesOtherSchemePO> otherSchemePOList = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder()
+                    .employeeId(insuranceAccountDetailPO.getEmployeeId())
+                    .paymentOrganization(insuranceAccountDetailPO.getPaymentOrganization())
+                    .build());
+            if (otherSchemePOList.size() > 0) {
+                encryptUtil.decryptList(otherSchemePOList, InsuranceArchivesOtherSchemePO.class);
+                otherSchemePO = otherSchemePOList.get(0);
+            }
+            schemeIdList.add(otherSchemePO.getOtherSchemeId());
+        } else {
+            schemeIdList.add(insuranceAccountDetailPO.getOtherSchemeId());
+        }
+
         schemeIdList = schemeIdList.stream().filter(schemeId -> schemeId != null).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(schemeIdList)) {
             insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(schemeIdList);
diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
index 29464725d..b9ec0de27 100644
--- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
@@ -207,7 +207,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> fundMap = JSON.parseObject(fundSchemePO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
-            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(fundSchemePO.getFundSchemeId()));
             Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
             fundMap.forEach((k, v) -> {
                 String welfareTypeName =  welfareTypeMap.get(Long.valueOf(k)) == 1 ? "社保" : (welfareTypeMap.get(Long.valueOf(k)) == 2 ? "公积金" : "企业年金及其它福利" );
@@ -243,7 +243,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> otherMap = JSON.parseObject(otherSchemePO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());
-            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(socialSchemePO.getSocialSchemeId()));
+            List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().listBySchemeIds(Collections.singletonList(otherSchemePO.getOtherSchemeId()));
             Map<String, Integer> schemeValidNumMap = SalaryEntityUtil.convert2Map(insuranceSchemeDetailPOS, po -> po.getInsuranceId() + "-" + po.getPaymentScope(), InsuranceSchemeDetailPO::getValidNum);
 
             otherMap.forEach((k, v) -> {