feature: 挂号医生返回参数

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/core/utils/ContextHelper.java

@@ -16,7 +16,7 @@ public final class ContextHelper {
     }
 
     public static int getCurrentUserIdWrapped() {
-//        return 5;
+//        return 173140;
         return WebAppContext.current().getUserId();
     }
 

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/models/enums/HospitalNameEnum.java

@@ -0,0 +1,42 @@
+package com.ywt.alipaympapi.models.enums;
+
+import com.ywt.alipaympapi.core.utils.Checker;
+
+public enum HospitalNameEnum {
+
+    BAIYUN("南方医科大学南方医院白云分院", 41),
+    TAIHE("南方医院太和分院", 12);
+
+    private final String displayName;
+
+    private final int value;
+
+    HospitalNameEnum(String displayName, int value) {
+        this.displayName = displayName;
+        this.value = value;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static HospitalNameEnum valueOf(int value) {
+        for (HospitalNameEnum enumObj : HospitalNameEnum.values()) {
+            if (enumObj.getValue() == value) {
+                return enumObj;
+            }
+        }
+        return null;
+    }
+    public static String getDisplayName(int value) {
+        HospitalNameEnum enumObj = valueOf(value);
+        if (!Checker.isNone(enumObj)){
+            return enumObj.displayName;
+        }
+        return "";
+    }
+}

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

@@ -204,6 +204,9 @@ public class IsvPayServiceImpl implements IsvPayService {
                 da.setStatus(request.getStatus());
                 da.setAmount(request.getAmount());
                 da.setHisPatientId(request.getHisPatientId());
+                da.setDoctorName(Checker.getStringValue(request.getDoctorName()));
+                da.setDeptName(Checker.getStringValue(request.getDeptName()));
+                da.setPayDate(Checker.getStringValue(request.getPayTime()));
                 break;
 
         }

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

@@ -287,6 +287,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 item.setLevel(s.getDoctorTitle());
                 item.setDoctorCode(s.getDoctorCode());
                 item.setDeptCode(s.getDeptCode());
+                item.setDistrictName(HospitalNameEnum.getDisplayName(hospitalId));
             }
             List<OrderSource> orderSourceList = item.getOrderSources();
             if (Checker.isNone(orderSourceList)) {
@@ -300,7 +301,8 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
             //号源截止时间段
             os.setEndTime("");
             //挂号费用
-            os.setCost(BizUtil.cent2Yuan(s.getFee()) + "");
+            os.setCost(String.format("%.2f", s.getFee() / 100d));
+//            os.setCost(BizUtil.cent2Yuan(s.getFee()) + "");
             //剩余数量
             os.setRemain(Checker.getIntegerValue(s.getAvailableLeftNum()));
             //true：确认挂号时支付，false：就诊时支付
@@ -530,7 +532,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 int orderStatus = item.getRegisteredStatus();
                 String statusName = "";
                 if ((item.getRegisteredStatus() & RegisteredStatusEnum.Cancel.getValue()) == RegisteredStatusEnum.Cancel.getValue()
-                      ) {
+                ) {
                     statusName = "取消预约";
                     orderStatus = 9;
                 } else if (item.getRegisteredStatus() == RegisteredStatusEnum.Refunded.getValue()) {
@@ -548,7 +550,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                     GetCommonOrderListResponse resTwo = taiheRegisterServiceBlockingStub.getCommonOrderList(reqTwo);
                     if (resTwo.getCode() == ResultCode.SUCCEED_VALUE) {
                         for (CommonOrder itemTwo : resTwo.getOrderList()) {
-                            if (orderId == itemTwo.getOrderId()){
+                            if (orderId == itemTwo.getOrderId()) {
                                 statusName = itemTwo.getStatusName();
                                 orderStatus = getStatus(itemTwo.getStatusName());
                             }
@@ -608,7 +610,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 data.setDepName(item.getDeptName());
                 data.setDeptCode(item.getDeptCode());
                 data.setDistrictName(item.getHospitalName());
-                data.setTimeRange(item.getStartTime()+"~"+item.getEndTime());
+                data.setTimeRange(item.getStartTime() + "~" + item.getEndTime());
                 String amountStr = String.format("%.2f", amount);
                 data.setAmount(amountStr);
                 data.setStatus(getStatus(item.getStatusName()));
@@ -874,7 +876,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         if ("待就诊".equals(statusName)) {
             return 2;
         }
-        if("已退款".equals(statusName)) {
+        if ("已退款".equals(statusName)) {
             return 11;
         }
         return 0;

onemini-hospital-sdk/src/main/java/com/ywt/request/pay/PayDetailRequest.java

@@ -31,6 +31,7 @@ public class PayDetailRequest implements IsvRequest<PayDetailResponseData>, IApp
     private String doctorCode;
     private int total;
     private String hisClinicCode;
+    private String payTime;
 
     @Override
     public String serviceName() {

onemini-hospital-sdk/src/main/java/com/ywt/response/register/QueryDepDoctorListResponseData.java

@@ -25,4 +25,5 @@ public class QueryDepDoctorListResponseData implements IsvResponseData {
     private String doctorCode;//医生code
     private String deptCode;//科室code
     private Integer hospitalId;//医药ID
+    private String districtName;
 }