fix 报告生成

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -65,7 +65,7 @@ public class PoiTiUtils {
 
                 }
                 map11.put("testItems", list.get(x).getTestItems());
-                map11.put("standardRequirement", list.get(x).getStandardRequirement());
+                map11.put("standardRequirement", list.get(x).getStandardRequirement() + list.get(x).getYijufile());
                 map11.put("judgementBasis", list.get(x).getJudgementBasis());
                 map11.put("remark", list.get(x).getBeizhu());
                 g1maMapList.add(map11);
@@ -154,6 +154,10 @@ public class PoiTiUtils {
             if (i != null && StringUtils.isNotBlank(i.getStandardRequirement())) {
                 String[] strings = i.getStandardRequirement().split(",");
                 list.addAll(Arrays.asList(strings));
+                if (StringUtils.isNotBlank(i.getYijufile())) {
+                    list.add(i.getYijufile());
+
+                }
             }
         }