|
@@ -38,8 +38,6 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
|
|
|
Map<String, List<KlDiagnoseDetail>> diagnoseDetailMap = EntityUtil.makeEntityListMap(klDiagnoseDetailList, "disName");
|
|
|
// TODO 获取公式,分隔编码,替换编码,组装导出数据 Map<String, List<ExportDiagnoseDTO>>
|
|
|
Map<String, List<ExportDiagnoseDTO>> diagnoseDetails = processDiagnoseDetail(diagnoseDetailMap);
|
|
|
- System.out.println();
|
|
|
-
|
|
|
|
|
|
// TODO 导出数据
|
|
|
}
|
|
@@ -81,7 +79,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
|
|
|
while (iterator.hasNext()){
|
|
|
KlDiagnoseDetail next = iterator.next();
|
|
|
String code = next.getCode();
|
|
|
- if(!regexData.contains(code)){
|
|
|
+ if(!regexData.contains(code) && StringUtil.isNotBlank(code)){
|
|
|
iterator.remove();
|
|
|
}
|
|
|
}
|
|
@@ -124,7 +122,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
|
|
|
if(MapUtils.isNotEmpty(getAllFormula)){
|
|
|
getAllFormula.forEach((x,y) ->{
|
|
|
String collect = y.stream().collect(Collectors.joining(","));
|
|
|
- sb.append(collect);
|
|
|
+ sb.append(collect).append("+");
|
|
|
});
|
|
|
}
|
|
|
//获取公式中的编码
|