|
@@ -29,10 +29,7 @@ import com.google.common.collect.Maps;
|
|
import org.apache.commons.collections4.MapUtils;
|
|
import org.apache.commons.collections4.MapUtils;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Iterator;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.regex.Matcher;
|
|
import java.util.regex.Matcher;
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
@@ -165,7 +162,9 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
|
|
Map<String, String> rulePacsCompiles = ruleAllCompile(rulesTepy, pacs);
|
|
Map<String, String> rulePacsCompiles = ruleAllCompile(rulesTepy, pacs);
|
|
if (MapUtils.isNotEmpty(rulePacsCompiles)) {
|
|
if (MapUtils.isNotEmpty(rulePacsCompiles)) {
|
|
if (ListUtil.isNotEmpty(pacsNumList)) {
|
|
if (ListUtil.isNotEmpty(pacsNumList)) {
|
|
- for (PacsNum x : pacsNumList) {
|
|
|
|
|
|
+ ListIterator<PacsNum> pacsNumListIterator = pacsNumList.listIterator();
|
|
|
|
+ while (pacsNumListIterator.hasNext()){
|
|
|
|
+ PacsNum x = pacsNumListIterator.next();
|
|
String name = x.getName();
|
|
String name = x.getName();
|
|
PD pd = x.getPd();
|
|
PD pd = x.getPd();
|
|
if (pd != null) {
|
|
if (pd != null) {
|
|
@@ -200,7 +199,7 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
|
|
Map<String, String> rulevitalsCompiles = ruleAllCompile(rulesTepyVitals, vital);
|
|
Map<String, String> rulevitalsCompiles = ruleAllCompile(rulesTepyVitals, vital);
|
|
if (MapUtils.isNotEmpty(rulevitalsCompiles)) {
|
|
if (MapUtils.isNotEmpty(rulevitalsCompiles)) {
|
|
if (ListUtil.isNotEmpty(vitals)) {
|
|
if (ListUtil.isNotEmpty(vitals)) {
|
|
- Iterator<Vital> vitalIterator = vitals.iterator();
|
|
|
|
|
|
+ Iterator<Vital> vitalIterator = vitals.listIterator();
|
|
while (vitalIterator.hasNext()) {
|
|
while (vitalIterator.hasNext()) {
|
|
Vital next = vitalIterator.next();
|
|
Vital next = vitalIterator.next();
|
|
String name = next.getName();
|
|
String name = next.getName();
|