诊断依据导入

src/main/java/com/diagbot/facade/KlDiagnoseImportFacade.java

@@ -82,12 +82,20 @@ public class KlDiagnoseImportFacade {
         // 保存数据
         if (allFlag) {
             saveData(allData);
-            message.put("导入条数", allData.size() + "条");
-            // 如果有指定诊断，提示导入的诊断；如果全部导入，提示“所有诊断”
+            long sucCount = allData.stream().filter(r -> ListUtil.isNotEmpty(r.getImportDiagnoseVOList())).count();
+            long emptyCount = allData.stream().filter(r -> ListUtil.isEmpty(r.getImportDiagnoseVOList())).count();
+            message.put("总条数", allData.size() + "条");
+            if (sucCount != 0L) {
+                message.put("成功导入条数", sucCount + "条");
+            }
+            if (emptyCount != 0L) {
+                message.put("空诊断依据条数", emptyCount + "条");
+                List<String> disNameList = allData.stream().filter(r -> ListUtil.isEmpty(r.getImportDiagnoseVOList())).map(r -> r.getDiseaseName()).collect(Collectors.toList());
+                message.put("空诊断依据", StringUtils.join(disNameList, CommonEnum.splitSymbol.getName()));
+            }
+            // 如果有指定诊断，提示导入的诊断；
             if (ListUtil.isNotEmpty(diagnoseImportVO.getDiags())) {
                 message.put("导入诊断", allData.stream().map(r -> r.getDiseaseName()).collect(Collectors.joining(CommonEnum.splitSymbol.getName())));
-            } else {
-                message.put("导入诊断", "所有诊断");
             }
         }
         long t2 = System.currentTimeMillis();

src/main/java/com/diagbot/vo/ImportDiagnoseVO.java

@@ -40,6 +40,8 @@ public class ImportDiagnoseVO implements Serializable, IExcelDataModel {
     private String minOperator;
     // @Excel(name="单位")
     // private String minUnit;
+    @Excel(name = "关联词")
+    private String description;;
 
     // 规则标准词id
     private List<Long> conceptId;