|
@@ -88,14 +88,10 @@ public class FIRC0095 extends QCCatalogue {
|
|
|
if (likeRate > 0.9) {
|
|
|
matchSum++;
|
|
|
} else {
|
|
|
- if (StringUtil.isBlank(infoStr)){
|
|
|
- infoStr += presentPastDiag;
|
|
|
- } else {
|
|
|
- if (!infoStr.contains(presentPastDiag)) {
|
|
|
- infoStr += "," + presentPastDiag;
|
|
|
- }
|
|
|
- }
|
|
|
+ infoStr = concatInfo(infoStr, presentPastDiag);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ infoStr = concatInfo(infoStr, presentPastDiag);
|
|
|
}
|
|
|
}
|
|
|
info.set(infoStr);
|
|
@@ -109,6 +105,17 @@ public class FIRC0095 extends QCCatalogue {
|
|
|
*/
|
|
|
}
|
|
|
|
|
|
+ private String concatInfo(String infoStr, String presentPastDiag) {
|
|
|
+ if (StringUtil.isBlank(infoStr)) {
|
|
|
+ infoStr += presentPastDiag;
|
|
|
+ } else {
|
|
|
+ if (!infoStr.contains(presentPastDiag)) {
|
|
|
+ infoStr += "," + presentPastDiag;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return infoStr;
|
|
|
+ }
|
|
|
+
|
|
|
private void addDiagHospitalName(List<String> presentPastDiag, List<Diag> pastDiags) {
|
|
|
for (Diag pastDiag : pastDiags) {
|
|
|
if (pastDiag.getNegative() != null) {
|