|
@@ -14,10 +14,7 @@ import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.BigInteger;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -105,7 +102,7 @@ public class MenZhengXiangMuServer {
|
|
|
}
|
|
|
template.setChargeFee(template.getChargeFee().add(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin())));
|
|
|
template.getList().add(item);
|
|
|
- } else {
|
|
|
+ } else if (!resultList.contains(item)) {
|
|
|
resultList.add(item);
|
|
|
}
|
|
|
}
|
|
@@ -113,7 +110,6 @@ public class MenZhengXiangMuServer {
|
|
|
return resultList;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
public ResultVo<List<MzChargeDetail>> getMingXi(MzChargeDetail param) {
|
|
|
log.info("门诊信息:{}", JSON.toJSONString(param));
|
|
|
List<MzChargeDetail> list = new ArrayList<>();
|