功图诊断接口实体对象字段调整

src/main/java/com/hb/proj/analysis/service/DiagramMeasureCalculator.java

@@ -56,12 +56,12 @@ public class DiagramMeasureCalculator {
 		double rst=pump.getPi()*Math.pow(pump.getBasicDiam()/2,2)*diagramData.getStroke()*1440*diagramData.getFreq()/1000000;
 		rst=rst*diagnose.getComPumpEff();
 		
-		diagnose.setLiquidYield(rst);
+		diagnose.setGtLiquidYield(rst);
 		
 		//有含水率时，分别计算油量、水量
 		if(measure.getWaterRatio()!=null) {
-			diagnose.setWaterYield(rst*measure.getWaterRatio().doubleValue()*0.01);
-			diagnose.setOilYield(rst-diagnose.getWaterYield().doubleValue());
+			diagnose.setGtWaterYield(rst*measure.getWaterRatio().doubleValue()*0.01);
+			diagnose.setGtOilYield(rst-diagnose.getGtWaterYield().doubleValue());
 		}
 		
 		return true;

src/main/java/com/hb/proj/model/DiagramDiagnoseLogPO.java

@@ -113,19 +113,19 @@ public class DiagramDiagnoseLogPO {
 	 * 柱塞面积：tzl_pump最近数据快照
 	 * 冲数、光杆冲程、综合泵效：自身数据
 	 */
-	private Double liquidYield;
+	private Double gtLiquidYield;
 	
 	/**
 	 * 功图油量=功图液量*（1-含水率)
 	 * 含水率:tzl_well_measure最近数据快照
 	 */
-	private Double oilYield;
+	private Double gtOilYield;
 	
 	/**
 	 * 功图水量=功图液量*含水率
 	 * 含水率:tzl_well_measure最近数据快照
 	 */
-	private Double waterYield;
+	private Double gtWaterYield;
 	
 	private Date createTime;