X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNucalgen.java;h=3c9dbcc81486db38215c9106e0654b82dac26607;hp=9eb18fcb5a579bdb36a2b4f0fcbff66ae3dfe5cb;hb=0576fa8bb36617412091cffc91ca1257816f059c;hpb=33a043c52b68b0feb72f4f3a84d648793f223b83

diff --git a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
index 9eb18fc..3c9dbcc 100644
--- a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
+++ b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
@@ -207,20 +207,22 @@ public class Nucalgen {
 		pfbBalanceRow1.createCell(4).setCellValue("F");
 		pfbBalanceRow1.createCell(5).setCellValue("C");
 
-		final String sumPfc = "(" + _namedAreaMap.get("SUM_P") + "*4+" + _namedAreaMap.get("SUM_F") + "*9+" + _namedAreaMap.get("SUM_C") + "*4)";
+		final String sumKiloCalorieCell = _namedAreaMap.get("SUM_KCAL");
 
 		rowIndex++;
 		Row pfbBalanceRow2 = calcSheet.createRow(rowIndex);
 		Cell pCell = pfbBalanceRow2.createCell(3);
 		pCell.setCellStyle(csPool.getCellStyle("0"));
-		pCell.setCellFormula(_namedAreaMap.get("SUM_P") + "*4*100/" + sumPfc);
+		pCell.setCellFormula("ROUND(" + _namedAreaMap.get("SUM_P") + "*4*100/" + sumKiloCalorieCell + ",0)");
 
 		Cell fCell = pfbBalanceRow2.createCell(4);
 		fCell.setCellStyle(csPool.getCellStyle("0"));
-		fCell.setCellFormula(_namedAreaMap.get("SUM_F") + "*9*100/" + sumPfc);
+		fCell.setCellFormula("ROUND(" + _namedAreaMap.get("SUM_F") + "*9*100/" + sumKiloCalorieCell + ",0)");
+
 		Cell cCell = pfbBalanceRow2.createCell(5);
 		cCell.setCellStyle(csPool.getCellStyle("0"));
-		cCell.setCellFormula(_namedAreaMap.get("SUM_C") + "*4*100/" + sumPfc);
+		cCell.setCellFormula("100 - (" + new CellReference(cCell.getRowIndex(), 3).formatAsString() + " + "
+				              + new CellReference(cCell.getRowIndex(), 4).formatAsString() + ")");
 
 		return rowIndex;
 	}