diff --git a/calc/com/tenwa/reckon/bean/ConditionBean.java b/calc/com/tenwa/reckon/bean/ConditionBean.java
index ff77eecb5..641d63845 100644
--- a/calc/com/tenwa/reckon/bean/ConditionBean.java
+++ b/calc/com/tenwa/reckon/bean/ConditionBean.java
@@ -181,6 +181,26 @@ public class ConditionBean implements Cloneable{
 //	private String pmtEndValue; //租金测算pmt公式后期测算代入的值,相当于期末残值,默认为0
 //	private String endIrr;// 合同结束时的实际IRR
 	
+	
+	
+	/**
+	 * 调整罚息的取值方式
+	 * */
+	private String RATE_TYPE;
+	private String ADJUST_TYPE;
+	public String getRATE_TYPE() {
+		return RATE_TYPE;
+	}
+	public void setRATE_TYPE(String rATE_TYPE) {
+		RATE_TYPE = rATE_TYPE;
+	}
+	public String getADJUST_TYPE() {
+		return ADJUST_TYPE;
+	}
+	public void setADJUST_TYPE(String aDJUST_TYPE) {
+		ADJUST_TYPE = aDJUST_TYPE;
+	}
+	
 	/**
 	 * 
 	 * <p>ConditionBean ID。</p>
diff --git a/calc/com/tenwa/reckon/util/TransRateHelper.java b/calc/com/tenwa/reckon/util/TransRateHelper.java
index 67588ea57..3ec831167 100644
--- a/calc/com/tenwa/reckon/util/TransRateHelper.java
+++ b/calc/com/tenwa/reckon/util/TransRateHelper.java
@@ -206,7 +206,8 @@ public class TransRateHelper {
 	 * @return
 	 * @throws JBOException 
 	 */
-	public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
+/*	  原版的 调息方法
+ * public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
 		String newRate = "0";
 		if("calculation".equals(condition.getAdjustType())){
 			if ("proportion".equals(condition.getRateFloatType())) {// 按央行利率浮动时
@@ -224,6 +225,19 @@ public class TransRateHelper {
 			newRate = oldYearRate;
 		}
 		return newRate;
+	}*/   
+	public static String getNewRate(ConditionBean condition, String oldYearRate,BizObject adjust) throws JBOException {
+		String newRate = "0";
+		if("ratetype01".equals(condition.getRATE_TYPE())){
+			if ("calculation".equals(condition.getADJUST_TYPE())) {// 按央行利率浮动时
+				newRate = getRateByProportion(condition.getLeaseTerm(), oldYearRate, adjust, condition.getRateFloatAmt());
+			} else{// 按央利率加点时
+				newRate = getRateByPoint(condition.getLeaseTerm(), adjust, condition.getRateFloatAmt());
+			}
+		}else{
+			newRate = oldYearRate;
+		}
+		return newRate;
 	}
 
 	/**