Merge branch 'master' of https://gogs.ywtinfo.com/guochengfeng/alipay-mp-service

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

@@ -125,7 +125,7 @@ public class IsvPayServiceImpl implements IsvPayService {
         if (request.getStatus() == TYPE_UNPAID_ZFB) {
             PayDetailResponseData da = new PayDetailResponseData();
             da.setDeptName(Checker.getStringValue(request.getDeptName()));
-            if(!Checker.isNone(request.getAge()) && request.getAge() > 0){
+            if (!Checker.isNone(request.getAge()) && request.getAge() > 0) {
                 da.setAge(request.getAge());
             }
             da.setSex(Checker.getStringValue(request.getSex()));
@@ -347,12 +347,20 @@ public class IsvPayServiceImpl implements IsvPayService {
                         String endDate = request.getEndTime();
                         Date start = DateUtil.parseDate(startDate, DateUtil.DADE_FROMAT_YMD);
                         Date end = DateUtil.parseDate(endDate, DateUtil.DADE_FROMAT_YMD);
-                        CheckUtil.ensureNotNull(start, "请选择时间");
-                        CheckUtil.ensureNotNull(end, "请选择时间");
+                        if (Checker.isNone(start) || Checker.isNone(end)) {
+                            Pagination pagination = new Pagination(pageIndex, pageSize, total);
+                            PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
+                            return res;
+                        }
+//                        CheckUtil.ensureNotNull(start, "请选择时间");
+//                        CheckUtil.ensureNotNull(end, "请选择时间");
                         long day = 0;
                         day = DateUtil.getDaySub(request.getEndTime(), request.getStartTime());
                         if (day < -15) {
-                            throw new AppMessageException("请选择15天以内");
+//                            throw new AppMessageException("请选择15天以内");
+                            Pagination pagination = new Pagination(pageIndex, pageSize, total);
+                            PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
+                            return res;
                         }
                         GetOutpatientListRequest req3 = GetOutpatientListRequest.newBuilder()
                                 .setPatientId(hisPatientId)
@@ -363,7 +371,11 @@ public class IsvPayServiceImpl implements IsvPayService {
                                 .build();
                         GetOutpatientListResponse res3 = taiheServiceBlockingStub.getOutpatientList(req3);
                         if (res3.getCode() != ResultCode.SUCCEED_VALUE) {
-                            throw new RuntimeException(res3.getMsg());
+//                            throw new RuntimeException(res3.getMsg());
+                            Pagination pagination = new Pagination(pageIndex, pageSize, total);
+                            PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
+                            return res;
+
                         }
                         total = res3.getPaymentList().size();
                         for (PaymentItem payItem : res3.getPaymentList()) {
@@ -433,7 +445,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                 .setHisClinicCode(request.getHisClinicCode())
                 .setHisOrderNo(request.getHisOrderNo())
                 .setPayName(request.getName())
-                .setPrescriptionDate(Checker.isNone(pDate)? 0L : pDate.getTime())
+                .setPrescriptionDate(Checker.isNone(pDate) ? 0L : pDate.getTime())
                 .setPatientName(request.getName())
                 .setPatientAge(request.getAge())
                 .setPatientSex(sex)

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

@@ -617,7 +617,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 list.add(data);
             }
         }
-        Pagination pagination = new Pagination(request.getPageIndex(), total, total);
+        Pagination pagination = new Pagination(request.getPageIndex(), request.getPageSize(), total);
         PageVO<QueryOrderListResponseData> resp = new PageVO<>(pagination, list);
         return resp;
     }