feature: 挂号列表过滤比当期时间早的

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -227,8 +227,11 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 .build();
         GetScheduleListResponse getScheduleListResponse = taiheServiceBlockingStub.getScheduleList(getScheduleListRequest);
         List<Schedule> scheduleList;
+        Date date = getCurrentDate();
         if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
             scheduleList = getScheduleListResponse.getSchedulesList();
+            scheduleList = scheduleList.stream()
+                    .filter(p -> date.compareTo(DateUtil.parseDate(p.getServiceDate() + " " + p.getEndTime(), "yyyy-MM-dd HH:mm"))< 0).collect(Collectors.toList());
         } else {
             log.error("NfyyByfyRegisterController#getConvertedScheduleList(): HIS 获取排班接口出错：{}", getScheduleListResponse.getMsg());
             scheduleList = new LinkedList<>();
@@ -598,7 +601,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 .build();
         GetCommonOrderListResponse res = taiheRegisterServiceBlockingStub.getCommonOrderList(req);
         if (res.getCode() == ResultCode.SUCCEED_VALUE) {
-            total = res.getOrderList().size();
+
             for (CommonOrder item : res.getOrderList()) {
                 if(item.getHisPatientId().equals(request.getHisPatientId())) {
                     String deptCode = item.getDeptCode();
@@ -623,6 +626,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 }
             }
         }
+        total = list.size();
         Pagination pagination = new Pagination(request.getPageIndex(), request.getPageSize(), total);
         PageVO<QueryOrderListResponseData> resp = new PageVO<>(pagination, list);
         return resp;
@@ -885,4 +889,14 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         }
         return 0;
     }
+
+    private Date getCurrentDate() {
+        try {
+            String value = DateUtil.formatDate(new Date(), DateUtil.DADE_FROMAT_YMDHMS);
+            return DateUtil.parseDate(value, DateUtil.DADE_FROMAT_YMDHMS);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }