|
@@ -125,7 +125,7 @@ public class IsvPayServiceImpl implements IsvPayService {
|
|
if (request.getStatus() == TYPE_UNPAID_ZFB) {
|
|
if (request.getStatus() == TYPE_UNPAID_ZFB) {
|
|
PayDetailResponseData da = new PayDetailResponseData();
|
|
PayDetailResponseData da = new PayDetailResponseData();
|
|
da.setDeptName(Checker.getStringValue(request.getDeptName()));
|
|
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.setAge(request.getAge());
|
|
}
|
|
}
|
|
da.setSex(Checker.getStringValue(request.getSex()));
|
|
da.setSex(Checker.getStringValue(request.getSex()));
|
|
@@ -347,7 +347,7 @@ public class IsvPayServiceImpl implements IsvPayService {
|
|
String endDate = request.getEndTime();
|
|
String endDate = request.getEndTime();
|
|
Date start = DateUtil.parseDate(startDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date start = DateUtil.parseDate(startDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date end = DateUtil.parseDate(endDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date end = DateUtil.parseDate(endDate, DateUtil.DADE_FROMAT_YMD);
|
|
- if(Checker.isNone(start) || Checker.isNone(end)){
|
|
|
|
|
|
+ if (Checker.isNone(start) || Checker.isNone(end)) {
|
|
Pagination pagination = new Pagination(pageIndex, pageSize, total);
|
|
Pagination pagination = new Pagination(pageIndex, pageSize, total);
|
|
PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
|
|
PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
|
|
return res;
|
|
return res;
|
|
@@ -368,7 +368,11 @@ public class IsvPayServiceImpl implements IsvPayService {
|
|
.build();
|
|
.build();
|
|
GetOutpatientListResponse res3 = taiheServiceBlockingStub.getOutpatientList(req3);
|
|
GetOutpatientListResponse res3 = taiheServiceBlockingStub.getOutpatientList(req3);
|
|
if (res3.getCode() != ResultCode.SUCCEED_VALUE) {
|
|
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();
|
|
total = res3.getPaymentList().size();
|
|
for (PaymentItem payItem : res3.getPaymentList()) {
|
|
for (PaymentItem payItem : res3.getPaymentList()) {
|
|
@@ -438,7 +442,7 @@ public class IsvPayServiceImpl implements IsvPayService {
|
|
.setHisClinicCode(request.getHisClinicCode())
|
|
.setHisClinicCode(request.getHisClinicCode())
|
|
.setHisOrderNo(request.getHisOrderNo())
|
|
.setHisOrderNo(request.getHisOrderNo())
|
|
.setPayName(request.getName())
|
|
.setPayName(request.getName())
|
|
- .setPrescriptionDate(Checker.isNone(pDate)? 0L : pDate.getTime())
|
|
|
|
|
|
+ .setPrescriptionDate(Checker.isNone(pDate) ? 0L : pDate.getTime())
|
|
.setPatientName(request.getName())
|
|
.setPatientName(request.getName())
|
|
.setPatientAge(request.getAge())
|
|
.setPatientAge(request.getAge())
|
|
.setPatientSex(sex)
|
|
.setPatientSex(sex)
|