feature: 住院人list, 押金缴纳记录，押金缴纳详情

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/models/vo/MedicalCardVo.java

@@ -8,6 +8,10 @@ public class MedicalCardVo {
 
     private int sex;
 
+    private String cardNum;
+
+
+
     public String getPatientName() {
         return patientName;
     }
@@ -31,4 +35,12 @@ public class MedicalCardVo {
     public void setSex(int sex) {
         this.sex = sex;
     }
+
+    public String getCardNum() {
+        return cardNum;
+    }
+
+    public void setCardNum(String cardNum) {
+        this.cardNum = cardNum;
+    }
 }

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

@@ -50,8 +50,8 @@ public class IsvReportServiceImpl implements IsvReportService {
         try {
             int userId = ContextHelper.getCurrentUserIdWrapped();
             int hospitalId = BizUtil.getCurrentHospitalId();
-            String cardNum = request.getCardNum();
-            MedicalCardVo card = getCard(userId, hospitalId, cardNum);
+            String hisPatientId = request.getHisPatientId();
+            MedicalCardVo card = getCard(userId, hospitalId, hisPatientId);
             String type = request.getType();
             if ("检查报告".equals(type)) {
 
@@ -66,7 +66,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                     data.setRecordId(request.getRecordId());
                     data.setUserName(card.getPatientName());
                     data.setUserSex(card.getSex() == 1 ? "男" : "女");
-                    data.setCardNum(cardNum);
+                    data.setCardNum(Checker.getStringValue(card.getCardNum()));
                     data.setDepartmentName(detail.getDeptName());
                     data.setApplyDoctorName(detail.getDoctorName());
                     reportItem.add(detail.getDiagnose());
@@ -87,10 +87,11 @@ public class IsvReportServiceImpl implements IsvReportService {
                 if (res.getCode() == ResultCode.SUCCEED_VALUE) {
                     List<ReportItem> reportItemList = new ArrayList<>();
                     List<String> reportItem = new ArrayList<>();
-
+                    data.setUserName(card.getPatientName());
                     data.setItemName(res.getTitle());
                     data.setReportDate(res.getTime());
                     data.setConfirmDoctorName(res.getDoctor());
+                    data.setCardNum(Checker.getStringValue(card.getCardNum()));
                     for (LaboratoryDetail detail : res.getDetailList()) {
                         ReportItem r = new ReportItem();
                         r.setItemName(detail.getItemName());
@@ -114,9 +115,8 @@ public class IsvReportServiceImpl implements IsvReportService {
 
     @Override
     public PageVO<QueryReportListResponseData> queryReportList(QueryReportListRequest request) {
-         List<QueryReportListResponseData> list = new ArrayList<>();
+        List<QueryReportListResponseData> list = new ArrayList<>();
         int userId = ContextHelper.getCurrentUserIdWrapped();
-        String cardNum = request.getCardNum();
         // 报告类型：分为"检查报告"、"检验报告"两种
         String type = request.getType();
         int hospitalId = BizUtil.getCurrentHospitalId();
@@ -137,9 +137,10 @@ public class IsvReportServiceImpl implements IsvReportService {
                     total = res.getInspectionReportList().size();
                     for (InspectionReport q : res.getInspectionReportList()) {
                         QueryReportListResponseData da = new QueryReportListResponseData();
-                        da.setCardNum(cardNum);
                         da.setItemName(Checker.getStringValue(q.getReportTitle()));
                         da.setRecordId(Checker.getStringValue(q.getReportId()));
+                        da.setUserName(card.getPatientName());
+                        da.setCardNum(card.getCardNum());
                         list.add(da);
                     }
                 }
@@ -155,10 +156,11 @@ public class IsvReportServiceImpl implements IsvReportService {
                     total = thRes.getReportList().size();
                     for (LaboratoryReport q : thRes.getReportList()) {
                         QueryReportListResponseData da = new QueryReportListResponseData();
-                        da.setCardNum(cardNum);
                         da.setItemName(Checker.getStringValue(q.getReportTitle()));
                         da.setDepartmentName(Checker.getStringValue(q.getDeptName()));
                         da.setRecordId(Checker.getStringValue(q.getReportId()));
+                        da.setUserName(card.getPatientName());
+                        da.setCardNum(card.getCardNum());
                         list.add(da);
                     }
                 }
@@ -189,12 +191,13 @@ public class IsvReportServiceImpl implements IsvReportService {
     public MedicalCardVo getCard(int userId, int hospitalId, String hisPatientId) throws Exception {
         List<MedicalCard> list = getUserMedCardList(userId, hospitalId);
         if (Checker.isNone(list)) throw new AppMessageException("没有诊疗卡");
-        for(MedicalCard card: list){
-            if(hisPatientId.equals(card.getPatientId())){
+        for (MedicalCard card : list) {
+            if (hisPatientId.equals(card.getPatientId())) {
                 MedicalCardVo v = new MedicalCardVo();
                 v.setSex(card.getSex());
                 v.setHisPatientId(card.getPatientId());
                 v.setPatientName(card.getPatientName());
+                v.setCardNum(card.getCardNo());
                 return v;
             }
         }

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

@@ -217,14 +217,15 @@ public class InpatientController {
      */
     @PostMapping("isvRequest.deposit.details")
     public ResponseVO<DepositTradeDetailsResponseData> queryDepositTradeDetails(DepositTradeDetailsRequest request) throws Exception {
-        try {
-            return ResponseVO.success(inpatientService.queryTradeDetails(request));
-        } catch (AppMessageException e) {
-            return ResponseVO.fail(BaseResponse.APP_ERROR, e.getMessage());
-        } catch (Exception e) {
-            log.error("InpatientController#deposit.details\"(request = {}):\n {}", request, e.getMessage(), e);
-            return ResponseVO.fail(BaseResponse.APP_EXCEPTION, e.getMessage());
-        }
+       try{
+
+           return ResponseVO.success(inpatientService.queryTradeDetails(request));
+       }catch (AppMessageException e) {
+           return ResponseVO.fail(BaseResponse.APP_ERROR, e.getMessage());
+       } catch (Exception e) {
+           log.error("InpatientController#deposit.details\"(request = {}):\n {}", request, e.getMessage(), e);
+           return ResponseVO.fail(BaseResponse.APP_EXCEPTION, e.getMessage());
+       }
 
     }
 

onemini-hospital-sdk/src/main/java/com/ywt/request/report/QueryReportDetailRequest.java

@@ -20,7 +20,7 @@ public class QueryReportDetailRequest implements IsvRequest<QueryReportDetailRes
     private String userId;//用户唯一id
     private String recordId;//检查流水号
     private String type;//报告类型
-    private String cardNum;//就诊卡卡号
+    private String hisPatientId;
 
     @Override
     public String serviceName() {