X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FMextStdFoodCompTable.java;h=ec6718833c3765974ded7283ff01fe8db574502c;hp=d85124898ebffdea68e075f3a59930f0d6e9c44e;hb=d41ccb85e1e04005a405e92e2028d123c1cde36e;hpb=f98d02389ae11048561869c20397ba9f60281edf

diff --git a/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
index d851248..ec67188 100644
--- a/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
+++ b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
@@ -87,16 +87,17 @@ public class MextStdFoodCompTable {
 
 				} //CELL
 
+
+
 				//食品群（１～１８）書き込み
 				compRow.createCell(62).setCellValue(group);
 
-
 				//緑黄色野菜か？
-				if(brightColoredVegetablesXmlFileName.length() > 0) {
-					boolean isBrightColored = false;
+				boolean isBrightColored = false;
+				if(group == 6 && brightColoredVegetablesXmlFileName.length() > 0) {
 					String foodName = thisRow.getCell(3).getStringCellValue();
 					for(String aBright : this.brightColoredVegetableList) {
-						if(foodName.matches(aBright + ".*")) {
+						if(foodName.matches(".*" + aBright + ".*")) {
 							isBrightColored = true;
 							break;
 						}