增加费用预交，已用，剩余显示

android_bed/src/main/h5_3128/java/com/wdkl/app/ncs/callingbed/fragment/CostFragment2.kt

@@ -1,5 +1,6 @@
 package com.wdkl.app.ncs.callingbed.fragment
 
+import android.graphics.Color
 import android.support.v7.widget.LinearLayoutManager
 import android.util.Log
 import com.enation.javashop.net.engine.model.NetState
@@ -25,7 +26,7 @@ import org.greenrobot.eventbus.ThreadMode
 class CostFragment2 : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(), CostFragmentContract.View {
 
     private var pageNo = 1
-    private val pageSize = 2
+    private val pageSize = 1
     private lateinit var adapter: CostItemAdapter2
     private var totalSize = 0
 
@@ -48,6 +49,13 @@ class CostFragment2 : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(),
         } else {
             showMessage("no custom id")
         }
+
+        tv_advance_fees.text = "预交: " + Constant.advanceFeePay
+        tv_used_fees.text = "已用: " + Constant.usedFee
+        tv_remain_fees.text = "剩余: " + Constant.remainFee
+        if (Constant.remainFee < 0) {
+            tv_remain_fees.setTextColor(Color.RED)
+        }
     }
 
     override fun onStart() {

android_bed/src/main/h5_3128/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -100,6 +100,18 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             ll_nurse_view.visibility = View.GONE
         }
 
+        if (customInfo.advanceFeePay != null) {
+            Constant.advanceFeePay = customInfo.advanceFeePay
+        }
+
+        if (customInfo.usedFee != null) {
+            Constant.usedFee = customInfo.usedFee
+        }
+
+        if (customInfo.remainFee != null) {
+            Constant.remainFee = customInfo.remainFee
+        }
+
         tv_doctor_name.text = customInfo.doctorName
         tv_nurse_name.text = customInfo.nurseName
 

android_bed/src/main/h5_3128/res/layout/cost_view_lay.xml

@@ -6,37 +6,76 @@
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/ll_fees"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp">
+            <TextView
+                android:id="@+id/tv_advance_fees"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:textColor="#000000"
+                android:textSize="32sp"
+                android:text="预交:"/>
+
+            <TextView
+                android:id="@+id/tv_used_fees"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:textColor="#000000"
+                android:textSize="32sp"
+                android:text="已用:"/>
+
+            <TextView
+                android:id="@+id/tv_remain_fees"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:textColor="#000000"
+                android:textSize="32sp"
+                android:text="剩余:"/>
+        </LinearLayout>
+
+        <LinearLayout
             android:id="@+id/ll_fee_bars"
             android:layout_width="40dp"
             android:layout_height="match_parent"
+            android:layout_below="@id/ll_fees"
             android:layout_alignParentRight="true"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_fees_page"
-                android:layout_width="match_parent"
-                android:layout_height="24dp"
-                android:gravity="center"
-                android:textColor="#000000"
-                android:textSize="20sp" />
-
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="160dp"
+                android:layout_height="120dp"
                 android:src="@drawable/ic_arrow_up"/>
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="220dp"
+                android:layout_height="210dp"
                 android:src="@drawable/ic_arrow_down"/>
 
+            <TextView
+                android:id="@+id/tv_fees_page"
+                android:layout_width="match_parent"
+                android:layout_height="24dp"
+                android:gravity="center"
+                android:textColor="#000000"
+                android:textSize="20sp" />
         </LinearLayout>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_cost_main_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="6dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:layout_below="@id/ll_fees"
             android:layout_toLeftOf="@id/ll_fee_bars" />
 
     </RelativeLayout>

android_bed/src/main/h5_3128/res/layout/item_cost_detail2.xml

@@ -2,7 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="200dp"
+    android:layout_height="360dp"
     android:paddingLeft="20dp"
     android:paddingRight="20dp"
     android:layout_marginBottom="10dp"
@@ -12,7 +12,8 @@
         android:id="@+id/tv_item_fee_group_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="24sp"
+        android:layout_marginTop="10dp"
+        android:textSize="28sp"
         android:textColor="@color/main_color"/>
 
     <!--费用时间-->
@@ -20,8 +21,9 @@
         android:id="@+id/tv_item_fee_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:layout_alignParentRight="true"
-        android:textSize="20sp"
+        android:textSize="22sp"
         android:textColor="#A4A4A4"/>
 
     <!--费用名称-->
@@ -29,9 +31,9 @@
         android:id="@+id/tv_item_fee_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_below="@id/tv_item_fee_group_name"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <!--用量-->
@@ -39,70 +41,70 @@
         android:id="@+id/tv_item_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_alignParentRight="true"
         android:layout_below="@id/tv_item_fee_group_name"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <!--费用单价-->
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_below="@id/tv_item_fee_name"
         android:text="@string/fee_price"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <TextView
         android:id="@+id/tv_item_fee_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_alignParentRight="true"
         android:layout_below="@id/tv_item_fee_name"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <!--费用小计-->
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_below="@id/tv_item_fee_price"
         android:text="@string/subtotal"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <TextView
         android:id="@+id/tv_item_fee_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_alignParentRight="true"
         android:layout_below="@id/tv_item_fee_price"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <!--费用类型-->
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_below="@id/tv_item_fee_value"
         android:text="@string/fee_type"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <TextView
         android:id="@+id/tv_item_fee_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
         android:layout_alignParentRight="true"
         android:layout_below="@id/tv_item_fee_value"
-        android:textSize="20sp"
+        android:textSize="24sp"
         android:textColor="@color/black"/>
 
     <!--费用说明-->
@@ -111,8 +113,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/tv_item_fee_type"
-        android:layout_marginTop="4dp"
-        android:textSize="20sp"
+        android:layout_marginTop="10dp"
+        android:textSize="24sp"
         android:textColor="#A4A4A4"/>
 
 </RelativeLayout>

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -150,6 +150,10 @@ public class Constant {
     public static String nurseTitle = "责任护士";
     public static Integer nurseValid = 1;
 
+    public static Double advanceFeePay = 0.0;
+    public static Double usedFee = 0.0;
+    public static Double remainFee = 0.0;
+
     public static boolean yunpai_plugin = false;
 
     //分机呼叫超时时间,默认30s

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/CustomerInfoVO.java

@@ -42,6 +42,10 @@ public class CustomerInfoVO implements Serializable {
     @Column(name = "named")
     @ApiModelProperty(name = "病人的名字")
     private String named;
+
+    @ApiModelProperty(name = "手机号")
+    private String mobile;
+
     /**
      * 病人的年龄
      */
@@ -108,19 +112,41 @@ public class CustomerInfoVO implements Serializable {
     @ApiModelProperty(value="医嘱",required=false)
     private String advice;
 
-    private Integer sex;
+    /**
+     * 经纬度
+     */
+    @Column(name = "lng_lat")
+    @ApiModelProperty(value = "经纬度", required = false)
+    private String lngLat;
 
-    private String roleName;
+    /**
+     * 预交费用
+     */
+    @Column(name = "advance_fee_pay")
+    @ApiModelProperty(value = "预交费用", required = false)
+    private Double advanceFeePay;
 
-    private String nurseConfigName;
+    /**
+     * 已使用费用
+     */
+    @Column(name = "used_fee")
+    @ApiModelProperty(value = "已使用费用", required = false)
+    private Double usedFee;
+
+    /**
+     * 剩余费用，负数为欠费
+     */
+    @Column(name = "remain_fee")
+    @ApiModelProperty(value = "剩余费用，负数为欠费", required = false)
+    private Double remainFee;
 
-    private String examinationGroupName;
+    private Integer sex;
 
-    private String examinationKeyName;
+    private Long birthday;
 
-    private String feeGroupName;
+    private String roleName;
 
-    private String feeKeyName;
+    private String nurseConfigName;
 
     private Integer doctorMappingId;
 
@@ -140,6 +166,24 @@ public class CustomerInfoVO implements Serializable {
 
     private String workerName;
 
+    private String doctorFace;
+
+    private String nurseFace;
+
+    private String workerFace;
+
+    private String face;
+
+    private String address;
+
+    private String frameName;
+
+    private String frameAlias;
+
+    private String nickname;
+
+    private String uuid;
+
     private List<NurseConfigDto> list;
 
     public Integer getId() {
@@ -246,6 +290,14 @@ public class CustomerInfoVO implements Serializable {
         this.sex = sex;
     }
 
+    public Long getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Long birthday) {
+        this.birthday = birthday;
+    }
+
     public Integer getFrameId() {
         return frameId;
     }
@@ -286,52 +338,44 @@ public class CustomerInfoVO implements Serializable {
         this.workerName = workerName;
     }
 
-    public String getRoleName() {
-        return roleName;
+    public String getDoctorFace() {
+        return doctorFace;
     }
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
+    public void setDoctorFace(String doctorFace) {
+        this.doctorFace = doctorFace;
     }
 
-    public String getNurseConfigName() {
-        return nurseConfigName;
+    public String getNurseFace() {
+        return nurseFace;
     }
 
-    public void setNurseConfigName(String nurseConfigName) {
-        this.nurseConfigName = nurseConfigName;
-    }
-
-    public String getExaminationGroupName() {
-        return examinationGroupName;
-    }
-
-    public void setExaminationGroupName(String examinationGroupName) {
-        this.examinationGroupName = examinationGroupName;
+    public void setNurseFace(String nurseFace) {
+        this.nurseFace = nurseFace;
     }
 
-    public String getExaminationKeyName() {
-        return examinationKeyName;
+    public String getWorkerFace() {
+        return workerFace;
     }
 
-    public void setExaminationKeyName(String examinationKeyName) {
-        this.examinationKeyName = examinationKeyName;
+    public void setWorkerFace(String workerFace) {
+        this.workerFace = workerFace;
     }
 
-    public String getFeeGroupName() {
-        return feeGroupName;
+    public String getRoleName() {
+        return roleName;
     }
 
-    public void setFeeGroupName(String feeGroupName) {
-        this.feeGroupName = feeGroupName;
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
 
-    public String getFeeKeyName() {
-        return feeKeyName;
+    public String getNurseConfigName() {
+        return nurseConfigName;
     }
 
-    public void setFeeKeyName(String feeKeyName) {
-        this.feeKeyName = feeKeyName;
+    public void setNurseConfigName(String nurseConfigName) {
+        this.nurseConfigName = nurseConfigName;
     }
 
     public Integer getDoctorMappingId() {
@@ -397,4 +441,92 @@ public class CustomerInfoVO implements Serializable {
     public void setMemberId(Integer memberId) {
         this.memberId = memberId;
     }
+
+    public String getFace() {
+        return face;
+    }
+
+    public void setFace(String face) {
+        this.face = face;
+    }
+
+    public String getFrameName() {
+        return frameName;
+    }
+
+    public void setFrameName(String frameName) {
+        this.frameName = frameName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getLngLat() {
+        return lngLat;
+    }
+
+    public void setLngLat(String lngLat) {
+        this.lngLat = lngLat;
+    }
+
+    public String getFrameAlias() {
+        return frameAlias;
+    }
+
+    public void setFrameAlias(String frameAlias) {
+        this.frameAlias = frameAlias;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public Double getAdvanceFeePay() {
+        return advanceFeePay;
+    }
+
+    public void setAdvanceFeePay(Double advanceFeePay) {
+        this.advanceFeePay = advanceFeePay;
+    }
+
+    public Double getUsedFee() {
+        return usedFee;
+    }
+
+    public void setUsedFee(Double usedFee) {
+        this.usedFee = usedFee;
+    }
+
+    public Double getRemainFee() {
+        return remainFee;
+    }
+
+    public void setRemainFee(Double remainFee) {
+        this.remainFee = remainFee;
+    }
 }