diff --git a/resource/wiki/删除档案.txt b/resource/wiki/删除档案.txt
index 1668c51f4..a5614d6c5 100644
--- a/resource/wiki/删除档案.txt
+++ b/resource/wiki/删除档案.txt
@@ -19,3 +19,16 @@ update  hrsa_salary_archive set delete_type=3 where tax_agent_id=扣缴义务人
 
 二、删除停薪员工档案
 update hrsa_salary_archive   set delete_type=3 where run_status  in ('STOP_FROM_PENDING','STOP_FROM_SUSPEND')
+
+
+三、删除指定人员档案
+
+
+--删除社保福利档案
+update hrsa_insurance_base_info set delete_type=3  WHERE employee_id = ? and payment_organization =?
+update hrsa_social_archives set delete_type=3  WHERE employee_id = ? and payment_organization =?
+update hrsa_fund_archives set delete_type=3  WHERE employee_id = ? and payment_organization =?
+update hrsa_other_archives set delete_type=3  WHERE employee_id = ? and payment_organization =?
+
+-- 删除薪资档案
+update hrsa_salary_archive  set delete_type=3  where employee_id = ? and tax_agent_id=?
diff --git a/src/com/engine/salary/action/UpdateSISchemeDetailAction.java b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java
index 2ceef43d0..0d406455a 100644
--- a/src/com/engine/salary/action/UpdateSISchemeDetailAction.java
+++ b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java
@@ -183,6 +183,8 @@ public class UpdateSISchemeDetailAction implements Action {
                 String validNum = importDataMap.getOrDefault("有效小数位", "").toString();
                 if (StringUtils.isNotBlank(validNum)) {
                     targetSchemeDetailPO.setValidNum(Integer.valueOf(validNum));
+                }else {
+                    targetSchemeDetailPO.setValidNum(2);
                 }
                 String rententionRule = importDataMap.getOrDefault("进位规则", "").toString();
                 if (StringUtils.isNotBlank(rententionRule)) {
diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 5eb07b4af..46abbf098 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -678,7 +678,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (po.getPaymentCycle() != null && po.getPaymentCycle() == 1) {
@@ -755,7 +755,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -845,7 +845,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -921,7 +921,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1014,7 +1014,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1090,7 +1090,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1596,7 +1596,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (po.getPaymentCycle() != null && po.getPaymentCycle() == 1) {
@@ -1665,7 +1665,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1746,7 +1746,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1814,7 +1814,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1899,7 +1899,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -1968,7 +1968,7 @@ public class SIAccountBiz extends Service {
                     BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100"));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -2056,7 +2056,7 @@ public class SIAccountBiz extends Service {
 //                    BigDecimal paymentNum = new BigDecimal(archivesPerson.get(String.valueOf(e)));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                                         BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
@@ -2127,7 +2127,7 @@ public class SIAccountBiz extends Service {
 //                    BigDecimal paymentNum = SalaryEntityUtil.string2BigDecimalDefault0(archivesCom.get(String.valueOf(e)));
                     BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e)));
                     BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost());
-                    Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum();
+                    Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum();
 //                    BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
                     BigDecimal result = new BigDecimal("0");
                     if (Objects.equals(po.getPaymentCycle(), 1)) {
diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java
index 4079ebfab..f4b82614a 100644
--- a/src/com/engine/salary/biz/SISchemeBiz.java
+++ b/src/com/engine/salary/biz/SISchemeBiz.java
@@ -11,6 +11,7 @@ import com.engine.salary.entity.sischeme.param.InsuranceSchemeReqParam;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO;
 import com.engine.salary.entity.sischeme.po.InsuranceSchemePO;
 import com.engine.salary.entity.sischeme.vo.InsuranceSchemeFormVO;
+import com.engine.salary.enums.SalaryRoundingModeEnum;
 import com.engine.salary.enums.sicategory.*;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.siaccount.SIAccountUtilMapper;
@@ -77,7 +78,8 @@ public class SISchemeBiz {
                             .insuranceId(item.getId())
                             .insuranceName(item.getInsuranceName())
                             .paymentScope(e.getDefaultLabel())
-                            .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue()))
+                            .rententionRule(String.valueOf(SalaryRoundingModeEnum.ROUNDING.getValue()))
+                            .validNum(2)
                             .cycleSetting("000000000000")
                             .paymentCycle("0")
                             .accountType("0")
@@ -95,7 +97,7 @@ public class SISchemeBiz {
                     insuranceSchemeDetailDTO.setInsuranceId(insuranceSchemeDetailPO.getInsuranceId());
                     insuranceSchemeDetailDTO.setPaymentScopeValue(insuranceSchemeDetailPO.getPaymentScope());
                     insuranceSchemeDetailDTO.setPrimaryId(insuranceSchemeDetailPO.getPrimaryId());
-                    insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum());
+                    insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum() == null ? 2 : insuranceSchemeDetailPO.getValidNum());
 
                     if (insuranceSchemeDetailPO.getIsPayment() != null) {
                         insuranceSchemeDetailDTO.setIsPayment(Objects.equals(insuranceSchemeDetailPO.getIsPayment(), IsPaymentEnum.YES.getValue()));
@@ -427,7 +429,7 @@ public class SISchemeBiz {
                         .primaryId(batchPO.getId())
                         .rententionRule(item.getRententionRule())
                         .upperLimit(item.getUpperLimit())
-                        .validNum(item.getValidNum())
+                        .validNum(item.getValidNum()==null?2:item.getValidNum())
                         .build()
                 ).collect(Collectors.toList());
                 encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class);
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java
index aa03b71f1..f00e56950 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java
@@ -16,6 +16,7 @@ import java.util.Map;
  * @Date 2022/3/8
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeCopyCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeCopyCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java
index f2fc0dec4..488989936 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java
@@ -19,6 +19,7 @@ import java.util.Map;
  * @Date 2022/3/8
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeDeleteCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeDeleteCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java
index d497c4c30..eb75b5ef1 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java
@@ -19,6 +19,7 @@ import java.util.Objects;
  * @Date 2022/3/7
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeGetFormCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeGetFormCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java
index fbbe0918f..b4a554fba 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java
@@ -16,6 +16,7 @@ import java.util.Map;
  * @Date 2022/3/8
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeInsertCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeInsertCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java
index f3657cdb2..44153bd57 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java
@@ -17,6 +17,7 @@ import java.util.Objects;
  * @Date 2022/3/10
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeListCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeListCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java
index ae59e4d39..7910223e4 100644
--- a/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java
+++ b/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java
@@ -16,6 +16,7 @@ import java.util.Map;
  * @Date 2022/3/8
  * @Version V1.0
  **/
+@Deprecated
 public class SISchemeUpdateCmd extends AbstractCommonCommand<Map<String, Object>> {
 
     public SISchemeUpdateCmd(Map<String, Object> params, User user) {
diff --git a/src/com/engine/salary/entity/datacollection/param/AddDeductionAutoAddParam.java b/src/com/engine/salary/entity/datacollection/param/AddDeductionAutoAddParam.java
index ba14a6f02..5a3c11b47 100644
--- a/src/com/engine/salary/entity/datacollection/param/AddDeductionAutoAddParam.java
+++ b/src/com/engine/salary/entity/datacollection/param/AddDeductionAutoAddParam.java
@@ -5,6 +5,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @description 数据采集-专项附加扣除一键累计参数
  **/
@@ -14,4 +17,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AddDeductionAutoAddParam {
     String yearMonth = "";
+
+    Date yearMonthDate;
+
+    List<Long> taxAgentIds;
 }
diff --git a/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java b/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java
index 4b24e4021..f1f844e0d 100644
--- a/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java
+++ b/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java
@@ -76,7 +76,7 @@ public class InsuranceSchemeBO {
                 .cycleSetting(item.getCycleSetting())
                 .accountType(Integer.parseInt(item.getAccountType()))
                 .updateTime(new Date())
-                .validNum(item.getValidNum())
+                .validNum(item.getValidNum()==null ? 2 : item.getValidNum())
                 .build()
         ).collect(Collectors.toList());
     }
diff --git a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java
index 0605dfa67..c48ebd3fb 100644
--- a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java
+++ b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java
@@ -6,14 +6,7 @@ import com.engine.salary.enums.BaseEnum;
 import java.math.BigDecimal;
 import java.util.Arrays;
 
-/**
- * 进位规则枚举
- * <p>Copyright: Copyright (c) 2022</p>
- * <p>Company: 泛微软件</p>
- *
- * @author qiantao
- * @version 1.0
- **/
+@Deprecated
 public enum RententionRuleEnum implements BaseEnum<Integer> {
     ROUND(BigDecimal.ROUND_HALF_UP, "四舍五入", 84505),
     CEIL(BigDecimal.ROUND_UP, "向上舍入", 84506),
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
index 8a441c717..6b2d300f1 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java
@@ -125,7 +125,7 @@ public interface EmployMapper {
     DeptInfo getDeptInfoById(Long id);
 
     /**
-     * 获取大于离职日期的人员信息
+     * 获取大于离职日期的 离职、退休、解聘人员信息
      * @return
      */
     List<DataCollectionEmployee> listByDismissDate(String dismissDate);
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index 3a7d3df68..52cea7adb 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -457,7 +457,7 @@
                e.mobile           as mobile,
                e.enddate          as dismissdate
         from hrmresource e
-        where e.status not in (7)
+        where e.status in (4,5,6)
           AND e.enddate >= #{dismissDate}
     </select>
 
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 98b959ec8..9bf43c582 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -478,7 +478,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
         List<SalaryItemPO> itemList = getSalaryItemService(user).listByIds(salaryItemIds);
         // 列表columns
-        List<WeaTableColumn> weaTableColumns = buildDataPerspectiveTableColumns(itemList);
+        List<WeaTableColumn> weaTableColumns = buildDataPerspectiveTableColumns(itemList, salaryItemIds);
 
         WeaTable table = new WeaTable();
         String pageId = "a4f85an7-9576-4125-adn9-7d06e7sy69f2";
@@ -534,7 +534,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
         List<SalaryItemPO> itemList = getSalaryItemService(user).listByIds(salaryItemIds);
         // 表格表头
-        List<WeaTableColumn> weaTableColumns = buildDataPerspectiveTableColumns(itemList);
+        List<WeaTableColumn> weaTableColumns = buildDataPerspectiveTableColumns(itemList, salaryItemIds);
         List<Object> columns = new ArrayList<>();
         for (WeaTableColumn column : weaTableColumns) {
             columns.add(column.getText());
@@ -593,7 +593,8 @@ public class SalaryStatisticsReportWrapper extends Service {
         }
     }
 
-    private List<WeaTableColumn> buildDataPerspectiveTableColumns(List<SalaryItemPO> salaryItems) {
+    private List<WeaTableColumn> buildDataPerspectiveTableColumns(List<SalaryItemPO> salaryItems, List<Long> salaryItemIds) {
+        Map<Long, SalaryItemPO> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItems, SalaryItemPO::getId);
         // 表格表头
         List<WeaTableColumn> columns = new ArrayList<>();
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(87614, "姓名"), "userName"));
@@ -602,10 +603,13 @@ public class SalaryStatisticsReportWrapper extends Service {
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgent"));
         columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "账套"), "salarySob"));
 //        columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "次数"), "acctTimes").setDisplay(WeaBoolAttr.FALSE));
-        salaryItems.forEach(item -> {
-            WeaTableColumn weaTableColumn = new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX);
-            weaTableColumn.setOtherpara(item.getDataType());
-            columns.add(weaTableColumn);
+        salaryItemIds.forEach(itemId -> {
+            SalaryItemPO item = salaryItemMap.get(itemId);
+            if (item != null) {
+                WeaTableColumn weaTableColumn = new WeaTableColumn("100px", item.getName(), item.getId() + SalaryConstant.DYNAMIC_SUFFIX);
+                weaTableColumn.setOtherpara(item.getDataType());
+                columns.add(weaTableColumn);
+            }
         });
         return columns;
     }
diff --git a/src/com/engine/salary/service/AddUpDeductionService.java b/src/com/engine/salary/service/AddUpDeductionService.java
index ade90386e..0bf72af18 100644
--- a/src/com/engine/salary/service/AddUpDeductionService.java
+++ b/src/com/engine/salary/service/AddUpDeductionService.java
@@ -155,7 +155,7 @@ public interface AddUpDeductionService {
      * @return void
      * @author lfc
      */
-    String autoAddAll(Date yearMonth, Boolean isAdmin);
+    String autoAddAll(Date yearMonth, Boolean isAdmin, List<Long> taxAgentIds);
 
     /**
      * 在线获取数据
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index 52cf99c79..4296d431c 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -794,7 +794,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
     }
 
     @Override
-    public String autoAddAll(Date yearMonth, Boolean isAdmin) {
+    public String autoAddAll(Date yearMonth, Boolean isAdmin, List<Long> taxAgentIds) {
         String cacheKey = "addUpDeduction_autoAddAll_processing";
         Object objVal = Util_DataCache.getObjVal(cacheKey);
         if (objVal != null) {
@@ -811,6 +811,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
             } else {
                 taxAgents = getTaxAgentService(user).listAllTaxAgentsAsAdmin((long) user.getUID());
             }
+            // 过滤个税扣缴义务人选择框
+            if (CollectionUtils.isNotEmpty(taxAgentIds)) {
+                taxAgents = taxAgents.stream().filter(taxAgent -> taxAgentIds.contains(taxAgent.getId())).collect(Collectors.toList());
+            }
             LocalDateTime yearMonthTime = DateUtil.toLocalDateTime(yearMonth);
             //设置时间到下一年1月1号
             Instant instant = yearMonthTime.plusYears(1L)
@@ -1039,6 +1043,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
             if (CollectionUtils.isEmpty(taxAgentIdsAsAdmin)) {
                 return new PageInfo<>(AddUpDeductionDTO.class);
             }
+            // 过滤义务人筛选框
+            if (CollectionUtils.isNotEmpty(queryParam.getTaxAgentIds())) {
+                taxAgentIdsAsAdmin = taxAgentIdsAsAdmin.stream().filter(id -> queryParam.getTaxAgentIds().contains(id)).collect(Collectors.toList());
+            }
             queryParam.setTaxAgentIds(taxAgentIdsAsAdmin);
         }
 
diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 40edf009b..2b76af128 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -91,7 +91,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
             String datasourceJson = map.getOrDefault("datasource", "");
             if (StringUtils.isNotBlank(datasourceJson)) {
                 Map<String, String> datasourceIdMap = JsonUtil.parseMap(datasourceJson, String.class);
-                String datasourceIdNode = datasourceIdMap.getOrDefault("datasourceId","");
+                String datasourceIdNode = datasourceIdMap.getOrDefault("datasourceId", "");
                 if (StringUtils.isNotBlank(datasourceIdNode)) {
                     datasourceId = datasourceIdNode;
                 }
@@ -216,6 +216,10 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
                 }
                 if (DataType.NUMBER.equals(v.getFieldType()) && NumberUtils.isCreatable(v.getContent())) {
                     context.put(v.getFieldId(), new BigDecimal(v.getContent()));
+                } else if (v.getContent().startsWith("[") && v.getContent().endsWith("]")) {
+                    String content = v.getContent().substring(1);
+                    content = content.substring(0, content.length() - 1);
+                    context.put(v.getFieldId(), content.split(","));
                 } else {
                     context.put(v.getFieldId(), v.getContent());
                 }
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index d7483d542..f1fd51619 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -34,6 +34,7 @@ import com.engine.salary.entity.taxagent.param.TaxAgentManageRangeSaveParam;
 import com.engine.salary.entity.taxagent.param.TaxAgentRangeSaveParam;
 import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.OperateTypeEnum;
+import com.engine.salary.enums.SalaryRoundingModeEnum;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.enums.salarysob.TargetTypeEnum;
 import com.engine.salary.enums.siaccount.EmployeeStatusEnum;
@@ -177,7 +178,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
 
     @Override
     public Map<String, Object> getForm(Map<String, Object> params) {
-//        return commandExecutor.execute(new SISchemeGetFormCmd(params, user));
         Map<String, Object> apidatas = new HashMap<>(16);
 
         Long id = null;
@@ -185,7 +185,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
             id =Long.valueOf(Util.null2String(params.get("id")));
         }
         WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum)params.get("welfareTypeEnum");
-//        InsuranceSchemeFormVO form = siSchemeBiz.getForm(id, welfareTypeEnum);
         InsuranceSchemeFormVO form = getForm(id, welfareTypeEnum);
         apidatas.put("form",form);
         //记录操作日志
@@ -2308,7 +2307,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                             .insuranceId(item.getId())
                             .insuranceName(item.getInsuranceName())
                             .paymentScope(e.getDefaultLabel())
-                            .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue()))
+                            .rententionRule(String.valueOf(SalaryRoundingModeEnum.ROUNDING.getValue()))
+                            .validNum(2)
                             .cycleSetting("000000000000")
                             .paymentCycle("0")
                             .accountType("0")
@@ -2326,7 +2326,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                     insuranceSchemeDetailDTO.setInsuranceId(insuranceSchemeDetailPO.getInsuranceId());
                     insuranceSchemeDetailDTO.setPaymentScopeValue(insuranceSchemeDetailPO.getPaymentScope());
                     insuranceSchemeDetailDTO.setPrimaryId(insuranceSchemeDetailPO.getPrimaryId());
-                    insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum());
+                    insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum() == null ? 2 : insuranceSchemeDetailPO.getValidNum());
 
                     if (insuranceSchemeDetailPO.getIsPayment() != null) {
                         insuranceSchemeDetailDTO.setIsPayment(Objects.equals(insuranceSchemeDetailPO.getIsPayment(), IsPaymentEnum.YES.getValue()));
@@ -2664,7 +2664,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
                     .primaryId(batchPO.getId())
                     .rententionRule(item.getRententionRule())
                     .upperLimit(item.getUpperLimit())
-                    .validNum(item.getValidNum())
+                    .validNum(item.getValidNum()==null?2:item.getValidNum())
                     .build()
             ).collect(Collectors.toList());
 
diff --git a/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java b/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java
index 656db3943..694660651 100644
--- a/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java
+++ b/src/com/engine/salary/timer/AutoAddAllSpecialAddDeductionJob.java
@@ -11,6 +11,7 @@ import weaver.hrm.User;
 import weaver.interfaces.schedule.BaseCronJob;
 
 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.Date;
 
 /**
@@ -31,6 +32,6 @@ public class AutoAddAllSpecialAddDeductionJob extends BaseCronJob {
         if(StringUtils.isNotBlank(salaryTaxMonth)){
             localDate = localDate.plusMonths(Integer.valueOf(salaryTaxMonth.trim()));
         }
-        getAddUpDeductionService(null).autoAddAll(DateUtil.beginOfMonth(SalaryDateUtil.localDateToDate(localDate)), Boolean.TRUE);
+        getAddUpDeductionService(null).autoAddAll(DateUtil.beginOfMonth(SalaryDateUtil.localDateToDate(localDate)), Boolean.TRUE, Collections.emptyList());
     }
 }
diff --git a/src/com/engine/salary/util/page/SalaryPageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java
index eb10dc69c..739a36721 100644
--- a/src/com/engine/salary/util/page/SalaryPageUtil.java
+++ b/src/com/engine/salary/util/page/SalaryPageUtil.java
@@ -96,6 +96,7 @@ public class SalaryPageUtil {
 
     /**
      * 自适应文字长度
+     *
      * @param chars
      * @param width
      * @return
@@ -105,8 +106,8 @@ public class SalaryPageUtil {
             return width + "";
         }
         Rectangle2D bounds = font.getStringBounds(chars, frc);
-        int pxLength = (int) Math.ceil(bounds.getWidth());
-        return pxLength + 55 + "";
+        int pxLength = (int) Math.ceil(bounds.getWidth()) + 55;
+        return pxLength < 90 ? 90+"" : pxLength+"";
     }
 
 
diff --git a/src/com/engine/salary/web/AddUpDeductionController.java b/src/com/engine/salary/web/AddUpDeductionController.java
index aef9a4120..1db4a449e 100644
--- a/src/com/engine/salary/web/AddUpDeductionController.java
+++ b/src/com/engine/salary/web/AddUpDeductionController.java
@@ -375,8 +375,9 @@ public class AddUpDeductionController {
         } else {
             date = DateUtil.beginOfMonth(new Date());
         }
+        param.setYearMonthDate(date);
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<Date, String>(user).run(getAddUpDeductionWrapper(user)::autoAddAll, date);
+        return new ResponseResult<AddDeductionAutoAddParam, String>(user).run(getAddUpDeductionWrapper(user)::autoAddAll, param);
     }
 
 
diff --git a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
index 7de962328..597ad1e47 100644
--- a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
+++ b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java
@@ -169,14 +169,15 @@ public class AddUpDeductionWrapper extends Service {
         return getAddUpDeductionService(user).getAddUpDeduction(param);
     }
 
-    public String autoAddAll(Date yearMonth) {
+    public String autoAddAll(AddDeductionAutoAddParam param) {
+        Date yearMonth = param.getYearMonthDate();
         if (isLog) {
             log.info("一键累计， 操作人 「{}」", user.getUsername());
         }
         if (yearMonth == null) {
             throw new SalaryRunTimeException("一键累计传入日期格式错误");
         }
-        return getAddUpDeductionService(user).autoAddAll(yearMonth, null);
+        return getAddUpDeductionService(user).autoAddAll(yearMonth, null, param.getTaxAgentIds());
     }
 
     public Map<String, Object> onlineRequest(AddUpDeductionMonthTaxAgentParam param) {