|
@@ -1099,23 +1099,16 @@ public class ConsoleFacade {
|
|
|
}
|
|
|
if(operationBehospitalCode!=null && operationBehospitalCode.size()>0){
|
|
|
mapCode.put("operation",operationBehospitalCode);
|
|
|
- }
|
|
|
- if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(pathologyBehospitalCode)){
|
|
|
- mapCode.put("operationPathology",null);
|
|
|
}else {
|
|
|
mapCode.put("operation",null);
|
|
|
}
|
|
|
- if((operationBehospitalCode!=null)&&(operationPathologyBehospitalCode!=null&&operationPathologyBehospitalCode.size()>0)){
|
|
|
+ if((operationBehospitalCode!=null)&&(pathologyBehospitalCode!=null&&pathologyBehospitalCode.size()>0)){
|
|
|
for (String operation : operationBehospitalCode) {
|
|
|
if(pathologyBehospitalCode.contains(operation)){
|
|
|
operationPathologyBehospitalCode.add(operation);
|
|
|
}
|
|
|
}
|
|
|
- mapCode.put("operationPathology",operationBehospitalCode);
|
|
|
- mapCode.put("operationPathology",operationPathologyBehospitalCode);
|
|
|
- }
|
|
|
- if(ListUtil.isEmpty(bacterialCultureCode)){
|
|
|
- mapCode.put("bacterialCulture",null);
|
|
|
+ mapCode.put("operationPathology",pathologyBehospitalCode);
|
|
|
}else {
|
|
|
mapCode.put("operationPathology",null);
|
|
|
}
|