inpatientList增肌admNo

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

@@ -89,7 +89,7 @@ public class InpatientServiceImpl implements InpatientService {
     }
 
     @Override
-    public List<InpatientListResponseData> inpatientList(InpatientListRequest request) {
+    public List<InpatientListResponseData> inpatientList(InpatientListRequest request) throws Exception {
         int userId = Checker.parseInt(request.getUserId());
         List<InpatientListResponseData> list = new ArrayList<>();
         if (userId <= 0) return list; // 这个接口进入小程序首页就会调用；如果用户没有授权，返回空数据，而不是弹出获取用户信息授权（会违反小程序审核规则）；
@@ -111,6 +111,8 @@ public class InpatientServiceImpl implements InpatientService {
                 data.setSex(medicalCard.getSex() == 1 ? "男" : "女");
                 Date date = DateUtil.stringToDate(medicalCard.getBirthday(), DateUtil.DADE_FROMAT_YMD);
                 data.setInpatientAge(Integer.parseInt(getAgeFromMedicalCard(medicalCard)));
+                InpatientVo vo = getInpatientVo(userId, medicalCard.getPatientId());
+                data.setAdmNo(Checker.getStringValue(vo.getAdmNo()));
                 list.add(data);
             }
             return list;
@@ -193,8 +195,8 @@ public class InpatientServiceImpl implements InpatientService {
                 .build();
         GetInPatInfoResponse resp = taiheServiceBlockingStub.getInPatInfo(req);
         if (resp.getCode() == BaseResponse.SUCCEED) {
-            String totalAmount = String.format("%.2f", resp.getTotalAmount() / 100d);
-            String depositBalance = String.format("%.2f", resp.getDepositBalance() / 100d);
+            String totalAmount = String.format("%.2f", Checker.getDoubleValue(resp.getTotalAmount() / 100d));
+            String depositBalance = String.format("%.2f",  Checker.getDoubleValue(resp.getDepositBalance() / 100d));
             vo.setAdmNo(resp.getAdmNo());
             vo.setTotalAmount(totalAmount);
             vo.setDepositBalance(depositBalance);
@@ -329,6 +331,7 @@ public class InpatientServiceImpl implements InpatientService {
                     da.setDepositBalance(depositBalance);
                     da.setStatus(Checker.getStringValue(""));
                     da.setDepositId(Checker.getStringValue(i.getReceiptNo()));
+                    da.setAdmNo(Checker.getStringValue(admNo));
                     depositList.add(da);
                 }
                 return depositList;

onemini-hospital-sdk/src/main/java/com/ywt/response/inpatient/DailyBillDetailsResponseData.java

@@ -34,4 +34,5 @@ public class DailyBillDetailsResponseData implements IsvResponseData {
 
     private List<Item> payItemList;
 
+
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/inpatient/DailyBillResponseData.java

@@ -27,4 +27,5 @@ public class DailyBillResponseData implements IsvResponseData {
 
     private String depositBalance; //押金余额
 
+
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/inpatient/DepositTradeListResponseData.java

@@ -25,4 +25,5 @@ public class DepositTradeListResponseData implements IsvResponseData {
 
     private String status;//订单状态,WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款
 
+    private String admNo;
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/inpatient/InpatientListResponseData.java

@@ -37,4 +37,8 @@ public class InpatientListResponseData implements IsvResponseData {
 
     private String inpatientNo; //住院号
 
+    private String admNo;
+
+
+
 }