Commit 837c9428 authored by huyuchen's avatar huyuchen

优化修改

parent b624902a
......@@ -1384,16 +1384,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//收取方式按年 且为指定月份时产生数据
if (CommonConstants.ZERO_STRING.equals(social.getCollectType()) && Common.isNotNull(socialSet)) {
//按年收取大病方式按定值
social.setPersonalBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentMoney(socialSet.getPayCompany());
social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
} else if (CommonConstants.ONE_STRING.equals(social.getCollectType())) {
//收取方式按月
if (CommonConstants.ZERO_STRING.equals(social.getValueType())) {
if (CommonConstants.ONE_STRING.equals(social.getValueType())) {
//收取大病按比例
social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), social.getUnitBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), social.getPersonalBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
} else if (CommonConstants.ONE_STRING.equals(social.getValueType()) && Common.isNotNull(socialSet)) {
} else if (CommonConstants.ZERO_STRING.equals(social.getValueType()) && Common.isNotNull(socialSet)) {
//收取大病方式按定值
social.setPersonalBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentCardinal(BigDecimal.ZERO);
social.setUnitBigailmentMoney(socialSet.getPayCompany());
social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment