|
@@ -20,13 +20,16 @@ public class PacsCriticalNode {
|
|
|
Integer agemin, agemax;
|
|
|
|
|
|
List<CriticalNeoDTO> criticallist = new ArrayList<>();
|
|
|
- CriticalNeoDTO criticalNeoDTO;
|
|
|
+ CriticalNeoDTO criticalNeoDTO = new CriticalNeoDTO();
|
|
|
|
|
|
Integer gender = criticalNeoVO.getSex();
|
|
|
Double age = criticalNeoVO.getAge();
|
|
|
List<Item> pacsres = criticalNeoVO.getPacsLabel().getRes();
|
|
|
|
|
|
try {
|
|
|
+ List<String> rules = new ArrayList<>();
|
|
|
+ List<String> removelt = new ArrayList<>();
|
|
|
+
|
|
|
for (Item item : pacsres) {
|
|
|
|
|
|
String name = item.getUniqueName();
|
|
@@ -35,16 +38,30 @@ public class PacsCriticalNode {
|
|
|
List<PacsCritical> pacslist = pacsCriticalRepository.findByResult(name);
|
|
|
|
|
|
for (PacsCritical pacscri : pacslist) {
|
|
|
- criticalNeoDTO = new CriticalNeoDTO();
|
|
|
- result = pacscri.getVal();
|
|
|
- criticalNeoDTO.setName(result);
|
|
|
- criticalNeoDTO.setStandname(result);
|
|
|
- criticalNeoDTO.setType(Constants.fujian);
|
|
|
+ rules.add(pacscri.getVal());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- criticallist.add(criticalNeoDTO);
|
|
|
+ for (String x : rules) {
|
|
|
+ for (String y : rules) {
|
|
|
+ if (y.contains(x)) {
|
|
|
+ removelt.add(x);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ for (String rule : rules) {
|
|
|
+ if (removelt.indexOf(rule)==-1) {
|
|
|
+ criticalNeoDTO = new CriticalNeoDTO();
|
|
|
+ criticalNeoDTO.setName(rule);
|
|
|
+ criticalNeoDTO.setStandname(rule);
|
|
|
+ criticalNeoDTO.setType(Constants.fujian);
|
|
|
+
|
|
|
+ criticallist.add(criticalNeoDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
} catch (Exception ex) {
|
|
|
ex.printStackTrace();
|
|
|
}
|