|
@@ -63,6 +63,7 @@ import sun.util.calendar.BaseCalendar;
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author
|
|
@@ -368,10 +369,10 @@ public class InpatientServiceImpl implements InpatientService {
|
|
|
.build();
|
|
|
GetCashListResponse res = taiheServiceBlockingStub.getCashList(requ);
|
|
|
if (res.getCode() == BaseResponse.SUCCEED) {
|
|
|
- List<CashListItem> list = res.getListList();
|
|
|
- DepositTradeListResponseData da = new DepositTradeListResponseData();
|
|
|
+ List<CashListItem> list = res.getListList();
|
|
|
+ list = list.stream().sorted(Comparator.comparing(CashListItem::getPayDate).reversed()).collect(Collectors.toList());
|
|
|
for (CashListItem i : list) {
|
|
|
- da = new DepositTradeListResponseData();
|
|
|
+ DepositTradeListResponseData da = new DepositTradeListResponseData();
|
|
|
da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
|
|
|
da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
|
|
|
da.setOutTradeNo(i.getReceiptNo());
|