优化修改

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java

@@ -830,23 +830,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		BigDecimal personalMedicalMoney;
 		// 个人失业金额
 		BigDecimal personalUnemploymentMoney;
-		// 存储基数（最低或最高）
-		BigDecimal baseLimit;
 		if (socialInfo != null) {
-			if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) {
-				if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) {
-					baseLimit = socialInfo.getLowerLimit();
-				} else {
-					baseLimit = socialInfo.getUpperLimit();
-				}
-				personalPersionBase = baseLimit;
-				personalMedicalBase = baseLimit;
-				personalUnemploymentBase = baseLimit;
-			} else {
-				personalPersionBase = socialInfo.getPersonalPensionCardinal();
-				personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
-				personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
-			}
+			personalPersionBase = socialInfo.getPersonalPensionCardinal();
+			personalMedicalBase = socialInfo.getPersonalMedicalCardinal();
+			personalUnemploymentBase = socialInfo.getPersonalUnemploymentCardinal();
 			if (historyLibrary != null) {
 				if (historyLibrary.getUnitPersionPro() != null) {
 					personalPersionPro = historyLibrary.getPersonalPersionPro();
@@ -933,28 +920,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		// 单位生育金额
 		BigDecimal unitBirthMoney;
 
-		// 存储基数（最低或最高）
-		BigDecimal baseLimit;
 		if (socialInfo != null) {
-			// 需要从基数配置取数据：
-			if (Common.isNotNull(socialInfo.getPaymentType()) && !CommonConstants.ONE_STRING.equals(socialInfo.getPaymentType())) {
-				if (CommonConstants.ZERO_STRING.equals(socialInfo.getPaymentType())) {
-					baseLimit = socialInfo.getLowerLimit();
-				} else {
-					baseLimit = socialInfo.getUpperLimit();
-				}
-				unitPersionBase = baseLimit;
-				unitMedicalBase = baseLimit;
-				unitUnemploymentBase = baseLimit;
-				unitInjuryBase = baseLimit;
-				unitBirthBase = baseLimit;
-			} else {
-				unitPersionBase = socialInfo.getUnitPensionCardinal();
-				unitMedicalBase = socialInfo.getUnitMedicalCardinal();
-				unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
-				unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
-				unitBirthBase = socialInfo.getUnitBirthCardinal();
-			}
+			unitPersionBase = socialInfo.getUnitPensionCardinal();
+			unitMedicalBase = socialInfo.getUnitMedicalCardinal();
+			unitUnemploymentBase = socialInfo.getUnitUnemploymentCardinal();
+			unitInjuryBase = socialInfo.getUnitWorkInjuryCardinal();
+			unitBirthBase = socialInfo.getUnitBirthCardinal();
 			if (historyLibrary != null) {
 				if (historyLibrary.getUnitPersionPro() != null) {
 					unitPersionPro = historyLibrary.getUnitPersionPro();
@@ -1139,16 +1110,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			//大病收取方式 : 1.按月
 		} else if (CommonConstants.ONE_STRING.equals(socialInfo.getCollectType())) {
-			// 存储基数（最低或最高）
-			BigDecimal baseLimit = socialInfo.getLowerLimit();
-			if (CommonConstants.TWO_STRING.equals(paymentType)) {
-				baseLimit = socialInfo.getUpperLimit();
-			}
+
 			//  大病取值方式：1 按比例   按派单的基数和比例来
 			if (CommonConstants.ONE_STRING.equals(socialInfo.getValueType())) {
-				library.setUnitBigailmentBase(baseLimit);
+				library.setUnitBigailmentBase(socialInfo.getUnitBigailmentCardinal());
 				library.setUnitBigailmentPro(socialInfo.getUnitBigailmentPer());
-				library.setPersonalBigailmentBase(baseLimit);
+				library.setPersonalBigailmentBase(socialInfo.getPersonalBigailmentCardinal());
 				library.setPersonalBigailmentPro(socialInfo.getPersonalBigailmentPer());
 				library.setPersonalBigailmentFee(socialInfo.getPersonalBigailmentMoney());
 				library.setUnitBitailmentFee(socialInfo.getUnitBigailmentMoney());