|
@@ -60,6 +60,7 @@ public class PretreatmentLis extends Pretreatment {
|
|
} else {
|
|
} else {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
+
|
|
//查找化验套餐
|
|
//查找化验套餐
|
|
int position = cursor - 1;
|
|
int position = cursor - 1;
|
|
while (position > -1) {
|
|
while (position > -1) {
|
|
@@ -71,6 +72,18 @@ public class PretreatmentLis extends Pretreatment {
|
|
position--;
|
|
position--;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (StringUtils.isEmpty(result.getUniqueName())){
|
|
|
|
+ if (StringUtils.isNotEmpty(result.getDetailName()) && StringUtils.isNotEmpty(result.getName())){
|
|
|
|
+ result.setUniqueName(result.getName() + "--" + result.getDetailName());
|
|
|
|
+ } else if (StringUtils.isNotEmpty(result.getDetailName())){
|
|
|
|
+ result.setUniqueName(result.getDetailName());
|
|
|
|
+ } else if (StringUtils.isNotEmpty(result.getName())){
|
|
|
|
+ result.setUniqueName(result.getName());
|
|
|
|
+ } else {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|