・緑黄色野菜 修正

[nucalgen] / src / main / java / jp / satomichan / nucalgen / MextStdFoodCompTable.java

diff --git a/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
index 9cc42063fe2ecfdfec4c51e02d5b3cad9d714623..ec6718833c3765974ded7283ff01fe8db574502c 100644 (file)
--- a/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
+++ b/src/main/java/jp/satomichan/nucalgen/MextStdFoodCompTable.java
@@ -37,7 +37,6 @@ public class MextStdFoodCompTable {
                Sheet foodComposithonSheet = outputWorkbook.cloneSheet(0);
                outputWorkbook.setSheetName(18, "成分表");
                outputWorkbook.setSheetOrder("成分表", 0);
-               //Sheet foodComposithonSheet = outputWorkbook.createSheet("成分表");
 
                //「成分識別子」行
                Row idRow = foodComposithonSheet.getRow(10);
@@ -88,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;
                                                }