feat: 删除就诊卡

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

@@ -205,6 +205,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         return null;
     }
 
+    // 我的证件
     @Override
     public QueryDefaultCardResponseData queryDefaultMedicCard(QueryDefaultCardRequest request) throws Exception {
         int hospitalId = BizUtil.getCurrentHospitalId();
@@ -276,29 +277,20 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         return res;
     }
 
+    // 删除就诊卡
     @Override
     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 cardId = Checker.parseInt(request.getCardId());
+        CheckUtil.ensureLargerThanZero(cardId, "诊疗卡 id 不正确");
         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);
+        responseData.setIsSuccess(result.getCode() == ResultCode.SUCCEED);
+        responseData.setInfo(result.getInfo());
         return responseData;
     }
 

onemini-hospital-sdk/src/main/java/com/ywt/request/card/DeleteCardRequest.java

@@ -20,6 +20,7 @@ public class DeleteCardRequest implements IsvRequest<DeleteCardResponseData>, IA
     private String userId;//用户唯一id
     private String cardNum;//就诊卡卡号
     private String reason;//删卡原因
+    private String cardId; // 诊疗卡 id
 
     @Override
     public String serviceName() {

onemini-hospital-sdk/src/main/java/com/ywt/response/card/DeleteCardResponseData.java

@@ -13,5 +13,6 @@ import lombok.ToString;
 public class DeleteCardResponseData implements IsvResponseData {
 
     private Boolean isSuccess;
+    private String info;
 
 }