1.修改购买问诊后发送患者信息逻辑

healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt

@@ -19,6 +19,7 @@ import com.hjq.permissions.XXPermissions
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.SickTimeAdapter
 import com.yingyang.healthconsultation.databinding.ActivityConsultationSheetBinding
+import com.yingyang.healthconsultation.entity.PatientConsultationBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyang.healthconsultation.entity.UploadImgBean
 import com.yingyangfly.baselib.adapter.XBaseAdapter
@@ -32,9 +33,7 @@ import com.yingyangfly.baselib.image.ImagePagerActivity
 import com.yingyangfly.baselib.image.XImageSelector
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
-import com.yingyangfly.baselib.utils.LiveEventBusUtil
-import com.yingyangfly.baselib.utils.LogUtil
-import com.yingyangfly.baselib.utils.RxBusCodes
+import com.yingyangfly.baselib.utils.*
 import com.yingyangfly.baselib.utils.img.ImgUtil
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
@@ -344,9 +343,19 @@ class ConsultationSheetActivity :
             it.sysUserId = id
             it.images = stringBuffer.toString()
         }
+        val patientConsultationBean = PatientConsultationBean().apply {
+            remark = binding.editCondition.text.toString()
+            sickTime = purchaseConsultationBean.sickTime
+            isConsultation = purchaseConsultationBean.isConsultation
+            appUserName = User.getName()
+            appUserSex = User.getUserSex()
+            appUserAge = User.getUserAge()
+        }
+        val patientInfo = GsonUtil.GsonString(patientConsultationBean)
         ARouter.getInstance().build(RouterUrlCommon.payment)
             .withString("id", id)
             .withSerializable("purchaseConsultationBean", purchaseConsultationBean)
+            .withString("patientInfo", patientInfo)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
     }

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

@@ -0,0 +1,15 @@
+package com.yingyang.healthconsultation.entity
+
+/**
+ * 患者问诊信息
+ */
+class PatientConsultationBean {
+
+    var isConsultation: String = ""//是否就诊 0是 1否
+    var remark: String = ""//病情描述
+    var sickTime: String = ""//患病时间
+    var appUserName: String = ""
+    var appUserSex: String = ""
+    var appUserAge: String = ""
+
+}

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

@@ -21,6 +21,7 @@ import com.tencent.qcloud.tuicore.interfaces.TUICallback
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationDataAdapter
 import com.yingyang.healthconsultation.databinding.ActivityPaidBinding
+import com.yingyang.healthconsultation.entity.PatientConsultationBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.db.DoctorBean
@@ -34,6 +35,7 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.image.ImagePagerActivity
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.User
 import java.util.*
@@ -320,9 +322,20 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
             it.images = images
             it.isConsultation = isConsultation
         }
+        val patientConsultationBean = PatientConsultationBean()
+        patientConsultationBean.let {
+            it.remark = remark
+            it.sickTime = sickTime
+            it.isConsultation = isConsultation
+            it.appUserName = User.getName()
+            it.appUserSex = User.getUserSex()
+            it.appUserAge = User.getUserAge()
+        }
+        val patientInfo = GsonUtil.GsonString(patientConsultationBean)
         ARouter.getInstance().build(RouterUrlCommon.payment)
             .withString("id", doctorId)
             .withSerializable("purchaseConsultationBean", purchaseConsultationBean)
+            .withString("patientInfo", patientInfo)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
     }

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

@@ -19,6 +19,7 @@ import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationRecordAdapter
 import com.yingyang.healthconsultation.databinding.ActivityConsultationRecordBinding
 import com.yingyang.healthconsultation.entity.ConsultationRecordsBean
+import com.yingyang.healthconsultation.entity.PatientConsultationBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.db.DoctorBean
@@ -31,10 +32,7 @@ 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
-import com.yingyangfly.baselib.utils.LiveEventBusUtil
-import com.yingyangfly.baselib.utils.RxBusCodes
-import com.yingyangfly.baselib.utils.User
+import com.yingyangfly.baselib.utils.*
 import java.util.*
 
 /**
@@ -68,7 +66,7 @@ class ConsultationRecordActivity :
                 when (bean.status) {
                     "0" -> {
                         //0未支付
-                        payOrder(bean, position)
+                        payOrder(bean)
                     }
                     "1" -> {
                         //1待接诊
@@ -175,19 +173,28 @@ class ConsultationRecordActivity :
     /**
      * 支付订单
      */
-    private fun payOrder(bean: ConsultationRecordsBean, position: Int) {
-        val purchaseConsultationBean = PurchaseConsultationBean()
-        purchaseConsultationBean.let {
-            it.remark = bean.remark
-            it.sysUserId = bean.sysUserId
-            it.sickTime = bean.sickTime
-            it.images = bean.images
-            it.isConsultation = bean.isConsultation
+    private fun payOrder(bean: ConsultationRecordsBean) {
+        val purchaseConsultationBean = PurchaseConsultationBean().apply {
+            remark = bean.remark
+            sysUserId = bean.sysUserId
+            sickTime = bean.sickTime
+            images = bean.images
+            isConsultation = bean.isConsultation
         }
+        val patientConsultationBean = PatientConsultationBean().apply {
+            remark = bean.remark
+            sickTime = bean.sickTime
+            isConsultation = bean.isConsultation
+            appUserName = User.getName()
+            appUserSex = User.getUserSex()
+            appUserAge = User.getUserAge()
+        }
+        val patientInfo = GsonUtil.GsonString(patientConsultationBean)
         ARouter.getInstance().build(RouterUrlCommon.payment)
             .withString("id", bean.doctor.id)
             .withString("price", bean.price)
             .withSerializable("purchaseConsultationBean", purchaseConsultationBean)
+            .withString("patientInfo", patientInfo)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
     }