|
@@ -11,9 +11,11 @@ import com.lantone.qc.pub.model.entity.Diag;
|
|
|
import com.lantone.qc.pub.model.label.DiagLabel;
|
|
|
import com.lantone.qc.pub.util.ListUtil;
|
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -42,13 +44,14 @@ public class LEA0147 extends QCCatalogue {
|
|
|
List<Diag> diags = leaveDiagLabel.getDiags();
|
|
|
Map<String, Map<String, String>> hospitalDiagMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
|
|
|
if (ListUtil.isNotEmpty(diags) && hospitalDiagMap != null) {
|
|
|
- long count = diags.stream().filter(i -> {
|
|
|
- if (i != null && StringUtil.isNotBlank(i.getHospitalDiagName())) {
|
|
|
- return hospitalDiagMap.get(i.getHospitalDiagName()) == null;
|
|
|
+ List<String> diagnames = new ArrayList<>();
|
|
|
+ for (Diag dg:diags) {
|
|
|
+ if (hospitalDiagMap.get(dg.getHospitalDiagName())==null) {
|
|
|
+ diagnames.add(dg.getHospitalDiagName());
|
|
|
}
|
|
|
- return false;
|
|
|
- }).count();
|
|
|
- if (count > 0) {
|
|
|
+ }
|
|
|
+ if (diagnames.size()>0) {
|
|
|
+ info.set(StringUtils.join(diagnames.toArray(), ","));
|
|
|
status.set("-1");
|
|
|
}
|
|
|
}
|