fix: 修复取消预约错误逻辑

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

@@ -230,13 +230,13 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         Date date = getCurrentDate();
         if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
             scheduleList = getScheduleListResponse.getSchedulesList();
-            if(!Checker.isNone(serviceDate)){
-             Date dateS = DateUtil.parseDate(serviceDate, "yyyy-MM-dd");
+            if (!Checker.isNone(serviceDate)) {
+                Date dateS = DateUtil.parseDate(serviceDate, "yyyy-MM-dd");
                 scheduleList = scheduleList.stream()
                         .filter(s -> dateS.compareTo(DateUtil.parseDate(s.getServiceDate(), "yyyy-MM-dd")) == 0).collect(Collectors.toList());
             }
             scheduleList = scheduleList.stream()
-                    .filter(p -> date.compareTo(DateUtil.parseDate(p.getServiceDate() + " " + p.getEndTime(), "yyyy-MM-dd HH:mm"))< 0).collect(Collectors.toList());
+                    .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<>();
@@ -631,7 +631,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         if (res.getCode() == ResultCode.SUCCEED_VALUE) {
 
             for (CommonOrder item : res.getOrderList()) {
-                if(item.getHisPatientId().equals(request.getHisPatientId())) {
+                if (item.getHisPatientId().equals(request.getHisPatientId())) {
                     String deptCode = item.getDeptCode();
                     double amount = item.getAmount() / 100d;
                     QueryOrderListResponseData data = new QueryOrderListResponseData();
@@ -686,10 +686,8 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 .setHospitalId(hospitalId)
                 .build();
         CancelRegisteredResponse res = taiheRegisterServiceBlockingStub.cancelRegistered(req);
-        responseData.setIsSuccess(false);
-        if (res.getCode() == ResultCode.SUCCEED_VALUE) {
-            responseData.setIsSuccess(true);
-        }
+        if (res.getCode() != ResultCode.SUCCEED_VALUE) throw new AppMessageException(res.getMsg());
+        responseData.setIsSuccess(true);
         return responseData;
     }