土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -296,7 +296,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                    if (StringUtils.isNotBlank(config.getFormula())&&null != config.getColumnPlace() && null != config.getMergeRowNum()){
                        Integer sampleBgMum = template.getSampleBeginRow();
                        Integer mergeRowNum = config.getMergeRowNum();
-                       int formulaNum = template.getSampleBeginRow()+sampleMergerNum*voList.size()-1 ;
+                       int formulaNum = template.getSampleBeginRow()+sampleMergerNum*templateSampleNum-1 ;
+
                        for (int i =sampleBgMum ; i < formulaNum; i+=mergeRowNum) {
                            XSSFRow row = sheetOne.getRow(i);
                            XSSFCell cell = row.getCell(config.getColumnPlace());