|
@@ -92,20 +92,36 @@ public class FIRP0178 extends QCCatalogue {
|
|
|
|
|
|
private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag) {
|
|
private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag) {
|
|
List<String> firstpageDiag = new ArrayList<>();
|
|
List<String> firstpageDiag = new ArrayList<>();
|
|
- for (int i = 1; i < dischargeDiag.size(); i++) {
|
|
|
|
|
|
+ for (int i = 0; i < dischargeDiag.size(); i++) {
|
|
|
|
+ if ("门诊诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
String diagnoseName = dischargeDiag.get(i).get(Content.diagnoseName);
|
|
String diagnoseName = dischargeDiag.get(i).get(Content.diagnoseName);
|
|
- if (StringUtil.isBlank(diagnoseName)) {
|
|
|
|
|
|
+ if (StringUtil.isBlank(diagnoseName) || "-".equals(diagnoseName)) { // 诊断名称为空不算
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- firstpageDiag.add(diagnoseName);
|
|
|
|
|
|
+ // 去重
|
|
|
|
+ if (!firstpageDiag.contains(diagnoseName)) {
|
|
|
|
+ firstpageDiag.add(diagnoseName);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- return firstpageDiag;
|
|
|
|
|
|
+ // 不复制第一个
|
|
|
|
+ List<String> res = new ArrayList<>();
|
|
|
|
+ if (ListUtil.isNotEmpty(firstpageDiag) && firstpageDiag.size() > 1) {
|
|
|
|
+ for (int i = 1; i < firstpageDiag.size(); i++) {
|
|
|
|
+ res.add(firstpageDiag.get(i));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return res;
|
|
}
|
|
}
|
|
|
|
|
|
private List<String> putDiagToList(List<Diag> diagList) {
|
|
private List<String> putDiagToList(List<Diag> diagList) {
|
|
List<String> diags = new ArrayList<>();
|
|
List<String> diags = new ArrayList<>();
|
|
for (Diag diag : diagList) {
|
|
for (Diag diag : diagList) {
|
|
- diags.add(diag.getHospitalDiagName());
|
|
|
|
|
|
+ // 去重
|
|
|
|
+ if (!diags.contains(diag.getHospitalDiagName())) {
|
|
|
|
+ diags.add(diag.getHospitalDiagName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return diags;
|
|
return diags;
|
|
}
|
|
}
|