1.添加获取订单记录接口

healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/ConsultationRecordAdapter.kt

@@ -2,8 +2,11 @@ package com.yingyang.healthconsultation.adapter
 
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.databinding.ItemConsultationRecordBinding
+import com.yingyang.healthconsultation.entity.Record
 import com.yingyangfly.baselib.adapter.BaseDataBindingAdapter
 import com.yingyangfly.baselib.db.DoctorBean
+import com.yingyangfly.baselib.ext.setTextColorResource
+import com.yingyangfly.baselib.ext.show
 
 /**
  * 问诊记录adapter
@@ -16,5 +19,31 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
         position: Int
     ) {
         binding.data = item
+        if (item.status.isNullOrEmpty().not()) {
+            when (item.status) {
+                "0" -> {
+                    //0未支付
+                    binding.btnEvaluate.show(true)
+                    binding.btnRecord.show(true)
+                    binding.btnEvaluate.setBackgroundResource(R.drawable.bg_cancel_order)
+                    binding.btnEvaluate.setTextColorResource(R.color.color_FFA5A5A5)
+                    binding.btnEvaluate.text = "取消订单"
+                    binding.btnRecord.text = "去支付"
+                }
+                "1" -> {
+                    //1待接诊
+                }
+                "2" -> {
+                    //2接诊中
+                }
+                "3" -> {
+                    //3已拒诊 4已完成
+                }
+                "4" -> {
+                    //4已完成
+                }
+            }
+        }
+
     }
 }

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

@@ -0,0 +1,35 @@
+package com.yingyang.healthconsultation.entity
+
+data class ConsultationRecords(
+    val current: String,
+    val pages: String,
+    val records: List<Record>
+)
+
+data class Record(
+    val appUserAge: String,//患者年龄
+    val appUserId: String,//患者id
+    val appUserName: String,//患者姓名
+    val appUserSex: String,//患者性别
+    val createBy: String,//创建人
+    val createTime: String,//创建时间
+    val finishTime: String,//完成时间
+    val id: String,//id
+    val images: String,//图片地址
+    val isConsultation: String,//是否就诊 0是 1否
+    val orgCode: String,//租户编号
+    val orgName: String,//租户名称
+    val payMethod: String,
+    val price: String,//金额
+    val reason: String,//拒诊原因
+    val remark: String,//病情描述
+    val sickTime: String,//患病时间
+    val status: String,//状态 0未支付 1待接诊 2接诊中 3已拒诊 4已完成
+    val sysUserId: String,//医生id
+    val sysUserName: String,//医生姓名
+    val updateBy: String,//更新人
+    val updateTime: String,//更新时间
+    val title: String,
+    val departmentName: String,
+    val speciality: String
+)

healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt

@@ -52,4 +52,10 @@ interface HealthConsultationApiService {
     @POST("medical_consultation/save")
     suspend fun saveConsultation(@Body requestBody: RequestBody): BaseResp<PayImageBean>
 
+    /**
+     * 问诊记录
+     */
+    @POST("medical_consultation/my/list")
+    suspend fun getConsultationRecordList(): BaseResp<List<DoctorBean>>
+
 }

healthconsultation/src/main/java/com/yingyang/healthconsultation/payment/PaymentViewModel.kt

@@ -1,6 +1,5 @@
 package com.yingyang.healthconsultation.payment
 
-import android.util.Log
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.bean.PayImageBean
@@ -18,7 +17,6 @@ class PaymentViewModel : BaseViewModel() {
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: PayImageBean?) -> Unit)? = null,
     ) = launchFlow(false) {
-        Log.e("wpp", GsonUtil.GsonString(requestBean))
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
         HEALTHCONSULTATION_API.saveConsultation(body)
     }.runUI(

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

@@ -47,14 +47,14 @@ class ConsultationRecordActivity :
     }
 
     private fun loadData() {
-        viewModel.getRecords(fail = {
+        viewModel.getConsultationRecordList(fail = {
             it.show()
         }, success = {
             records.clear()
             if (it.isNullOrEmpty().not()) {
                 records.addAll(it!!)
             }
-            adapter.showEmptyView = records.isNullOrEmpty()
+            adapter.showEmptyView = records.isEmpty()
             adapter.setData(records)
         })
     }

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

@@ -9,11 +9,11 @@ import com.yingyangfly.baselib.mvvm.BaseViewModel
  */
 class ConsultationRecordViewModel : BaseViewModel() {
 
-    fun getRecords(
+    fun getConsultationRecordList(
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: List<DoctorBean>?) -> Unit)? = null,
     ) = launchFlow(true) {
-        HEALTHCONSULTATION_API.getRecommendDoctorList()
+        HEALTHCONSULTATION_API.getConsultationRecordList()
     }.runUI(
         success,
         fail

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

@@ -22,7 +22,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:paddingBottom="@dimen/divider_21px">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/imageHead"
@@ -30,8 +31,10 @@
                 android:layout_height="@dimen/divider_100px"
                 android:layout_marginStart="@dimen/divider_32px"
                 android:layout_marginTop="@dimen/divider_32px"
+                app:isCircle="@{false}"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:loadHeadImg="@{data.avatar}" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvName"
@@ -44,8 +47,7 @@
                 android:textSize="@dimen/divider_28px"
                 android:textStyle="bold"
                 app:layout_constraintStart_toEndOf="@+id/imageHead"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@string/album" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tvDuties"

healthconsultation/src/main/res/values/colors.xml

@@ -27,4 +27,5 @@
     <color name="color_FFCFCFCF" tools:ignore="ResourceName">#FFCFCFCF</color>
     <color name="color_ff4571ff" tools:ignore="ResourceName">#ff4571ff</color>
     <color name="color_ff8fafff" tools:ignore="ResourceName">#ff8fafff</color>
+    <color name="color_FFA5A5A5" tools:ignore="ResourceName">#FFA5A5A5</color>
 </resources>

tuicore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Mon Sep 11 16:02:51 CST 2023
+#Mon Sep 11 17:56:33 CST 2023
 D\:\\workspace\\hcp-pad\\tuicore\\src\\main\\res\\drawable\\core_permission_dialog_bg.xml=D\:\\workspace\\hcp-pad\\tuicore\\build\\intermediates\\packaged_res\\debug\\drawable\\core_permission_dialog_bg.xml
 D\:\\workspace\\hcp-pad\\tuicore\\src\\main\\res\\drawable\\core_list_divider.xml=D\:\\workspace\\hcp-pad\\tuicore\\build\\intermediates\\packaged_res\\debug\\drawable\\core_list_divider.xml
 D\:\\workspace\\hcp-pad\\tuicore\\src\\main\\res\\layout\\permission_activity_layout.xml=D\:\\workspace\\hcp-pad\\tuicore\\build\\intermediates\\packaged_res\\debug\\layout\\permission_activity_layout.xml