excel 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MedicalInsRuleProjectServiceImpl.java

@@ -325,7 +325,10 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                 boolean hasCode = false;
                 boolean hasCorrelationCode = false;
                 List<MedicalInsRuleProject> resultList = new ArrayList<>();
+
                 for (MedicalInsRuleProject item : list) {
+                    List<MedicalInsRuleProject> generateDataRecords = new ArrayList<>();
+
                     String projectCode = item.getProjectCode();
                     String correlationProjectCode = item.getCorrelationProjectCode();
                     // 1.2 projectCode+correlationProjectCode   两个全部都要有值(所有编码必填,请检查)
@@ -358,7 +361,6 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                             project.setProjectName(name);
                             codeList.add(project);
                         }
-
                         List<String> relatedCodeArr = Arrays.asList(correlationProjectCode.split("\n"));
                         List<String> relatedNameArr = Arrays.asList(item.getCorrelationProjectName().split("\n"));
                         List<MedicalInsRuleProject> relatedCodeList = new ArrayList<>();
@@ -372,10 +374,13 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                             project.setCorrelationProjectName(name);
                             relatedCodeList.add(project);
                         }
-                        list = generateDataRecords(codeList, relatedCodeList);
+                        generateDataRecords = generateDataRecords(codeList, relatedCodeList);
+                        resultList.addAll(generateDataRecords);
+                    }else{
+                        resultList.add(item);
                     }
                 }
-
+                list = resultList;
 
                 // 去重
                 // 倒序去重