feature: 押金缴纳记录

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

@@ -204,7 +204,7 @@ public class InpatientServiceImpl implements InpatientService {
         GetInPatInfoResponse resp = taiheServiceBlockingStub.getInPatInfo(req);
         if (resp.getCode() == BaseResponse.SUCCEED) {
             String totalAmount = String.format("%.2f", Checker.getDoubleValue(resp.getTotalAmount() / 100d));
-            String depositBalance = String.format("%.2f",  Checker.getDoubleValue(resp.getDepositBalance() / 100d));
+            String depositBalance = String.format("%.2f", Checker.getDoubleValue(resp.getDepositBalance() / 100d));
             vo.setAdmNo(resp.getAdmNo());
             vo.setTotalAmount(totalAmount);
             vo.setDepositBalance(depositBalance);
@@ -332,7 +332,8 @@ public class InpatientServiceImpl implements InpatientService {
                 .setUserId(userId)
                 .setTerminal(ContextHelper.getCurrentTerminalWrapped())
                 .build());
-        if (response.getCode() != ResultCode.SUCCEED_VALUE) throw new AppMessageException("支付宝下单：" + response.getInfo());
+        if (response.getCode() != ResultCode.SUCCEED_VALUE)
+            throw new AppMessageException("支付宝下单：" + response.getInfo());
 
         DepositTradeResponseData data = new DepositTradeResponseData();
         data.setDepositId(String.valueOf(orderId));
@@ -370,10 +371,11 @@ public class InpatientServiceImpl implements InpatientService {
                 List<CashListItem> list = res.getListList();
                 DepositTradeListResponseData da = new DepositTradeListResponseData();
                 for (CashListItem i : list) {
+                    da = new DepositTradeListResponseData();
                     da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
                     da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
                     da.setOutTradeNo(i.getReceiptNo());
-                    da.setPayTime(i.getPayDate() + "" + i.getPayTime());
+                    da.setPayTime(i.getPayDate() + "," + i.getPayTime());
                     da.setTradeNo(Checker.getStringValue(""));
                     da.setDepositId(Checker.getStringValue(""));
                     String depositBalance = String.format("%.2f", resp.getDepositBalance() / 100d);
@@ -419,19 +421,19 @@ public class InpatientServiceImpl implements InpatientService {
                 DepositTradeDetailsResponseData da = new DepositTradeDetailsResponseData();
                 for (CashListItem i : list) {
                     if (request.getReceiptNo().equals(i.getReceiptNo())) {
-                        {
-                            da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
-                            da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
-                            da.setOutTradeNo(i.getReceiptNo());
-                            da.setPayTime(i.getPayDate() + "" + i.getPayTime());
-                            da.setTradeNo(Checker.getStringValue(""));
-                            da.setDepositId(Checker.getStringValue(""));
-                            String depositBalance = String.format("%.2f", resp.getDepositBalance() / 100d);
-                            da.setDepositBalance(depositBalance);
-                            da.setStatus(Checker.getStringValue(i.getPayFlag()));
-                            da.setInpatientNo(hisPatientId);
-                            return da;
-                        }
+                        da = new DepositTradeDetailsResponseData();
+                        da.setInpatientName(Checker.getStringValue(i.getPayUserName()));
+                        da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
+                        da.setOutTradeNo(i.getReceiptNo());
+                        da.setPayTime(i.getPayDate() + "" + i.getPayTime());
+                        da.setTradeNo(Checker.getStringValue(""));
+                        da.setDepositId(Checker.getStringValue(""));
+                        String depositBalance = String.format("%.2f", resp.getDepositBalance() / 100d);
+                        da.setDepositBalance(depositBalance);
+                        da.setStatus(Checker.getStringValue(i.getPayFlag()));
+                        da.setInpatientNo(hisPatientId);
+                        return da;
+
                     }
                 }
                 throw new AppMessageException("没有押金缴纳记录");
@@ -501,9 +503,10 @@ public class InpatientServiceImpl implements InpatientService {
 
         if (userId <= 0) {
             throw new AppMessageException("userId不能为空");
-        };
+        }
+        ;
         int hospId = BizUtil.getCurrentHospitalId();
-        if(Checker.isNone(request.getInpatientId())){
+        if (Checker.isNone(request.getInpatientId())) {
             throw new AppMessageException("hisPationId不能为空");
         }
         String hisPationId = Checker.getStringValue(request.getInpatientId());
@@ -517,7 +520,8 @@ public class InpatientServiceImpl implements InpatientService {
         InpatientDetailsResponseData data = new InpatientDetailsResponseData();
         if (result.getCode() == ResultCode.SUCCEED) {
             for (MedicalCard medicalCard : getMedicalCardListResponse.getMedicalCardsList()) {
-                if(medicalCard.getPatientId().equals(hisPationId)) {
+                if (medicalCard.getPatientId().equals(hisPationId)) {
+                    data = new InpatientDetailsResponseData();
                     data.setPatientId(hisPationId);
                     data.setInpatientId(hisPationId);
                     data.setInpatientName(medicalCard.getPatientName());