fix 新增诊疗卡相关接口

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

@@ -0,0 +1,35 @@
+package com.ywt.alipaympapi.models.enums;
+
+//与本人关系枚举
+public enum RelationshipEnum {
+    MYSELF("本人", 1),
+    FAMILY("家庭成员", 2),
+    KINSFOLK("亲戚", 3),
+    FRIEND("朋友", 4),
+    OTHER("其他", 5);
+
+    private final String displayName;
+    private final int value;
+
+    RelationshipEnum(String displayName, int value) {
+        this.displayName = displayName;
+        this.value = value;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static RelationshipEnum valueOf(int value) {
+        for (RelationshipEnum item : RelationshipEnum.values()) {
+            if (item.getValue() == value) {
+                return item;
+            }
+        }
+        return OTHER;
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.ywt.alipaympapi.models.enums;
+
+
+public enum SexEnum {
+    Unknown("未知", 0),
+    Male("男", 1),
+    Female("女", 2),
+    Unspecified("未说明", 9);
+
+    private final String displayName;
+
+    private int value = 0;
+
+    SexEnum(String displayName, int value) {
+        this.displayName = displayName;
+        this.value = value;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static SexEnum valueOf(int value) {
+        for(SexEnum sexEnum : SexEnum.values()){
+            if(sexEnum.getValue() == value){
+                return sexEnum;
+            }
+        }
+        return null;
+    }
+
+    public static SexEnum getSexByName(String value){
+        for(SexEnum sexEnum : SexEnum.values()){
+            if(value.equals(sexEnum.getDisplayName())){
+                return sexEnum;
+            }
+        }
+        return Unknown;
+    }
+
+    public static String getSexDisplayName(int value){
+        SexEnum sexEnum = valueOf(value);
+
+        if(sexEnum != null){
+            return sexEnum.getDisplayName();
+        }
+
+        return "未知";
+    }
+
+
+}

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

@@ -2,29 +2,32 @@ package com.ywt.alipaympapi.service.impl;
 
 import com.ywt.alipaympapi.core.utils.*;
 import com.ywt.alipaympapi.models.BaseResponse;
+import com.ywt.alipaympapi.models.enums.RelationshipEnum;
+import com.ywt.alipaympapi.models.enums.SexEnum;
 import com.ywt.alipaympapi.models.enums.SmsCodeTypeEnum;
 import com.ywt.alipaympapi.service.AuthService;
+import com.ywt.alipaympapi.service.IsvMedicCardService;
 import com.ywt.alipaympapi.service.services.MessageSrv;
 import com.ywt.core.exception.AppMessageException;
+import com.ywt.gapi.Result;
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.ResultInt;
 import com.ywt.gapi.taihe.register.CreateMedicalCardRequest;
 import com.ywt.gapi.taihe.register.CreateMedicalCardResponse;
 import com.ywt.gapi.taihe.register.TaiheRegisterServiceGrpc;
-import com.ywt.gapi.user.AddMedicalCardRequest;
-import com.ywt.gapi.user.UserServiceGrpc;
+import com.ywt.gapi.user.*;
 import com.ywt.model.PageVO;
+import com.ywt.model.Pagination;
+import com.ywt.request.card.UpdatePatientRequest;
 import com.ywt.request.card.*;
 import com.ywt.response.card.*;
-import com.ywt.alipaympapi.service.IsvMedicCardService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 @Service
 public class IsvMedicCardServiceImpl implements IsvMedicCardService {
@@ -56,7 +59,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         String authCode = request.getAuthCode();
         //关系
         String relationShip = request.getRelationShip();
-        //是否默认
+        //是否默认（1-是，2-否）
         String defaultCard = request.getDefaultCard();
         //手机号
         String phoneNo = request.getPhoneNumber();
@@ -122,7 +125,10 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
             if (response.getCode() != BaseResponse.SUCCEED) {
                 throw new AppMessageException(response.getInfo());
             }
-            int relationshipInt = 5, defaultCardInt = 0;
+            // 通过枚举类的方法，将文字转换成数字
+            int relationshipInt = RelationshipEnum.valueOf(relationShip).getValue();
+            // defaultCardInt: 1-是，0-否
+            int defaultCardInt = "1".equals(defaultCard) ? 1 : 0;
             AddMedicalCardRequest addMedicalCardRequest = AddMedicalCardRequest.newBuilder()
                     .setUserId(userId)
                     .setHospitalId(hospitalId)
@@ -152,76 +158,244 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
     }
 
     @Override
-    public UpdateCardResponseData updateMedicCard(UpdateCardRequest request) {
+    public UpdateCardResponseData updateMedicCard(UpdateCardRequest request) throws Exception {
+        if (1 == 1) {
+            throw new AppMessageException("尚无修改诊疗卡功能");
+        }
         return null;
     }
 
     @Override
     public QuerySingleCardResponseData querySingleMedicCard(QuerySingleCardRequest request) throws Exception {
-        QuerySingleCardResponseData data = new QuerySingleCardResponseData();
-        String userId = request.getUserId();
-        if (userId.equals("1")) {
-            data.setBalance("0.02");
-            data.setBirthDay("2022-09-08");
-            data.setCardNum("123456");
-            return data;
-        } else {
-            throw new AppMessageException("userId有误");
+        // 此处传诊疗卡ID和userId
+        String cardNum = request.getCardNum();
+        if (Checker.isNone(cardNum)) {
+            throw new AppMessageException("诊疗卡不存在");
+        }
+        int cardId = Integer.parseInt(cardNum);
+        String appId = request.getAppId();
+        int hospitalId = authService.getHospitalIdByAppId(appId);
+        int userId = ContextHelper.getCurrentUserIdWrapped();
+        GetMedicalCardListRequest getMedicalCardListRequest = GetMedicalCardListRequest.newBuilder()
+                .setHospitalId(hospitalId)
+                .setUserId(userId)
+                .build();
+        GetMedicalCardListResponse getMedicalCardListResponse = userServiceBlockingStub.getMedicalCardList(getMedicalCardListRequest);
+        Result result = getMedicalCardListResponse.getResult();
+
+        if (result.getCode() == ResultCode.SUCCEED) {
+            for (MedicalCard medicalCard : getMedicalCardListResponse.getMedicalCardsList()) {
+                if (medicalCard.getCardId() == cardId) {
+                    double balance = medicalCard.getBalance() / 100d;
+                    QuerySingleCardResponseData item = new QuerySingleCardResponseData();
+                    item.setCardNum(medicalCard.getCardNo());//就诊卡卡号/医保卡卡号
+                    String cardType = medicalCard.getCardType();
+                    item.setType("0");//标记查询卡类型
+                    item.setName(medicalCard.getPatientName());//姓名
+                    item.setSex(SexEnum.getSexDisplayName(medicalCard.getSex()));//性别
+                    item.setBirthDay(medicalCard.getBirthday());//生日
+                    item.setIdCardNo(medicalCard.getIdNo());//身份证号码
+                    item.setPhoneNumber(medicalCard.getMobile());//手机号
+                    item.setBalance(balance + "");//卡内余额
+                    item.setRelationShip(RelationshipEnum.valueOf(medicalCard.getRelationship()).getDisplayName()); // 关系
+                    item.setDefaultCard(medicalCard.getIsDefault() ? "是" : "否");//是否是默认就诊卡
+                    return item;
+                }
+            }
         }
+        return null;
     }
 
     @Override
-    public QueryDefaultCardResponseData queryDefaultMedicCard(QueryDefaultCardRequest request) {
+    public QueryDefaultCardResponseData queryDefaultMedicCard(QueryDefaultCardRequest request) throws Exception {
+        String appId = request.getAppId();
+        int hospitalId = authService.getHospitalIdByAppId(appId);
+        int userId = ContextHelper.getCurrentUserIdWrapped();
+        GetMedicalCardListRequest getMedicalCardListRequest = GetMedicalCardListRequest.newBuilder()
+                .setHospitalId(hospitalId)
+                .setUserId(userId)
+                .build();
+        GetMedicalCardListResponse getMedicalCardListResponse = userServiceBlockingStub.getMedicalCardList(getMedicalCardListRequest);
+        Result result = getMedicalCardListResponse.getResult();
+
+        if (result.getCode() == ResultCode.SUCCEED) {
+            for (MedicalCard medicalCard : getMedicalCardListResponse.getMedicalCardsList()) {
+                if (medicalCard.getIsDefault()) {
+                    double balance = medicalCard.getBalance() / 100d;
+                    QueryDefaultCardResponseData item = new QueryDefaultCardResponseData();
+                    item.setCardNum(medicalCard.getCardNo());//就诊卡卡号/医保卡卡号
+                    String cardType = medicalCard.getCardType();
+                    item.setType("0");//标记查询卡类型
+                    item.setName(medicalCard.getPatientName());//姓名
+                    item.setSex(SexEnum.getSexDisplayName(medicalCard.getSex()));//性别
+                    item.setBirthDay(medicalCard.getBirthday());//生日
+                    item.setIdCardNo(medicalCard.getIdNo());//身份证号码
+                    item.setPhoneNumber(medicalCard.getMobile());//手机号
+                    item.setBalance(balance + "");//卡内余额
+                    item.setRelationShip(RelationshipEnum.valueOf(medicalCard.getRelationship()).getDisplayName()); // 关系
+                    item.setDefaultCard(medicalCard.getIsDefault() ? "是" : "否");//是否是默认就诊卡
+                    item.setPatientId("");//如果是医保卡，传参保城市
+                    return item;
+                }
+            }
+        }
         return null;
     }
 
     @Override
-    public PageVO<QueryListCardResponseData> queryListMedicCard(QueryListCardRequest request) {
-        return null;
+    public PageVO<QueryListCardResponseData> queryListMedicCard(QueryListCardRequest request) throws Exception {
+
+        String appId = request.getAppId();
+        int hospitalId = authService.getHospitalIdByAppId(appId);
+        int userId = ContextHelper.getCurrentUserIdWrapped();
+        GetMedicalCardListRequest getMedicalCardListRequest = GetMedicalCardListRequest.newBuilder()
+                .setHospitalId(hospitalId)
+                .setUserId(userId)
+                .build();
+        GetMedicalCardListResponse getMedicalCardListResponse = userServiceBlockingStub.getMedicalCardList(getMedicalCardListRequest);
+        Result result = getMedicalCardListResponse.getResult();
+
+        int total = 0;
+        List<QueryListCardResponseData> lst = new LinkedList<>();
+        if (result.getCode() == ResultCode.SUCCEED) {
+            total = Checker.getIntegerValue(getMedicalCardListResponse.getMedicalCardsList().size());
+            for (MedicalCard medicalCard : getMedicalCardListResponse.getMedicalCardsList()) {
+                double balance = medicalCard.getBalance() / 100d;
+                QueryListCardResponseData item = new QueryListCardResponseData();
+                item.setCardNum(medicalCard.getCardNo());//就诊卡卡号/医保卡卡号
+                String cardType = medicalCard.getCardType();
+                item.setType(1);//标记查询卡类型
+                item.setName(medicalCard.getPatientName());//姓名
+                item.setSex(SexEnum.getSexDisplayName(medicalCard.getSex()));//性别
+                item.setBirthDay(medicalCard.getBirthday());//生日
+                item.setIdCardNo(medicalCard.getIdNo());//身份证号码
+                item.setPhoneNumber(medicalCard.getMobile());//手机号
+                item.setBalance(balance + "");//卡内余额
+                item.setIsDefault(medicalCard.getIsDefault());//是否是默认就诊卡
+                item.setCity("");//如果是医保卡，传参保城市
+                item.setCardOrgName("");//如果是医保卡，传发卡机构
+                lst.add(item);
+            }
+        }
+        Pagination pagination = new Pagination(1, 1, total);
+        PageVO<QueryListCardResponseData> res = new PageVO<>(pagination, lst);
+        return res;
     }
 
     @Override
-    public DeleteCardResponseData deleteMedicCard(DeleteCardRequest request) {
-        return null;
+    public DeleteCardResponseData deleteMedicCard(DeleteCardRequest request) throws Exception {
+        // 此处传诊疗卡ID和userId
+        String cardNum = request.getCardNum();
+        if (Checker.isNone(cardNum)) {
+            throw new AppMessageException("诊疗卡不存在");
+        }
+        int cardId = Integer.parseInt(cardNum);
+        int userId = ContextHelper.getCurrentUserIdWrapped();
+        if (cardId < 1) {
+            throw new AppMessageException("诊疗卡不存在");
+        }
+        DeleteCardResponseData responseData = new DeleteCardResponseData();
+        DeleteMedicalCardRequest deleteMedicalCardRequest = DeleteMedicalCardRequest.newBuilder()
+                .setCardId(cardId)
+                .setUserId(userId)
+                .build();
+        Result result = userServiceBlockingStub.deleteMedicalCard(deleteMedicalCardRequest);
+
+        if (result.getCode() == ResultCode.SUCCEED) {
+            responseData.setIsSuccess(true);
+        }
+        responseData.setIsSuccess(false);
+        return responseData;
     }
 
     @Override
-    public BindMedInsuranceCardResponseData bindMedInsuranceCard(BindMedInsuranceCardRequest request) {
-        return null;
+    public BindMedInsuranceCardResponseData bindMedInsuranceCard(BindMedInsuranceCardRequest request) throws Exception {
+        BindMedInsuranceCardResponseData resp = new BindMedInsuranceCardResponseData();
+        String appId = request.getAppId();//医院小程序的AppId
+//        String userId = request.getUserId();//用户唯一id
+        String patientName = request.getName();//姓名
+        String sex = request.getSex();//性别
+        String birthDay = request.getBirthDay();//生日
+        String idCardNo = request.getIdCardNo();//身份证号码
+        String phoneNo = request.getPhoneNumber();//手机号
+        String cardNum = request.getMedInsuranceNum();//医保卡识别号
+
+        int hospitalId = authService.getHospitalIdByAppId(appId);
+        int userId = ContextHelper.getCurrentUserIdWrapped();
+        if (hospitalId < 1) {
+            throw new AppMessageException("请选择医院");
+        }
+        if (StringHelper.isNullOrWhiteSpace(cardNum)) {
+            throw new AppMessageException("请填写就诊卡号");
+        }
+        if (StringHelper.isNullOrWhiteSpace(patientName)) {
+            throw new AppMessageException("请填写真实的姓名");
+        }
+        if (StringHelper.isNullOrWhiteSpace(phoneNo)) {
+            throw new AppMessageException("请填写在医院预留的手机号");
+        }
+
+        // 通过枚举类的方法，将文字转换成数字
+        int relationshipInt = 0;
+        // defaultCardInt: 1-是，0-否
+        int defaultCardInt = 0;
+        AddMedicalCardRequest addMedicalCardRequest = AddMedicalCardRequest.newBuilder()
+                .setUserId(userId)
+                .setHospitalId(hospitalId)
+                .setCardNo(cardNum)
+                .setRealName(patientName)
+                .setMobile(phoneNo)
+                .setRelationship(relationshipInt)
+                .setDefaultCard(defaultCardInt)
+                .build();
+        ResultInt resultInt = userServiceBlockingStub.addMedicalCard(addMedicalCardRequest);
+        if (resultInt.getCode() == ResultCode.SUCCEED) {
+            resp.setUserId(request.getUserId());
+            resp.setCardNum(request.getMedInsuranceNum());
+            resp.setName(patientName);
+            resp.setSex(sex);
+            resp.setBirthDay(birthDay);
+            resp.setIdCardNo(idCardNo);
+            resp.setPhoneNumber(phoneNo);
+        } else {
+            throw new AppMessageException(resultInt.getInfo());
+        }
+        return resp;
     }
 
     @Override
-    public List<QueryPatientListResponse> queryPatientList(QueryPatientListRequest request) {
+    public List<QueryPatientListResponse> queryPatientList(QueryPatientListRequest request) throws Exception {
         return null;
     }
 
     @Override
-    public PatientBindCardResponse bindMedicCard(PatientBindCardRequest request) {
+    public PatientBindCardResponse bindMedicCard(PatientBindCardRequest request) throws Exception {
+
         return null;
     }
 
     @Override
-    public DeletePatientResponse deletePatient(DeletePatientRequest request) {
+    public DeletePatientResponse deletePatient(DeletePatientRequest request) throws Exception {
         return null;
     }
 
     @Override
-    public AddPatientResponse addPatient(AddPatientRequest request) {
+    public AddPatientResponse addPatient(AddPatientRequest request) throws Exception {
         return null;
     }
 
     @Override
-    public UpdatePatientResponse updatePatient(UpdatePatientRequest request) {
+    public UpdatePatientResponse updatePatient(UpdatePatientRequest request) throws Exception {
         return null;
     }
 
     @Override
-    public QueryPatientDetailResponse querySinglePatient(QueryPatientDetailRequest request) {
+    public QueryPatientDetailResponse querySinglePatient(QueryPatientDetailRequest request) throws Exception {
         return null;
     }
 
     @Override
-    public List<MyCardListResponse> myCardList(MyCardListRequest request) {
+    public List<MyCardListResponse> myCardList(MyCardListRequest request) throws Exception {
         return null;
     }
 }

onemini-hospital-empty/src/main/java/com/ywt/gapi/user/MedicalCard.java

@@ -46,6 +46,8 @@ public  final class MedicalCard extends
     lastChoice_ = 0;
     freeMedicalTreat_ = false;
     lastChosenTime_ = 0L;
+    isDefault_ = false;
+    relationship_ = 0;
   }
 
   @java.lang.Override
@@ -226,6 +228,16 @@ public  final class MedicalCard extends
             lastChosenTime_ = input.readInt64();
             break;
           }
+          case 224: {
+
+            isDefault_ = input.readBool();
+            break;
+          }
+          case 232: {
+
+            relationship_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -994,6 +1006,32 @@ public  final class MedicalCard extends
     return lastChosenTime_;
   }
 
+  public static final int ISDEFAULT_FIELD_NUMBER = 28;
+  private boolean isDefault_;
+  /**
+   * <pre>
+   * 是否是默认诊疗卡
+   * </pre>
+   *
+   * <code>bool isDefault = 28;</code>
+   */
+  public boolean getIsDefault() {
+    return isDefault_;
+  }
+
+  public static final int RELATIONSHIP_FIELD_NUMBER = 29;
+  private int relationship_;
+  /**
+   * <pre>
+   * 与本人关系
+   * </pre>
+   *
+   * <code>int32 relationship = 29;</code>
+   */
+  public int getRelationship() {
+    return relationship_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -1087,6 +1125,12 @@ public  final class MedicalCard extends
     if (lastChosenTime_ != 0L) {
       output.writeInt64(27, lastChosenTime_);
     }
+    if (isDefault_ != false) {
+      output.writeBool(28, isDefault_);
+    }
+    if (relationship_ != 0) {
+      output.writeInt32(29, relationship_);
+    }
   }
 
   public int getSerializedSize() {
@@ -1184,6 +1228,14 @@ public  final class MedicalCard extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(27, lastChosenTime_);
     }
+    if (isDefault_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(28, isDefault_);
+    }
+    if (relationship_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeInt32Size(29, relationship_);
+    }
     memoizedSize = size;
     return size;
   }
@@ -1254,6 +1306,10 @@ public  final class MedicalCard extends
         == other.getFreeMedicalTreat());
     result = result && (getLastChosenTime()
         == other.getLastChosenTime());
+    result = result && (getIsDefault()
+        == other.getIsDefault());
+    result = result && (getRelationship()
+        == other.getRelationship());
     return result;
   }
 
@@ -1320,6 +1376,11 @@ public  final class MedicalCard extends
     hash = (37 * hash) + LASTCHOSENTIME_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getLastChosenTime());
+    hash = (37 * hash) + ISDEFAULT_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getIsDefault());
+    hash = (37 * hash) + RELATIONSHIP_FIELD_NUMBER;
+    hash = (53 * hash) + getRelationship();
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1507,6 +1568,10 @@ public  final class MedicalCard extends
 
       lastChosenTime_ = 0L;
 
+      isDefault_ = false;
+
+      relationship_ = 0;
+
       return this;
     }
 
@@ -1556,6 +1621,8 @@ public  final class MedicalCard extends
       result.lastChoice_ = lastChoice_;
       result.freeMedicalTreat_ = freeMedicalTreat_;
       result.lastChosenTime_ = lastChosenTime_;
+      result.isDefault_ = isDefault_;
+      result.relationship_ = relationship_;
       onBuilt();
       return result;
     }
@@ -1696,6 +1763,12 @@ public  final class MedicalCard extends
       if (other.getLastChosenTime() != 0L) {
         setLastChosenTime(other.getLastChosenTime());
       }
+      if (other.getIsDefault() != false) {
+        setIsDefault(other.getIsDefault());
+      }
+      if (other.getRelationship() != 0) {
+        setRelationship(other.getRelationship());
+      }
       onChanged();
       return this;
     }
@@ -3341,6 +3414,82 @@ public  final class MedicalCard extends
       onChanged();
       return this;
     }
+
+    private boolean isDefault_ ;
+    /**
+     * <pre>
+     * 是否是默认诊疗卡
+     * </pre>
+     *
+     * <code>bool isDefault = 28;</code>
+     */
+    public boolean getIsDefault() {
+      return isDefault_;
+    }
+    /**
+     * <pre>
+     * 是否是默认诊疗卡
+     * </pre>
+     *
+     * <code>bool isDefault = 28;</code>
+     */
+    public Builder setIsDefault(boolean value) {
+      
+      isDefault_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 是否是默认诊疗卡
+     * </pre>
+     *
+     * <code>bool isDefault = 28;</code>
+     */
+    public Builder clearIsDefault() {
+      
+      isDefault_ = false;
+      onChanged();
+      return this;
+    }
+
+    private int relationship_ ;
+    /**
+     * <pre>
+     * 与本人关系
+     * </pre>
+     *
+     * <code>int32 relationship = 29;</code>
+     */
+    public int getRelationship() {
+      return relationship_;
+    }
+    /**
+     * <pre>
+     * 与本人关系
+     * </pre>
+     *
+     * <code>int32 relationship = 29;</code>
+     */
+    public Builder setRelationship(int value) {
+      
+      relationship_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * 与本人关系
+     * </pre>
+     *
+     * <code>int32 relationship = 29;</code>
+     */
+    public Builder clearRelationship() {
+      
+      relationship_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return this;

onemini-hospital-empty/src/main/java/com/ywt/gapi/user/MedicalCardOrBuilder.java

@@ -283,4 +283,22 @@ public interface MedicalCardOrBuilder extends
    * <code>int64 lastChosenTime = 27;</code>
    */
   long getLastChosenTime();
+
+  /**
+   * <pre>
+   * 是否是默认诊疗卡
+   * </pre>
+   *
+   * <code>bool isDefault = 28;</code>
+   */
+  boolean getIsDefault();
+
+  /**
+   * <pre>
+   * 与本人关系
+   * </pre>
+   *
+   * <code>int32 relationship = 29;</code>
+   */
+  int getRelationship();
 }

onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/MedicCardController.java

@@ -45,7 +45,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.medicCard.update")
-    public ResponseVO<UpdateCardResponseData> updateMedicCard(UpdateCardRequest request) {
+    public ResponseVO<UpdateCardResponseData> updateMedicCard(UpdateCardRequest request) throws Exception{
         return ResponseVO.success(medicCardService.updateMedicCard(request));
     }
 
@@ -68,7 +68,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.medicCard.defaultCard")
-    public ResponseVO<QueryDefaultCardResponseData> defaultCard(QueryDefaultCardRequest request) {
+    public ResponseVO<QueryDefaultCardResponseData> defaultCard(QueryDefaultCardRequest request) throws Exception {
         return ResponseVO.success(medicCardService.queryDefaultMedicCard(request));
     }
 
@@ -79,7 +79,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("miniProRequest.medicCard.myCard")
-    public ResponseVO<QueryDefaultCardResponseData> myCard(QueryDefaultCardRequest request) {
+    public ResponseVO<QueryDefaultCardResponseData> myCard(QueryDefaultCardRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.queryDefaultMedicCard(request));
     }
@@ -91,7 +91,7 @@ public class MedicCardController {
      * @return
      */
     @RequestMapping("isvRequest.medicCard.queryList")
-    public ResponseVO<PageVO<QueryListCardResponseData>> queryList(QueryListCardRequest request) {
+    public ResponseVO<PageVO<QueryListCardResponseData>> queryList(QueryListCardRequest request) throws Exception {
 
         log.info("request is {}", request);
 
@@ -108,7 +108,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.medicCard.delete")
-    public ResponseVO<DeleteCardResponseData> delete(DeleteCardRequest request) {
+    public ResponseVO<DeleteCardResponseData> delete(DeleteCardRequest request) throws Exception {
 
         if (StringUtils.isBlank(request.getCardNum())) {
             return ResponseVO.fail(500, "就诊卡卡号为空");
@@ -122,7 +122,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.queryList")
-    public ResponseVO<List<QueryPatientListResponse>> queryPatientList(QueryPatientListRequest request) {
+    public ResponseVO<List<QueryPatientListResponse>> queryPatientList(QueryPatientListRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.queryPatientList(request));
     }
@@ -133,7 +133,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.bindMedicCard")
-    public ResponseVO<PatientBindCardResponse> bindMedicCard(PatientBindCardRequest request) {
+    public ResponseVO<PatientBindCardResponse> bindMedicCard(PatientBindCardRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.bindMedicCard(request));
     }
@@ -144,7 +144,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.delete")
-    public ResponseVO<DeletePatientResponse> deletePatient(DeletePatientRequest request) {
+    public ResponseVO<DeletePatientResponse> deletePatient(DeletePatientRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.deletePatient(request));
     }
@@ -155,7 +155,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.add")
-    public ResponseVO<AddPatientResponse> addPatient(AddPatientRequest request) {
+    public ResponseVO<AddPatientResponse> addPatient(AddPatientRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.addPatient(request));
     }
@@ -166,7 +166,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.update")
-    public ResponseVO<UpdatePatientResponse> updatePatient(UpdatePatientRequest request) {
+    public ResponseVO<UpdatePatientResponse> updatePatient(UpdatePatientRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.updatePatient(request));
     }
@@ -177,7 +177,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.querySingle")
-    public ResponseVO<QueryPatientDetailResponse> querySinglePatient(QueryPatientDetailRequest request) {
+    public ResponseVO<QueryPatientDetailResponse> querySinglePatient(QueryPatientDetailRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.querySinglePatient(request));
     }
@@ -188,7 +188,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.medicCard.myCardList")
-    public ResponseVO<List<MyCardListResponse>> myCardList(MyCardListRequest request) {
+    public ResponseVO<List<MyCardListResponse>> myCardList(MyCardListRequest request) throws Exception {
 
         return ResponseVO.success(medicCardService.myCardList(request));
     }

onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvMedicCardService.java

@@ -27,7 +27,7 @@ public interface IsvMedicCardService {
      * @param request 就诊卡需要更新的信息, cardNum必填
      * @return 更新后的结果
      **/
-    UpdateCardResponseData updateMedicCard(UpdateCardRequest request);
+    UpdateCardResponseData updateMedicCard(UpdateCardRequest request) throws Exception;
 
     /**
      * 单卡查询
@@ -43,7 +43,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return 查询结果
      **/
-    QueryDefaultCardResponseData queryDefaultMedicCard(QueryDefaultCardRequest request);
+    QueryDefaultCardResponseData queryDefaultMedicCard(QueryDefaultCardRequest request) throws Exception;
 
     /**
      * 就诊卡列表查询
@@ -51,7 +51,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return 查询结果
      **/
-    PageVO<QueryListCardResponseData> queryListMedicCard(QueryListCardRequest request);
+    PageVO<QueryListCardResponseData> queryListMedicCard(QueryListCardRequest request) throws Exception;
 
     /**
      * 删除就诊卡
@@ -59,7 +59,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return 删除结果
      **/
-    DeleteCardResponseData deleteMedicCard(DeleteCardRequest request);
+    DeleteCardResponseData deleteMedicCard(DeleteCardRequest request) throws Exception;
 
     /**
      * 医保卡绑定
@@ -67,7 +67,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return 绑定结果
      **/
-    BindMedInsuranceCardResponseData bindMedInsuranceCard(BindMedInsuranceCardRequest request);
+    BindMedInsuranceCardResponseData bindMedInsuranceCard(BindMedInsuranceCardRequest request) throws Exception;
 
     /**
      * 就诊人列表查询
@@ -75,7 +75,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      **/
-    List<QueryPatientListResponse> queryPatientList(QueryPatientListRequest request);
+    List<QueryPatientListResponse> queryPatientList(QueryPatientListRequest request) throws Exception;
 
     /**
      * 就诊人绑定就诊卡
@@ -83,7 +83,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    PatientBindCardResponse bindMedicCard(PatientBindCardRequest request);
+    PatientBindCardResponse bindMedicCard(PatientBindCardRequest request) throws Exception;
 
     /**
      * 删除就诊人
@@ -91,7 +91,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    DeletePatientResponse deletePatient(DeletePatientRequest request);
+    DeletePatientResponse deletePatient(DeletePatientRequest request) throws Exception;
 
     /**
      * 添加就诊人
@@ -99,7 +99,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    AddPatientResponse addPatient(AddPatientRequest request);
+    AddPatientResponse addPatient(AddPatientRequest request) throws Exception;
 
     /**
      * 编辑就诊人
@@ -107,7 +107,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    UpdatePatientResponse updatePatient(UpdatePatientRequest request);
+    UpdatePatientResponse updatePatient(UpdatePatientRequest request) throws Exception;
 
     /**
      * 查询就诊人详情
@@ -115,7 +115,7 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    QueryPatientDetailResponse querySinglePatient(QueryPatientDetailRequest request);
+    QueryPatientDetailResponse querySinglePatient(QueryPatientDetailRequest request) throws Exception;
 
     /**
      * 查询登录用户就诊卡列表
@@ -123,5 +123,5 @@ public interface IsvMedicCardService {
      * @param request
      * @return
      */
-    List<MyCardListResponse> myCardList(MyCardListRequest request);
+    List<MyCardListResponse> myCardList(MyCardListRequest request) throws Exception;
 }