|
@@ -73,10 +73,12 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
|
|
|
List<MzChargeDetail> ycChargeDetail = new ArrayList<>();
|
|
|
for (int i = 0; i < chargeDetails.size(); i++) {
|
|
|
MzChargeDetail chargeDetail = chargeDetails.get(i);
|
|
|
- if(chargeDetail.getGroupNo().equals("71") && chargeDetail.getIsHide() != 1){
|
|
|
- xyChargeDetail.add(chargeDetail);
|
|
|
- }else if(chargeDetail.getGroupNo().equals("91")){
|
|
|
- ycChargeDetail.add(chargeDetail);
|
|
|
+ if(chargeDetail.getPrintFlag().equals("0")){
|
|
|
+ if(chargeDetail.getGroupNo().equals("71") && chargeDetail.getIsHide() != 1){
|
|
|
+ xyChargeDetail.add(chargeDetail);
|
|
|
+ }else if(chargeDetail.getGroupNo().equals("91")){
|
|
|
+ ycChargeDetail.add(chargeDetail);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if(xyChargeDetail.size() > 0 || ycChargeDetail.size() > 0){
|