Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
757358a8
Commit
757358a8
authored
May 20, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix : 增加完善用户档案信息页
parent
db709193
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
450 additions
and
69 deletions
+450
-69
config.gradle
config.gradle
+2
-2
AndroidManifest.xml
m-im/src/main/AndroidManifest.xml
+5
-0
GraphicConsulttionFlow2Activity.kt
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
+14
-3
MedicalAddNewArchivesActivity.kt
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
+5
-14
MedicalArchivesListActivity.kt
m-im/src/main/java/com/yidianling/medical/archives/MedicalArchivesListActivity.kt
+13
-12
MedicalUpdateArchivesActivity.kt
m-im/src/main/java/com/yidianling/medical/archives/MedicalUpdateArchivesActivity.kt
+273
-0
MedicalUserArchivesAdapter.kt
m-im/src/main/java/com/yidianling/medical/archives/adapter/MedicalUserArchivesAdapter.kt
+7
-1
MedicalUserArchivesFlow2Adapter.kt
m-im/src/main/java/com/yidianling/medical/archives/adapter/MedicalUserArchivesFlow2Adapter.kt
+16
-5
CreateArchivesResponse.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/CreateArchivesResponse.kt
+1
-1
CreateImageInquiryDtoBody.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/CreateImageInquiryDtoBody.kt
+1
-1
GetArchivesResponse.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/GetArchivesResponse.kt
+12
-0
MedicalArchivesListBean.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/MedicalArchivesListBean.kt
+4
-1
PatientIdDtoBody.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/PatientIdDtoBody.kt
+1
-1
UpdataPatientDtoBody.kt
m-im/src/main/java/com/yidianling/medical/archives/bean/UpdataPatientDtoBody.kt
+10
-0
ServiceApi.kt
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
+13
-2
ServiceImpl.kt
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceImpl.kt
+36
-8
medical_add_new_archives_activity.xml
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
+5
-5
medical_item_archives_flow2_list.xml
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
+20
-13
medical_item_archives_list.xml
m-im/src/main/res/layout/medical_item_archives_list.xml
+12
-0
No files found.
config.gradle
View file @
757358a8
...
...
@@ -11,7 +11,7 @@ ext {
"m-user"
:
"0.0.61.90"
,
"m-user-medical"
:
"0.0.61.99"
,
"m-home"
:
"0.0.22.70"
,
"m-im-medical"
:
"0.0.21.
29
"
,
"m-im-medical"
:
"0.0.21.
30
"
,
"m-im"
:
"0.0.20.76"
,
"m-dynamic"
:
"0.0.7.28"
,
"m-article"
:
"0.0.0.10"
,
...
...
@@ -97,7 +97,7 @@ ext {
"m-user"
:
"0.0.61.90"
,
"m-user-medical"
:
"0.0.61.99"
,
"m-home"
:
"0.0.22.70"
,
"m-im-medical"
:
"0.0.21.
29
"
,
"m-im-medical"
:
"0.0.21.
30
"
,
"m-im"
:
"0.0.20.76"
,
"m-dynamic"
:
"0.0.7.28"
,
"m-article"
:
"0.0.0.8"
,
...
...
m-im/src/main/AndroidManifest.xml
View file @
757358a8
...
...
@@ -296,6 +296,11 @@
android:name=
"com.yidianling.medical.archives.MedicalEditArchivesActivity"
android:screenOrientation=
"portrait"
android:theme=
"@style/platform_NoTitleTheme"
/>
<!--修改问诊人-->
<activity
android:name=
"com.yidianling.medical.archives.MedicalUpdateArchivesActivity"
android:screenOrientation=
"portrait"
android:theme=
"@style/platform_NoTitleTheme"
/>
<!--医疗系统消息-->
<activity
...
...
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
View file @
757358a8
...
...
@@ -13,6 +13,7 @@ import com.ydl.ydlcommon.utils.Utils
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.im.R
import
com.yidianling.medical.archives.MedicalAddNewArchivesActivity
import
com.yidianling.medical.archives.MedicalUpdateArchivesActivity
import
com.yidianling.medical.archives.adapter.MedicalUserArchivesFlow2Adapter
import
com.yidianling.medical.archives.bean.MedicalArchivesListBean
import
com.yidianling.medical.popwindow.InformedConsentPopupWindow
...
...
@@ -80,13 +81,20 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
rv_people_list
.
adapter
=
mAdapter
mAdapter
.
setOnItemClickListener
{
baseQuickAdapter
,
view
,
position
->
if
(
mAdapter
.
data
[
position
]
?.
isAdd
==
true
)
{
val
item
=
mAdapter
.
data
[
position
]
when
{
item
?.
isAdd
==
true
->
{
//点击添加患者
isFirstLoadData
=
false
MedicalAddNewArchivesActivity
.
start
(
this
@GraphicConsulttionFlow2Activity
)
}
else
{
}
item
?.
needEdit
==
1
->
{
isFirstLoadData
=
false
MedicalUpdateArchivesActivity
.
start
(
this
@GraphicConsulttionFlow2Activity
,
item
)
}
else
->
{
//item 点击
for
((
index
,
bean
)
in
mAdapter
.
data
.
withIndex
())
{
if
(
mAdapter
.
data
[
index
]
?.
isCheck
==
true
)
{
...
...
@@ -98,6 +106,7 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
baseQuickAdapter
.
notifyDataSetChanged
()
}
}
}
empty
.
setOnClickListener
{
//空数据页面
isFirstLoadData
=
false
...
...
@@ -265,7 +274,9 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
mAdapter
.
notifyDataSetChanged
()
if
(
mAdapter
.
data
.
size
>
1
)
{
if
(
mAdapter
.
data
[
0
]
?.
needEdit
!=
1
){
mAdapter
.
data
[
0
]
?.
isCheck
=
true
}
rv_people_list
.
visibility
=
View
.
VISIBLE
empty
.
visibility
=
View
.
GONE
}
else
{
...
...
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
View file @
757358a8
...
...
@@ -3,22 +3,13 @@ package com.yidianling.medical.archives
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Intent
import
android.graphics.Color
import
android.graphics.ColorSpace
import
android.graphics.Typeface
import
android.os.Handler
import
android.os.Looper
import
android.os.Message
import
android.provider.CalendarContract
import
android.text.Editable
import
android.text.SpannableString
import
android.text.Spanned
import
android.text.TextWatcher
import
android.text.style.AbsoluteSizeSpan
import
android.text.style.ForegroundColorSpan
import
android.text.style.StyleSpan
import
android.view.*
import
android.widget.EditText
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.view.dialog.NormalDialog
...
...
@@ -108,25 +99,25 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
group_relation
.
setOnCheckedChangeListener
{
group
,
checkedId
->
//与本人关系
when
(
checkedId
)
{
R
.
id
.
me
->
{
R
.
id
.
relation_
me
->
{
//本人 0
mRelation
=
1
}
R
.
id
.
parent
->
{
R
.
id
.
relation_
parent
->
{
//父母 0
mRelation
=
1
}
R
.
id
.
spouse
->
{
R
.
id
.
relation_
spouse
->
{
//配偶 2
mRelation
=
2
}
R
.
id
.
children
->
{
R
.
id
.
relation_
children
->
{
//子女 3
mRelation
=
3
}
R
.
id
.
other
->
{
R
.
id
.
relation_
other
->
{
//其他 4
mRelation
=
4
}
...
...
m-im/src/main/java/com/yidianling/medical/archives/MedicalArchivesListActivity.kt
View file @
757358a8
...
...
@@ -13,7 +13,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.yidianling.im.R
import
com.yidianling.im.bean.SetCourseStatus
import
com.yidianling.medical.archives.adapter.MedicalUserArchivesAdapter
import
com.yidianling.medical.widgets.LoadMoreView
import
com.yidianling.uikit.custom.http.ServiceImpl.Companion.instance
...
...
@@ -70,11 +69,13 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
mAdapter
.
setOnItemClickListener
{
baseQuickAdapter
,
view
,
position
->
isFirstLoadData
=
false
mAdapter
.
data
[
position
]
?.
let
{
MedicalEditArchivesActivity
.
start
(
this
@MedicalArchivesListActivity
,
it
)
mAdapter
.
data
[
position
]
?.
let
{
item
->
isFirstLoadData
=
false
if
(
item
?.
needEdit
==
1
)
{
MedicalUpdateArchivesActivity
.
start
(
this
@MedicalArchivesListActivity
,
item
)
}
else
{
MedicalEditArchivesActivity
.
start
(
this
@MedicalArchivesListActivity
,
item
)
}
}
}
...
...
@@ -125,8 +126,8 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
}
else
{
mAdapter
.
loadMoreEnd
(
false
)
mAdapter
.
setNewData
(
list
)
var
net_error
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
net_error
)
net_error
.
text
=
"暂无就诊人信息,请添加~"
var
net_error
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
net_error
)
net_error
.
text
=
"暂无就诊人信息,请添加~"
mAdapter
.
emptyView
=
mEmptyView
}
}
else
{
...
...
@@ -158,10 +159,10 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
},
{
e
->
doctor_swipe_refresh_layout
.
isRefreshing
=
false
mAdapter
.
loadMoreFail
()
var
net_error
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
net_error
)
var
reLoad
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
reLoad
)
net_error
.
text
=
"网络异常,请稍后再试"
reLoad
.
visibility
=
View
.
VISIBLE
var
net_error
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
net_error
)
var
reLoad
=
mEmptyView
.
findViewById
<
TextView
>(
R
.
id
.
reLoad
)
net_error
.
text
=
"网络异常,请稍后再试"
reLoad
.
visibility
=
View
.
VISIBLE
mAdapter
.
emptyView
=
mEmptyView
})
...
...
m-im/src/main/java/com/yidianling/medical/archives/MedicalUpdateArchivesActivity.kt
0 → 100644
View file @
757358a8
package
com.yidianling.medical.archives
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Intent
import
android.view.*
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.view.dialog.NormalDialog
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.im.R
import
com.yidianling.medical.archives.bean.MedicalArchivesListBean
import
com.yidianling.medical.utils.EditTextUtils
import
com.yidianling.uikit.custom.http.ServiceImpl
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
kotlinx.android.synthetic.main.medical_add_new_archives_activity.*
/**
* 修改问诊人
* */
class
MedicalUpdateArchivesActivity
:
BaseActivity
()
{
companion
object
{
//患者id
const
val
ARCHIVESBEAN_KEY
=
"archivesBean"
var
mMarried
=
-
1
var
mRelation
=
-
1
private
lateinit
var
mArchivesBeanExtra
:
MedicalArchivesListBean
//之前输入内容长度
var
oldLength
=
0
;
@JvmStatic
fun
start
(
context
:
Context
,
archivesBean
:
MedicalArchivesListBean
)
{
val
starter
=
Intent
(
context
,
MedicalUpdateArchivesActivity
::
class
.
java
)
.
putExtra
(
ARCHIVESBEAN_KEY
,
archivesBean
)
context
.
startActivity
(
starter
)
}
}
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
medical_add_new_archives_activity
}
override
fun
initDataAndEvent
()
{
tv_title
.
text
=
"编辑就诊人"
mMarried
=
-
1
mRelation
=
-
1
mArchivesBeanExtra
=
intent
.
extras
.
getSerializable
(
ARCHIVESBEAN_KEY
)
as
MedicalArchivesListBean
initStatus
()
mArchivesBeanExtra
.
name
?.
let
{
name
->
et_name
.
setText
(
name
)
}
mArchivesBeanExtra
.
idcardNo
?.
let
{
idcard
->
et_idcard
.
setText
(
idcard
)
}
group_merried
.
setOnCheckedChangeListener
{
group
,
checkedId
->
//婚姻状态
when
(
checkedId
)
{
R
.
id
.
unmarried
->
{
//未婚 0
mMarried
=
0
}
R
.
id
.
married
->
{
//已婚 1
mMarried
=
1
}
R
.
id
.
widowed
->
{
//丧偶 2
mMarried
=
2
}
R
.
id
.
divorce
->
{
//离异 3
mMarried
=
3
}
else
->
{
mMarried
=
-
1
}
}
}
group_relation
.
setOnCheckedChangeListener
{
group
,
checkedId
->
//与本人关系
when
(
checkedId
)
{
R
.
id
.
relation_me
->
{
//本人 0
mRelation
=
0
}
R
.
id
.
relation_parent
->
{
//父母 0
mRelation
=
1
}
R
.
id
.
relation_spouse
->
{
//配偶 2
mRelation
=
2
}
R
.
id
.
relation_children
->
{
//子女 3
mRelation
=
3
}
R
.
id
.
relation_other
->
{
//其他 4
mRelation
=
4
}
else
->
{
mRelation
=
-
1
}
}
}
setRelation
()
getMarried
()
add_archives_save
.
setOnClickListener
{
//保存新增问诊人
checkInfo
()
}
EditTextUtils
.
disableCopyAndPaste
(
et_name
)
iv_back
.
setOnClickListener
{
finish
()
}
showDialogTip
()
}
/**
* 关系
* */
private
fun
getMarried
()
{
when
(
mArchivesBeanExtra
.
merried
)
{
0
->
{
//未婚 0
unmarried
.
isChecked
=
true
mMarried
=
0
}
1
->
{
// 1-父母
married
.
isChecked
=
true
mMarried
=
1
}
2
->
{
// 2-配偶
widowed
.
isChecked
=
true
mMarried
=
2
}
3
->
{
// 3-子女
divorce
.
isChecked
=
true
mMarried
=
3
}
}
}
/**
* 设置与就诊人关系
* */
private
fun
setRelation
()
{
when
(
mArchivesBeanExtra
.
relation
)
{
0
->
{
//0-本人
relation_me
.
isChecked
=
true
mRelation
=
0
}
1
->
{
// 1-父母
relation_parent
.
isChecked
=
true
mRelation
=
1
}
2
->
{
// 2-配偶
relation_spouse
.
isChecked
=
true
mRelation
=
2
}
3
->
{
// 3-子女
relation_children
.
isChecked
=
true
mRelation
=
3
}
4
->
{
// 4-其他
relation_other
.
isChecked
=
true
mRelation
=
4
}
}
}
private
fun
showDialogTip
()
{
val
builder
=
NormalDialog
.
Builder
(
this
@MedicalUpdateArchivesActivity
,
"center"
,
false
)
builder
.
setTitle
(
""
)
var
strs
=
arrayOf
(
"就诊人的身份证号码"
,
"就诊人的授权同意"
,
"您需要在提供前征得该儿童监护人的同意"
)
builder
.
setMessageAndBolds
(
"\n为向您添加的就诊人提供问诊服务,您需要向我们提供该就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n"
,
strs
)
builder
.
setPositiveButton
(
"同意"
)
{
dialog
,
which
->
dialog
.
dismiss
()
}.
setNegativeButton
(
"不同意"
)
{
dialog
,
which
->
//关闭页面
finish
()
dialog
.
dismiss
()
}
builder
.
setRight_color
(
"#3464EC"
)
builder
.
setLeft_color
(
"#8595A9"
)
builder
.
setContent_color
(
"#10233A"
)
builder
.
create
().
show
()
}
@SuppressLint
(
"CheckResult"
)
private
fun
checkInfo
()
{
if
(
et_name
.
text
.
isNullOrEmpty
())
{
ToastUtil
.
toastShort
(
"请填写姓名"
)
return
}
if
(
et_idcard
.
text
.
isNullOrEmpty
())
{
ToastUtil
.
toastShort
(
"请填写身份证号"
)
return
}
if
(
et_idcard
.
text
.
length
<
15
||
et_idcard
.
text
.
length
>
18
)
{
ToastUtil
.
toastShort
(
"请填写有效身份证号"
)
return
}
if
(
mMarried
==
-
1
)
{
ToastUtil
.
toastShort
(
"请选择婚姻状况"
)
return
}
if
(
mRelation
==
-
1
)
{
ToastUtil
.
toastShort
(
"请选择与就诊人的关系"
)
return
}
ServiceImpl
.
instance
.
updateArchives
(
et_name
.
text
.
toString
(),
et_idcard
.
text
.
toString
(),
mMarried
,
mRelation
,
mArchivesBeanExtra
.
patientId
)
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
({
if
(
"200"
==
it
.
code
)
{
finish
()
ToastUtil
.
toastShort
(
"保存成功"
)
}
else
{
ToastUtil
.
toastShort
(
it
.
msg
)
}
},
{
it
.
printStackTrace
()
ToastUtil
.
toastShort
(
"网络错误"
)
})
}
private
fun
initStatus
()
{
StatusBarUtils
.
setTransparentForImageView
(
this
@MedicalUpdateArchivesActivity
,
null
)
StatusBarUtils
.
statusBarLightMode
(
this
@MedicalUpdateArchivesActivity
)
}
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/medical/archives/adapter/MedicalUserArchivesAdapter.kt
View file @
757358a8
...
...
@@ -16,8 +16,14 @@ class MedicalUserArchivesAdapter :
helper
.
setText
(
R
.
id
.
name
,
item
?.
name
)
helper
.
setText
(
R
.
id
.
sex
,
item
?.
genderName
)
helper
.
setText
(
R
.
id
.
age
,
"${item?.age}岁"
)
if
(
item
?.
needEdit
==
1
){
helper
.
setGone
(
R
.
id
.
id_card
,
false
)
helper
.
setGone
(
R
.
id
.
perfect
,
true
)
}
else
{
helper
.
setGone
(
R
.
id
.
id_card
,
true
)
helper
.
setGone
(
R
.
id
.
perfect
,
false
)
helper
.
setText
(
R
.
id
.
id_card
,
item
?.
idcardNo
)
}
}
...
...
m-im/src/main/java/com/yidianling/medical/archives/adapter/MedicalUserArchivesFlow2Adapter.kt
View file @
757358a8
...
...
@@ -13,18 +13,29 @@ class MedicalUserArchivesFlow2Adapter :
override
fun
convert
(
helper
:
BaseViewHolder
,
item
:
MedicalArchivesListBean
?)
{
if
(
item
?.
isAdd
==
true
)
{
helper
.
setBackgroundRes
(
R
.
id
.
bg
,
R
.
drawable
.
medical_bg_edit_f2f5f8
)
helper
.
setGone
(
R
.
id
.
group_item
,
false
)
helper
.
setGone
(
R
.
id
.
iv_bottom_check
,
false
)
helper
.
setGone
(
R
.
id
.
name
,
false
)
helper
.
setGone
(
R
.
id
.
perfect
,
false
)
helper
.
setGone
(
R
.
id
.
sex
,
false
)
helper
.
setGone
(
R
.
id
.
age
,
false
)
helper
.
setGone
(
R
.
id
.
iv_bottom_check
,
false
)
helper
.
setGone
(
R
.
id
.
iv_bottom_check
,
false
)
helper
.
setGone
(
R
.
id
.
group_add
,
true
)
}
else
{
helper
.
setGone
(
R
.
id
.
group_add
,
false
)
helper
.
setGone
(
R
.
id
.
group_item
,
true
)
helper
.
setGone
(
R
.
id
.
name
,
true
)
if
(
item
?.
needEdit
==
1
){
helper
.
setGone
(
R
.
id
.
perfect
,
true
)
helper
.
setGone
(
R
.
id
.
sex
,
false
)
helper
.
setGone
(
R
.
id
.
age
,
false
)
}
else
{
helper
.
setGone
(
R
.
id
.
perfect
,
false
)
helper
.
setGone
(
R
.
id
.
sex
,
true
)
helper
.
setGone
(
R
.
id
.
age
,
true
)
}
if
(
item
?.
isCheck
==
true
)
{
helper
.
setBackgroundRes
(
R
.
id
.
bg
,
R
.
drawable
.
medical_list_check_bg
)
...
...
m-im/src/main/java/com/yidianling/medical/archives/bean/CreateArchivesRespose.kt
→
m-im/src/main/java/com/yidianling/medical/archives/bean/CreateArchivesRespo
n
se.kt
View file @
757358a8
package
com.yidianling.medical.archives.bean
data class
CreateArchivesRespose
(
data class
CreateArchivesRespo
n
se
(
var
inquiryOrderId
:
String
,
var
inquiryOrderNo
:
String
,
var
orderAmount
:
Int
,
...
...
m-im/src/main/java/com/yidianling/medical/archives/bean/CreateImageInquiryDtoBody.kt
View file @
757358a8
...
...
@@ -7,5 +7,5 @@ data class CreateImageInquiryDtoBody(
var
inquiryType
:
Int
,
var
mainSuitDisease
:
String
,
var
mainSuit
:
String
,
var
patientId
:
Int
=
1
var
patientId
:
Long
=
1
)
m-im/src/main/java/com/yidianling/medical/archives/bean/GetArchivesResponse.kt
0 → 100644
View file @
757358a8
package
com.yidianling.medical.archives.bean
data class
GetArchivesResponse
(
//姓名
var
name
:
String
,
//身份证号码
var
idcardNo
:
String
,
//婚姻状态:0.未婚 1.已婚 2.丧偶 3.离异
var
merried
:
Int
=
-
1
,
//关系:0-本人 1-父母 2-配偶 3-子女 4-其他
var
relation
:
Int
=
-
1
)
m-im/src/main/java/com/yidianling/medical/archives/bean/MedicalArchivesListBean.kt
View file @
757358a8
...
...
@@ -17,11 +17,13 @@ data class MedicalArchivesListBean(
val
merried
:
Int
=
-
1
,
val
merriedName
:
String
=
""
,
val
name
:
String
=
""
,
val
patientId
:
Int
=
-
1
,
val
patientId
:
Long
=
-
1
,
val
phone
:
String
=
""
,
val
relation
:
Int
=
-
1
,
val
relationName
:
String
=
""
,
val
userId
:
Int
=
-
1
,
//是否需要编辑完善信息:0不需要、1需要
val
needEdit
:
Int
=
0
,
var
isCheck
:
Boolean
=
false
):
Serializable
\ No newline at end of file
m-im/src/main/java/com/yidianling/medical/archives/bean/PatientIdDtoBody.kt
View file @
757358a8
package
com.yidianling.medical.archives.bean
data class
PatientIdDtoBody
(
var
patientId
:
Int
var
patientId
:
Long
)
m-im/src/main/java/com/yidianling/medical/archives/bean/UpdataPatientDtoBody.kt
0 → 100644
View file @
757358a8
package
com.yidianling.medical.archives.bean
data class
UpdataPatientDtoBody
(
var
idcardNo
:
String
,
var
merried
:
Int
,
var
name
:
String
,
var
relation
:
Int
,
var
patientId
:
Long
,
var
idcardType
:
Int
=
1
)
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
View file @
757358a8
...
...
@@ -5,7 +5,8 @@ import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import
com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA_URL
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.yidianling.medical.MedicalFileBeanRespose
import
com.yidianling.medical.archives.bean.CreateArchivesRespose
import
com.yidianling.medical.archives.bean.CreateArchivesResponse
import
com.yidianling.medical.archives.bean.GetArchivesResponse
import
com.yidianling.medical.archives.bean.MedicalArchivesListBean
import
com.yidianling.medical.archives.bean.MedicalUserArchivesBean
import
com.yidianling.medical.im.bean.SystemListRespose
...
...
@@ -140,10 +141,20 @@ interface ServiceApi {
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
createArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
//医疗 修改问诊人
@POST
(
"api/client/user/patient/v1/update"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
updateArchives
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
Any
>>
//医疗 获取问诊人信息
@GET
(
"api/client/user/patient/v1/getById"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
getArchives
(
@Query
(
"patientId"
)
patientId
:
String
):
Observable
<
BaseAPIResponse
<
GetArchivesResponse
>>
//医疗 创建问诊订单
@POST
(
"api/client/inquiry/v1/create"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN_JAVA_URL
)
fun
createArchivesOrder
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespose
>>
fun
createArchivesOrder
(
@Body
body
:
RequestBody
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespo
n
se
>>
//医疗 删除问诊人
...
...
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceImpl.kt
View file @
757358a8
...
...
@@ -10,13 +10,8 @@ import com.yidianling.medical.im.bean.SystemListRespose
import
com.yidianling.uikit.custom.http.response.*
import
com.yidianling.uikit.custom.http.response.question.QuestionsInfoBean
import
io.reactivex.Observable
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Job
import
kotlinx.coroutines.launch
import
okhttp3.MediaType
import
okhttp3.RequestBody
import
java.io.File
import
java.util.*
/**
...
...
@@ -225,6 +220,39 @@ class ServiceImpl private constructor() {
.
createArchives
(
body
)
}
/***
* 修改问诊人
* @param name 名字
* @param idcardNo 身份证号
* @param relation 与问诊人关系
* @param merried 婚姻状态
* */
fun
updateArchives
(
name
:
String
,
idcardNo
:
String
,
merried
:
Int
,
relation
:
Int
,
patientId
:
Long
):
Observable
<
BaseAPIResponse
<
Any
>>
{
val
body
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
JSON
.
toJSONString
(
UpdataPatientDtoBody
(
idcardNo
,
merried
,
name
,
relation
,
patientId
))
)
as
RequestBody
return
YDLHttpUtils
.
obtainApi
(
ServiceApi
::
class
.
java
)
.
updateArchives
(
body
)
}
/***
* 根据ID加载问诊人
* @param patientId 问诊人id
* */
fun
getArchives
(
patientId
:
String
):
Observable
<
BaseAPIResponse
<
GetArchivesResponse
>>
{
return
YDLHttpUtils
.
obtainApi
(
ServiceApi
::
class
.
java
)
.
getArchives
(
patientId
)
}
/***
* 创建问诊订单
...
...
@@ -239,9 +267,9 @@ class ServiceImpl private constructor() {
isFirst
:
Int
,
mainSuit
:
String
,
mainSuitDisease
:
String
,
patientId
:
Int
,
patientId
:
Long
,
doctorId
:
String
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespose
>>
{
):
Observable
<
BaseAPIResponse
<
CreateArchivesRespo
n
se
>>
{
val
body
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
JSON
.
toJSONString
(
...
...
@@ -266,7 +294,7 @@ class ServiceImpl private constructor() {
* @param patientId 患者ID
* */
fun
deleteArchives
(
patientId
:
Int
patientId
:
Long
):
Observable
<
BaseAPIResponse
<
Any
>>
{
val
body
=
RequestBody
.
create
(
MediaType
.
parse
(
"application/json; charset=utf-8"
),
...
...
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
View file @
757358a8
...
...
@@ -220,7 +220,7 @@
app:layout_constraintTop_toBottomOf=
"@id/tv_relation"
>
<RadioButton
android:id=
"@+id/me"
android:id=
"@+id/
relation_
me"
android:layout_width=
"0dp"
android:layout_height=
"32dp"
android:layout_weight=
"1"
...
...
@@ -231,7 +231,7 @@
android:textColor=
"@drawable/medical_textcolor_495c72_3464ec"
/>
<RadioButton
android:id=
"@+id/parent"
android:id=
"@+id/
relation_
parent"
android:layout_width=
"0dp"
android:layout_height=
"32dp"
android:layout_marginStart=
"16dp"
...
...
@@ -243,7 +243,7 @@
android:textColor=
"@drawable/medical_textcolor_495c72_3464ec"
/>
<RadioButton
android:id=
"@+id/spouse"
android:id=
"@+id/
relation_
spouse"
android:layout_width=
"0dp"
android:layout_height=
"32dp"
android:layout_marginStart=
"16dp"
...
...
@@ -255,7 +255,7 @@
android:textColor=
"@drawable/medical_textcolor_495c72_3464ec"
/>
<RadioButton
android:id=
"@+id/children"
android:id=
"@+id/
relation_
children"
android:layout_width=
"0dp"
android:layout_height=
"32dp"
android:layout_marginStart=
"16dp"
...
...
@@ -267,7 +267,7 @@
android:textColor=
"@drawable/medical_textcolor_495c72_3464ec"
/>
<RadioButton
android:id=
"@+id/other"
android:id=
"@+id/
relation_
other"
android:layout_width=
"0dp"
android:layout_height=
"32dp"
android:layout_marginStart=
"16dp"
...
...
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
View file @
757358a8
...
...
@@ -7,17 +7,10 @@
android:layout_height=
"wrap_content"
android:layout_marginStart=
"12dp"
android:layout_marginTop=
"12dp"
android:minHeight=
"62dp"
android:background=
"@drawable/medical_bg_edit_f2f5f8"
android:minHeight=
"62dp"
tools:background=
"@drawable/medical_list_check_bg"
>
<androidx.constraintlayout.widget.Group
android:id=
"@+id/group_item"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:constraint_referenced_ids=
"age,name,sex"
tools:visibility=
"visible"
/>
<TextView
android:id=
"@+id/name"
android:layout_width=
"wrap_content"
...
...
@@ -31,6 +24,20 @@
tools:text=
"何照"
/>
<TextView
android:id=
"@+id/perfect"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4dp"
android:layout_marginBottom=
"8dp"
android:text=
"请完善信息"
android:textColor=
"@color/medical_color_3464ec"
android:textSize=
"14sp"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"@id/name"
app:layout_constraintTop_toBottomOf=
"@id/name"
/>
<TextView
android:id=
"@+id/sex"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -70,19 +77,19 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:visibility=
"gone"
tools:visibility=
"gone
"
app:constraint_referenced_ids=
"add,tv_add
"
/>
app:constraint_referenced_ids=
"add,tv_add
"
tools:visibility=
"gone
"
/>
<ImageView
android:id=
"@+id/add"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@mipmap/medical_add_icon"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
app:layout_constraintBottom_toTopOf=
"@id/tv_add"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<TextView
android:id=
"@+id/tv_add"
...
...
m-im/src/main/res/layout/medical_item_archives_list.xml
View file @
757358a8
...
...
@@ -64,6 +64,18 @@
<TextView
android:id=
"@+id/perfect"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"16dp"
android:textColor=
"@color/medical_color_3464ec"
android:textSize=
"14sp"
android:visibility=
"gone"
app:layout_constraintLeft_toLeftOf=
"@id/name"
app:layout_constraintTop_toBottomOf=
"@id/name"
android:text=
"请完善信息"
/>
<TextView
android:id=
"@+id/id_card"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment