diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
index cba5c57cc..a9a04d09d 100644
--- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
+++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
@@ -32,6 +32,7 @@ import com.engine.salary.mapper.siarchives.SocialSchemeMapper;
 import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper;
 import com.engine.salary.mapper.sys.SalarySysConfMapper;
 import com.engine.salary.mapper.taxdeclaration.TaxDeclarationDetailMapper;
+import com.engine.salary.sys.constant.SalarySysConstant;
 import com.engine.salary.sys.entity.param.AppSettingSaveParam;
 import com.engine.salary.sys.entity.param.OrderRuleParam;
 import com.engine.salary.sys.entity.po.SalarySysConfPO;
@@ -126,6 +127,8 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
         return MapperProxyFactory.getProxy(AddUpSituationMapper.class);
     }
 
+    static SalarySysConfServiceImpl salarySysConfService = new SalarySysConfServiceImpl();
+
     /**
      * 操作是否需要申报功能
      *
@@ -303,6 +306,12 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
         resultMap.put("isSuccess", true);
         String progressId = UUID.randomUUID().toString();
         resultMap.put("progressId", progressId);
+        SalarySysConfPO sysConfPo = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT);
+        if (ObjectUtils.isNotEmpty(sysConfPo) && sysConfPo.getConfValue().equals(param.getIsOpenEncrypt())) {
+            return resultMap;
+        } else if (ObjectUtils.isEmpty(sysConfPo) && OpenEnum.OPEN.getValue().equals(param.getIsOpenEncrypt())) {
+            return resultMap;
+        }
         try {
             if (ObjectUtils.isNotEmpty(Util_DataCache.getObjVal(AES_ENCRYPT_IN_PROGRESS))) {
                 resultMap.put("msg", "数据库处理上次操作中，请稍后操作。");
@@ -826,6 +835,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
                                 po.setAddUpTaxExemptIncome(AESEncryptUtil.closeEncryptSetting(po.getAddUpTaxExemptIncome()));
                                 po.setAddUpAllowedDonation(AESEncryptUtil.closeEncryptSetting(po.getAddUpAllowedDonation()));
                                 po.setAddUpAdvanceTax(AESEncryptUtil.closeEncryptSetting(po.getAddUpAdvanceTax()));
+                                po.setAddUpIllnessMedical(AESEncryptUtil.closeEncryptSetting(po.getAddUpIllnessMedical()));
+                                po.setAddUpTaxSavings(AESEncryptUtil.closeEncryptSetting(po.getAddUpTaxSavings()));
+                                po.setAddUpInfantCare(AESEncryptUtil.closeEncryptSetting(po.getAddUpInfantCare()));
                             } else {
                                 po.setAddUpIncome(AESEncryptUtil.encrypt(po.getAddUpIncome()));
                                 po.setAddUpSubtraction(AESEncryptUtil.encrypt(po.getAddUpSubtraction()));
@@ -841,6 +853,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
                                 po.setAddUpTaxExemptIncome(AESEncryptUtil.encrypt(po.getAddUpTaxExemptIncome()));
                                 po.setAddUpAllowedDonation(AESEncryptUtil.encrypt(po.getAddUpAllowedDonation()));
                                 po.setAddUpAdvanceTax(AESEncryptUtil.encrypt(po.getAddUpAdvanceTax()));
+                                po.setAddUpIllnessMedical(AESEncryptUtil.encrypt(po.getAddUpIllnessMedical()));
+                                po.setAddUpTaxSavings(AESEncryptUtil.encrypt(po.getAddUpTaxSavings()));
+                                po.setAddUpInfantCare(AESEncryptUtil.encrypt(po.getAddUpInfantCare()));
                             }
                         });
                         List<List<AddUpSituation>> partition = Lists.partition(addUpSituations, 50);