1.添加获取单个医生信息接口

healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/MedicalConsultationDetailBean.kt

@@ -17,7 +17,7 @@ data class MedicalConsultationDetailBean(
     val orgCode: String,
     val orgName: String,
     val payMethod: String,
-    val payOrder: String,
+    val payOrder: PayOrder,
     val price: String,
     val reason: String,
     val remark: String,
@@ -27,4 +27,29 @@ data class MedicalConsultationDetailBean(
     val sysUserName: String,
     val updateBy: String,
     val updateTime: String
+)
+
+data class PayOrder(
+    val attach: String,
+    val createBy: String,
+    val createTime: String,
+    val description: String,
+    val idval: String,
+    val orderType: String,
+    val payMethod: String,
+    val payMoneyval: String,
+    val payMoneyYUAN: String,
+    val payOrderId: String,
+    val payStatus: String,
+    val payStatusDesc: String,
+    val payTime: String,
+    val payer: String,
+    val relationIdval: String,
+    val remark: String,
+    val sendPayTime: String,
+    val transactionId: String,
+    val updateBy: String,
+    val updateTime: String,
+    val userIdval: String,
+    val userNameval: String,
 )

healthconsultation/src/main/java/com/yingyang/healthconsultation/paid/PaidActivity.kt

@@ -12,6 +12,7 @@ import com.yingyang.healthconsultation.adapter.ConsultationDataAdapter
 import com.yingyang.healthconsultation.databinding.ActivityPaidBinding
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
@@ -72,6 +73,10 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
                 imageList.clear()
                 if (it != null) {
                     binding.data = it
+                    if (it.payOrder != null) {
+                        binding.payOrder = it.payOrder
+                    }
+                    binding.orderLayout.show(it.payOrder != null)
                     doctorId = it.sysUserId
                     if (it.images.isNullOrEmpty().not()) {
                         val images = it.images.split(",")

healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordActivity.kt

@@ -17,7 +17,6 @@ import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.JumpUtil
 
 /**
  * 问诊记录

healthconsultation/src/main/res/layout/activity_paid.xml

@@ -10,6 +10,10 @@
             name="data"
             type="com.yingyang.healthconsultation.entity.MedicalConsultationDetailBean" />
 
+        <variable
+            name="payOrder"
+            type="com.yingyang.healthconsultation.entity.PayOrder" />
+
         <variable
             name="doctor"
             type="com.yingyangfly.baselib.db.DoctorBean" />
@@ -221,7 +225,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_12px"
+                        android:layout_marginTop="@dimen/divider_16px"
                         android:text='@{"患者信息: "+data.appUserName}'
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
@@ -234,7 +238,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
+                        android:layout_marginTop="@dimen/divider_16px"
                         android:text='@{"患病时间: "+data.sickTime}'
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
@@ -247,7 +251,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
+                        android:layout_marginTop="@dimen/divider_16px"
                         android:text='@{"是否就诊过: "+data.isConsultation}'
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
@@ -260,7 +264,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
+                        android:layout_marginTop="@dimen/divider_16px"
                         android:text='@{"病情描述: "+data.remark}'
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
@@ -273,7 +277,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
+                        android:layout_marginTop="@dimen/divider_16px"
                         android:text="@string/upload_data"
                         android:textColor="@color/color_FF333333"
                         android:textSize="@dimen/divider_24px"
@@ -289,97 +293,108 @@
                         app:layout_constraintStart_toEndOf="@+id/tvUploadData"
                         app:layout_constraintTop_toBottomOf="@+id/tvConditionDescription" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvOrderDetails"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/orderLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_36px"
-                        android:layout_marginTop="@dimen/divider_32px"
-                        android:text="@string/order_details"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/rvUploadData" />
+                        app:layout_constraintTop_toBottomOf="@+id/rvUploadData">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvOrderNumber"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/order_number"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvOrderDetails" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvOrderDetails"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_36px"
+                            android:layout_marginTop="@dimen/divider_32px"
+                            android:text="@string/order_details"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvOrderTime"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/order_time"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvOrderNumber" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvOrderNumber"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text='@{"订单编号："+payOrder.payOrderId}'
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvOrderDetails" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvPayableAmount"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/payable_amount"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvOrderTime" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvOrderTime"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text='@{"下单时间："+payOrder.sendPayTime}'
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvOrderNumber" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvPaidInAmount"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/paid_in_amount"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPayableAmount" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvPayableAmount"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text='@{"应付金额："+payOrder.sendPayTime}'
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvOrderTime" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvPaymentMethod"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/payment_method"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPaidInAmount" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvPaidInAmount"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text="@string/paid_in_amount"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvPayableAmount" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tvPaymentTime"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/divider_38px"
-                        android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/payment_time"
-                        android:textColor="@color/color_FF333333"
-                        android:textSize="@dimen/divider_24px"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPaymentMethod" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvPaymentMethod"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text="@string/payment_method"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvPaidInAmount" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvPaymentTime"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_38px"
+                            android:layout_marginTop="@dimen/divider_16px"
+                            android:text='@{"支付时间："+payOrder.sendPayTime}'
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tvPaymentMethod" />
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnCancleOrder"
@@ -393,7 +408,7 @@
                         android:textColor="@color/color_FF4A76FF"
                         android:textSize="@dimen/divider_28px"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPaymentTime" />
+                        app:layout_constraintTop_toBottomOf="@+id/orderLayout" />
 
                     <androidx.appcompat.widget.AppCompatButton
                         android:id="@+id/btnContactDoctor"
@@ -407,7 +422,7 @@
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/divider_28px"
                         app:layout_constraintStart_toEndOf="@+id/btnCancleOrder"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPaymentTime" />
+                        app:layout_constraintTop_toBottomOf="@+id/orderLayout" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </com.google.android.material.card.MaterialCardView>