diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js index 3385bd7..0b0d4f0 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js +++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js @@ -244,6 +244,20 @@ Component({ }]; return renderDom; } + if (customMessage.message_type === 12) { + let data = customMessage.data; + console.log(data) + const renderDom = [{ + type: 'wenzhen_form', + order_inquiry_id:data.order_inquiry_id, + message_path:data.message_path, + case_patient_message_path:data.case_patient_message_path, + case_filled_fields:data.case_filled_fields, + case_not_fill_fields:data.case_not_fill_fields + }]; + return renderDom; + } + } catch (error) {} // 客服咨询 @@ -324,6 +338,21 @@ Component({ app.method.navigateTo({ url: url + "&fromType=" + encodeURIComponent(redirectUrl + "?" + params) }) + }, + goList(event){ + console.log(event); + const {ismine,params,id}=event.currentTarget.dataset; + console.log(params); + if(!ismine){//未填写 + app.method.navigateTo({ + url:'/pages/inquiryForm/inquiryForm?params='+params+"&order_inquiry_id="+id + }) + }else{//已填写 + app.method.navigateTo({ + url:'/pages/inquiryForm/inquiryForm?case_filled_fields='+params+"&order_inquiry_id="+id + }) + } + // app.go(url); } }, }); \ No newline at end of file diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml index 680e1d4..11da253 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml +++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml @@ -94,5 +94,20 @@ - + + + + 问诊表 + + + + 问诊表-已填写 + + + 等待填写 + + + 点击查看 + + \ No newline at end of file diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss index b9492d9..788f5c9 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss +++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss @@ -321,4 +321,61 @@ font-weight: 400; color: rgba(0,0,0,0.85); justify-content: space-between; align-items: center; +} +.wenzhen_form{ + width: 60vw; + position: relative; + z-index:2; + border-radius: 10px 10px 10px 10px; + border: 1rpx solid #1ACAD3; +} +.wenzhen_form .title{ + border-radius: 16rpx 16rpx 0 0; + padding:20rpx; + display: flex; + align-items: center; + font-size: 30rpx; +color: #FFFFFF; + background-color: #3CC7C0; +} +.wzicon{ + margin-right: 10rpx; + width:42rpx; + height:46rpx; +} +.my-custom .wenzhen_form{ + background: rgb(212, 239, 241); +} +.wenzhen_form .descform{ + padding:15rpx 20rpx; + background-color: #ffff; + font-size: 28rpx; +color: #666666; + border-radius: 0 0 16rpx 16rpx; +} +.wenzhen_form.my-custom::after{ + content:''; + position: absolute; + top: 35rpx; + right: -19rpx; + transform: translate(-50%,-50%) rotate(-135deg); + width: 16rpx; + height: 16rpx; + background: #3CC7C0; + border: 1rpx solid #1ACAD3; + /* background: rgb(255, 255, 255); + border: 1rpx solid #E7E7E7; */ + border-style: none none solid solid; +} +.wenzhen_form.your-custom::after{ + content:''; + position: absolute; + top: 35rpx; + left: 0; + transform: translate(-50%,-50%) rotate(45deg); + width: 16rpx; + height: 16rpx; + background: #3CC7C0; + border: 1rpx solid #1ACAD3; + border-style: none none solid solid } \ No newline at end of file diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml index 7053bb6..e9c806e 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml +++ b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml @@ -35,7 +35,7 @@ - + 已读 未读 @@ -53,7 +53,7 @@ - + diff --git a/TUIService/TUIKit/static/assets/wenzhenform.png b/TUIService/TUIKit/static/assets/wenzhenform.png new file mode 100644 index 0000000..a1db918 Binary files /dev/null and b/TUIService/TUIKit/static/assets/wenzhenform.png differ diff --git a/api/consultOrder.js b/api/consultOrder.js index b7b92b4..af56067 100644 --- a/api/consultOrder.js +++ b/api/consultOrder.js @@ -15,7 +15,7 @@ function cancelPay(data){ //问诊订单取消支付 return request('/patient/order/inquiry/cancel-pay/'+data,'PUT',{},true) }; function sickInfo(data){ //获取患者问诊病例 - return request('/case','GET',data) + return request('/case/inquiry','GET',data) }; function getRate(id){ //获取患者问诊病例 return request('/patient/inquiry/evaluation/'+id,'GET') diff --git a/api/sickRecord.js b/api/sickRecord.js index 8ddea4b..c3f0084 100644 --- a/api/sickRecord.js +++ b/api/sickRecord.js @@ -14,8 +14,13 @@ function pathographyGroup(){ //获取家庭成员病情记录分组 function pathographyDelete(id){ // 删除家庭成员病情记录 return request('/patient/pathography/'+id,'DELETE') }; +function sendFields(data){ // 删除家庭成员病情记录 + return request('/case/fields/patient','POST',data,true) +}; module.exports={ + pathographyGroup, + sendFields, isExist, pathographyList, pathographyDetail diff --git a/assets/images/noManage.png b/assets/images/noManage.png new file mode 100644 index 0000000..5cd0dcd Binary files /dev/null and b/assets/images/noManage.png differ diff --git a/assets/images/sickManage.png b/assets/images/sickManage.png new file mode 100644 index 0000000..e111581 Binary files /dev/null and b/assets/images/sickManage.png differ diff --git a/assets/images/wenzhenform.png b/assets/images/wenzhenform.png new file mode 100644 index 0000000..a1db918 Binary files /dev/null and b/assets/images/wenzhenform.png differ diff --git a/filters/filter.wxs b/filters/filter.wxs index 324cce7..982eeef 100644 --- a/filters/filter.wxs +++ b/filters/filter.wxs @@ -158,7 +158,19 @@ function formatChufang(arr){ } return flag } + +function formatwenzhenList(arr,type){ + var obj=null; + for (var i = 0; i < arr.length; ++i) { + if(arr[i]==type){ + return {NUMBER:i+1,ISHAS:true} + } + }; + return {ISHAS:false} + } + module.exports = { + formatwenzhenList:formatwenzhenList, formatChufang:formatChufang, formatInquiryType:formatInquiryType, formatDate: formatDate, diff --git a/pages/inquiryForm/inquiryForm.js b/pages/inquiryForm/inquiryForm.js index 75ec7ec..89e11f8 100644 --- a/pages/inquiryForm/inquiryForm.js +++ b/pages/inquiryForm/inquiryForm.js @@ -1,19 +1,558 @@ // pages/inquiryForm/inquiryForm.js const app = getApp() +import {nation,job} from "../../api/common" +import {sendFields} from "../../api/sickRecord" Page({ /** * 页面的初始数据 */ data: { + obj:{ + height:'身高', + weight:'体重', + nation_id:'民族', + job_id:'职业', + marital_status:'婚姻状态', + allergy_history:'是否有过敏史？', + family_history:'是否有家族病史？', + is_pregnant:'是否处于备孕、妊娠、哺乳期？', + is_operation:'是否做过手术？', + drink_wine_status:'是否有饮酒史?', + smoke_status:'是否有吸烟史？', + chemical_compound_status:'是否有接触过化学物?', + diagnosis_hospital:'确诊医院是？', + is_take_medicine:'服用药品是？' + + }, + showNation:false, + showJob:false, + showMarital:false, + nationname:'', + order_inquiry_id:'', + jobname:'', + hideGuomin:false, + hideFamilysick:false, + hidePregnant:false, + hideOperation:false, + hideChemical:false, + hideHospital:false, + hideDrug:false, + personInfo:{}, + showBtn:true, + maritalColumn: [{ + text: '未婚', + value: 0 + }, { + text: '已婚 ', + value: 1 + }, { + text: '离异 ', + value: 2 + }], + nationcolumns:[], + jobcolumns:[], + list1:[], + list2:[], + startIndex1:1, + showList:[{ + isHas:false, + index:1 + },{ + isHas:false, + index:2 + },{ + isHas:false, + index:3 + },{ + isHas:false, + index:4 + },{ + isHas:false, + index:5 + },{ + isHas:false, + index:6 + },{ + isHas:false, + index:7 + },{ + isHas:false, + index:8 + },{ + isHas:false, + index:9 + }] + }, + handleSendFields(){ + const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data; + console.log(personInfo) + const fields=[]; + for (let i = 0; i { + wx.showToast({ + title: '发送成功', + icon:'none' + }), + wx.navigateBack() + + }) + }, + openMaritalPicker() { + this.setData({ + showMarital: true + }) + }, + closeMaritalPicker() { + this.setData({ + showMarital: false + }) + }, + onConfirmMaritalPicker(event) { + const { + value + } = event.detail; + + this.setData({ + showMarital: false, + marital_name:value.text, + 'personInfo.marital_status':value.value + }) + }, + onChangeRadio(event) { + let key = event.target.dataset.id; + let obj= "personInfo."+key; + this.setData({ + [obj]:Number(event.detail) + }); + if(key=="chemical_compound_status" && event.detail==1){ + this.setData({ + "personInfo.chemical_compound_describe":'' + }) + }else if(event.detail==0){ + if(key=="is_allergy_history"){ + this.setData({ + "personInfo.allergy_history":'', + hideGuomin:false + }) + }; + if(key=="is_pregnant"){ + this.setData({ + "personInfo.pregnant":'', + hidePregnant:false + }) + } + if(key=="is_family_history"){ + this.setData({ + "personInfo.family_history":'', + hideFamilysick:false + }) + } + } + }, + handelFocus(e) { + let key = e.target.dataset.id; + let value = e.target.dataset.value; + let obj="personInfo."+value; + if (!e.detail.value) { + this.setData({ + [key]: false, + [obj]: e.detail.value + }) + } else { + this.setData({ + [key]: true, + [obj]: e.detail.value + }) + } + }, + onConfirmNation(event) { + const { + value + } = event.detail; + this.setData({ + "nationname": `${value.nation_name}`, + "personInfo.nation_id": `${value.nation_id}`, + showNation: false + }) + }, + showNation() { + + this.setData({ + showNation: true + }) + }, + onCancelNation() { + this.setData({ + showNation: false + }) + }, + onConfirmJob(event) { + const { + value + } = event.detail; + this.setData({ + "jobname": `${value.job_name}`, + "personInfo.job_id": `${value.job_id}`, + showJob: false + }) + }, + showJob() { + this.setData({ + showJob: true + }) + }, + onCancelJob() { + this.setData({ + showJob: false + }) + }, + commonMethods(arr1,arr2){ + this.setData({ + list1:arr1, + list2:arr2 + }); + let count=0; + arr2.forEach((item)=>{ + if(item=="allergy_history"){ + count++; + this.setData({ + 'showList[0].isHas':true, + 'showList[0].index':1 + }) + }else if(item=="family_history"){ + count++; + this.setData({ + 'showList[1].isHas':true, + 'showList[1].index':count + }) + }else if(item=="is_pregnant"){ + count++; + this.setData({ + 'showList[2].isHas':true, + 'showList[2].index':count + }) + }else if(item=="is_operation"){ + count++; + this.setData({ + 'showList[3].isHas':true, + 'showList[3].index':count + }) + }else if(item=="drink_wine_status"){ + count++; + this.setData({ + 'showList[4].isHas':true, + 'showList[4].index':count + }) + }else if(item=="smoke_status"){ + count++; + this.setData({ + 'showList[5].isHas':true, + 'showList[5].index':count + }) + }else if(item=="chemical_compound_status"){ + count++; + this.setData({ + 'showList[6].isHas':true, + 'showList[6].index':count + }) + }else if(item=="diagnosis_hospital"){ + count++; + this.setData({ + 'showList[7].isHas':true, + 'showList[7].index':count + }) + }else if(item=="is_take_medicine"){ + count++; + this.setData({ + 'showList[8].isHas':true, + 'showList[8].index':count + }) + } + }) + + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + this.getNation(); + this.getJob(); + if(options.order_inquiry_id){ + this.setData({ + order_inquiry_id:options.order_inquiry_id + }) + } + if(options.case_filled_fields){ + + let data=JSON.parse(options.case_filled_fields); + let arr1=[]; + let arr2=[]; + + this.setData({ + personInfo:data, + showBtn:false + }); + if(data.is_allergy_history==1){ + this.setData({ + hideGuomin:true + }) + } + if(data.is_family_history==1){ + this.setData({ + hideFamilysick:true + }) + } + if(data.is_operation==1){ + this.setData({ + hideOperation:true + }) + } + if(data.is_pregnant==1){ + this.setData({ + hidePregnant:true + }) + } + if(data.chemical_compound_status && data.chemical_compound_status!=1){ + this.setData({ + hideChemical:true + }) + } + if(data.diagnosis_hospital){ + this.setData({ + hideHospital:true + }) + } + if(data.is_take_medicine==1){ + this.setData({ + hideDrug:true + }) + } + let {maritalColumn,jobcolumns,nationcolumns}=this.data; + if(data.marital_status==0 || data.marital_status){ + let select=maritalColumn.filter(item=>{return item.value==data.marital_status}); + this.setData({ + 'marital_name':select[0].text + }) + }; + + + + Object.keys(data).forEach(function(key){ + if(key=="weight" || key=="height" || key=="marital_status" || key=="nation_id" || key=="job_id"){ + arr1.push(key); + }else{ + arr2.push(key); + } + }) + this.commonMethods(arr1,arr2); + + + } + if(options.params){ + let data=JSON.parse(options.params); + let {obj}=this.data; + let arr1=[]; + let arr2=[]; + data.forEach(item => { + if(item=="weight" || item=="height" || item=="marital_status" || item=="nation_id" || item=="job_id"){ + arr1.push(item); + }else{ + arr2.push(item); + } + + }) + this.commonMethods(arr1,arr2); + + } }, /** @@ -22,7 +561,34 @@ Page({ onReady() { }, - + getNation(){ + nation().then(data=>{ + this.setData({ + nationcolumns:data + }) + let {personInfo}=this.data; + if(personInfo.nation_id || personInfo.nation_id==0){ + let select=data.filter(item=>{return item.nation_id==personInfo.nation_id}); + this.setData({ + 'nationname':select[0].nation_name + }) + } + }) + }, + getJob(){ + job().then(data=>{ + this.setData({ + jobcolumns:data + }) + let {personInfo}=this.data; + if(personInfo.job_id || personInfo.job_id==0){ + let select=data.filter(item=>{return item.job_id==personInfo.job_id}); + this.setData({ + 'jobname':select[0].job_name + }) + } + }) + }, /** * 生命周期函数--监听页面显示 */ diff --git a/pages/inquiryForm/inquiryForm.wxml b/pages/inquiryForm/inquiryForm.wxml index 0369572..c010238 100644 --- a/pages/inquiryForm/inquiryForm.wxml +++ b/pages/inquiryForm/inquiryForm.wxml @@ -1,61 +1,62 @@ + 基本信息 - + - 1、身高（CM） + {{filter.formatwenzhenList(list1,'height').NUMBER}}、身高（CM） - + - + - 2、体重（KG） + {{filter.formatwenzhenList(list1,'weight').NUMBER}}、体重（KG） - + - + - 3、婚姻状况 + {{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况 - + - + - 4、民族 + {{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族 - + - + - 5、职业 + {{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业 - + @@ -66,85 +67,85 @@ 个人情况 - - 1、 + + {{showList[0].index}}、 您是否有过敏史？ - + 是 否 - - 2、 + + {{showList[1].index}}、 您是否有家族病史？ - + 是 否 - - {{startIndex}}、 + + {{showList[2].index}}、 您是否处于备孕、妊娠、哺乳期？ - + 是 否 - - {{startIndex+1}}、 + + {{showList[3].index}}、 是否做过手术 - + 是 否 - - {{startIndex+2}}、 + + {{showList[4].index}}、 是否有饮酒史 - + 从不 偶尔 经常 @@ -154,12 +155,12 @@ - - {{startIndex+3}}、 + + {{showList[5].index}}、 是否有吸烟史 - + 从不 偶尔 经常 @@ -169,12 +170,12 @@ - - {{startIndex+4}}、 + + {{showList[6].index}}、 是否有接触过化学物 - + 从不 偶尔 经常 @@ -183,7 +184,7 @@ - + @@ -191,27 +192,31 @@ - - {{startIndex+45}}、 + + {{showList[7].index}}、 确诊医院是？ - - - - - {{startIndex+6}}、 + + {{showList[8].index}}、 - 服用药品是？ - - - - + + 发送给医生 + - - - + diff --git a/pages/inquiryForm/inquiryForm.wxss b/pages/inquiryForm/inquiryForm.wxss index 597fbeb..04511c0 100644 --- a/pages/inquiryForm/inquiryForm.wxss +++ b/pages/inquiryForm/inquiryForm.wxss @@ -11,6 +11,7 @@ .questionbox{ overflow-y: scroll; margin-top: 172rpx; + flex:1; } .cellbox .cell{ background-color: #fff; @@ -143,4 +144,21 @@ margin-bottom: 20rpx; } */ .van-radio{ margin-bottom: 10rpx!important; +} +.bottom{ + width:100%; + height:160rpx; + background-color: #fff; +} +.bottom .btn{ + font-size: 30rpx; +color: #FFFFFF; + height:80rpx; + display: flex; + + justify-content: center; + align-items: center; + background: #3CC7C0; +border-radius: 8rpx; + margin:40rpx 32rpx; } \ No newline at end of file diff --git a/pages/my/my.js b/pages/my/my.js index 9456a06..445a573 100644 --- a/pages/my/my.js +++ b/pages/my/my.js @@ -53,6 +53,11 @@ Page({ url: '/pages/familyDoc/familyDoc', }) }), + goSickMange:throttle(function(){ + app.method.navigateTo({ + url: '/pages/sickManage/sickManage', + }) + }), goAddress:throttle(function(){ app.method.navigateTo({ url: '/pages/address/address', diff --git a/pages/my/my.wxml b/pages/my/my.wxml index 2ff04bb..e542c26 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -79,6 +79,10 @@ 家庭档案 + + + 病情管理 + diff --git a/pages/my/my.wxss b/pages/my/my.wxss index 90e4212..21deea0 100644 --- a/pages/my/my.wxss +++ b/pages/my/my.wxss @@ -161,7 +161,8 @@ color: rgba(0,0,0,0.65); font-size: 28rpx; } .service .iconbox{ - width:430rpx; + display: flex; + justify-content: space-between; } .service .iconbox .name { margin-top: 10rpx; diff --git a/pages/sickDetail/sickDetail.js b/pages/sickDetail/sickDetail.js index 659e909..96a8736 100644 --- a/pages/sickDetail/sickDetail.js +++ b/pages/sickDetail/sickDetail.js @@ -1,16 +1,36 @@ // pages/sickDetail/sickDetail.js +const app = getApp() +import {pathographyDetail} from "../../api/sickRecord" +import {throttle} from "../../utils/util" +import {pathographyListDelte} from "../../api/sickRecord" Page({ /** * 页面的初始数据 */ data: { - + sickInfo:{}, + index:0, + pathography_id:'', + show:false, + message:'', + }, /** * 生命周期函数--监听页面加载 */ + onDel() { + this.setData({ + show:true, + message:"确定删除该病情记录？" + }) + }, + confirm:throttle(function(event){ + if(event.detail){ + this.handlePathographyListDelte(); + } +}), previewImage(event) { let id = event.currentTarget.dataset.id; let urls = this.data.sick.diagnose_images; @@ -19,9 +39,35 @@ Page({ urls: urls // 需要预览的图片http链接列表 }) }, - onLoad(options) { - + handlePathographyListDelte(){ + let id=this.data.pathography_id + pathographyListDelte(id).then(data=>{ + wx.showToast({ + title: '删除成功', + icon:'none' + }) + }); + wx.navigateBack(); }, + handlepathographyDetail(id){ + pathographyDetail(id).then(data=>{ + this.setData({ + sickInfo:data + }) + }) + }, + onLoad(options) { + if(options.pathography_id){ + this.setData({ + pathography_id:options.pathography_id + }) + this.handlepathographyDetail(options.pathography_id); + }; + if(options.index){ + this.setData({ + index:options.index + }) + } /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/sickDetail/sickDetail.json b/pages/sickDetail/sickDetail.json index d90a5d7..7b79826 100644 --- a/pages/sickDetail/sickDetail.json +++ b/pages/sickDetail/sickDetail.json @@ -1,6 +1,7 @@ { "usingComponents": { "nav":"../../components/nav/nav", + "dialog":"../../components/dialog/dialog", "van-icon": "@vant/weapp/icon/index" }, "navigationStyle":"custom", diff --git a/pages/sickDetail/sickDetail.wxml b/pages/sickDetail/sickDetail.wxml index 267a923..792d1cb 100644 --- a/pages/sickDetail/sickDetail.wxml +++ b/pages/sickDetail/sickDetail.wxml @@ -1,130 +1,141 @@ + - 第一份病例 - 填写时间：2022-12-20 + 第{{index}}份病例 + 填写时间：{{filters.transforDay(sickInfo.created_at,"date")}} - + 基础信息 - 贺俊青 - 男｜30岁 + {{sickInfo.name}} + 男女未知｜{{sickInfo.age}}岁 - - 身高：170cm - 体重：170cm - 民族：170cm - 民族：170cm - 民族：170cm + + 身高：{{sickInfo.height}}cm + 体重：{{sickInfo.weight}}kg + + 民族：{{sickInfo.nation_name}} + 职业：{{sickInfo.job_name}} + 婚姻：未婚已婚离异 - + 所患疾病： - 肝炎 + {{sickInfo.disease_class_name}} - + 确诊日期： - 肝炎 + {{sickInfo.diagnosis_date}} - + 确诊医院： - 肝炎 + {{sickInfo.diagnosis_hospital}} - + 正在服用的药品信息： - 肝炎 + {{sickInfo.is_take_medicine==1?'有':'无'}} - 详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.drugs_name}}; - + 病情描述： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.disease_desc}} - + 用药意向： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + + {{item}}; + - + 复诊凭证（病例/处方单/检查报告/住院单) - + - + 其他信息 - + 过敏史： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.is_allergy_history==0?"无":sickInfo.allergy_history}} - + 家族史： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.is_family_history==0?"无":sickInfo.family_history}} - + 是否备孕、妊娠或者哺乳期： - 肝炎 + {{sickInfo.is_pregnant==0?"无":'是'}} - 详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.pregnant}} - + 饮酒史： - 肝炎 + {{sickInfo.drink_wine_status==1?'从不':sickInfo.drink_wine_status==2?'偶尔':sickInfo.drink_wine_status==3?'经常':sickInfo.drink_wine_status==4?'每天':sickInfo.drink_wine_status==5?'已戒酒':'其他'}} - + 吸烟史： - 肝炎 + {{sickInfo.smoke_status==1?'从不':sickInfo.smoke_status==2?'偶尔':sickInfo.smoke_status==3?'经常':sickInfo.smoke_status==4?'每天':sickInfo.smoke_status==5?'已戒烟':'其他'}} - + 手术史： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.is_operation==0?'否':sickInfo.operation}} - + 接触化学物： - 肝炎 + {{sickInfo.chemical_compound_status==1?'从不':sickInfo.chemical_compound_status==2?'偶尔':sickInfo.chemical_compound_status==3?'经常':sickInfo.chemical_compound_status==4?'每天':'其他'}} - 详细描述：阿托伐他汀钙片8片 （用法用量 + {{sickInfo.chemical_compound_describe}} - + 处方信息 - + 诊断： - 肝炎 + {{sickInfo.order_prescription.icd_name}} 时间： - 肝炎 + {{sickInfo.order_prescription.doctor_created_time}} 药品： - 肝炎详细描述：阿托伐他汀钙片8片 （用法用量详细描述：阿托伐他汀钙片8片 （用法用量 + + {{item.product_name}}{{item.product_spec}}; + + + + 医嘱： + {{sickInfo.order_prescription.doctor_advice}} + \ No newline at end of file diff --git a/pages/sickManage/sickManage.js b/pages/sickManage/sickManage.js index 3011869..cb5eef4 100644 --- a/pages/sickManage/sickManage.js +++ b/pages/sickManage/sickManage.js @@ -1,6 +1,6 @@ const app = getApp() -import {family} from "../../api/familyDoc" +import {pathographyGroup} from "../../api/sickRecord" import {throttle} from "../../utils/util" Page({ @@ -16,7 +16,7 @@ Page({ this.handleFamily(); }, handleFamily(){ - family().then(data=>{ + pathographyGroup().then(data=>{ this.setData({ isTriggered:false, list:data @@ -30,13 +30,13 @@ Page({ }, goInfo:throttle(function(){ app.method.navigateTo({ - url: '/pages/sickDetail/sickDetail', + url: '/pages/familyDoc/familyDoc', }) }), - goMember:throttle(function(event){ + goRecord:throttle(function(event){ let id=event.currentTarget.dataset.id; app.method.navigateTo({ - url: '/pages/memberDetail/memberDetail?family_id='+id, + url: '/pages/sickRecord/sickRecord?family_id='+id+"&showRadio=false", }) }), /** diff --git a/pages/sickManage/sickManage.wxml b/pages/sickManage/sickManage.wxml index 7943104..3b26407 100644 --- a/pages/sickManage/sickManage.wxml +++ b/pages/sickManage/sickManage.wxml @@ -4,17 +4,20 @@ - - {{item.card_name}}(男女未知，{{item.age}}岁) + + + {{item.name}}  男  女  未知｜{{item.age}}岁 + 共有{{item.count}}份病例 + - + 当前暂未添加任何家庭成员哦~ - 立即添加 + 添加家庭成员 diff --git a/pages/sickManage/sickManage.wxss b/pages/sickManage/sickManage.wxss index ef5bd8c..baea4f9 100644 --- a/pages/sickManage/sickManage.wxss +++ b/pages/sickManage/sickManage.wxss @@ -41,6 +41,7 @@ } .namecell{ + overflow: hidden; display: flex; margin:0 32rpx; height: 142rpx; @@ -93,4 +94,10 @@ color: #999999; } .img { padding:14rpx 29rpx; +} +.count{ + margin-top: 20rpx; + font-size: 24rpx; +font-weight: 400; +color: #666666; } \ No newline at end of file diff --git a/pages/sickRecord/sickRecord.js b/pages/sickRecord/sickRecord.js index 751e4c8..db2fd7f 100644 --- a/pages/sickRecord/sickRecord.js +++ b/pages/sickRecord/sickRecord.js @@ -14,6 +14,7 @@ Page({ message:'', page:1, currentId:'', + showRadio:true, isLock:false, per_page:10, img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static', @@ -48,10 +49,11 @@ Page({ title: '删除成功', icon:'none' }) - }) + this.handleRefresher(); + }); + }, onChange(event) { - this.setData({ radio: event.detail, }); @@ -108,10 +110,10 @@ Page({ url: '/pages/memberDetail/memberDetail', }) }), - goMember:throttle(function(event){ - let id=event.currentTarget.dataset.id; + goDetail:throttle(function(event){ + let {id,index}=event.currentTarget.dataset; app.method.navigateTo({ - url: '/pages/memberDetail/memberDetail?family_id='+id, + url: '/pages/sickDetail/sickDetail?pathography_id='+id+"&index="+index, }) }), /** @@ -121,6 +123,17 @@ Page({ this.setData({ family_id:options.family_id }) + + if(options.showRadio){ + this.setData({ + showRadio:false + }) + }else{ + this.setData({ + showRadio:true + }) + } + this.handleFamily(); }, /** @@ -137,7 +150,8 @@ Page({ this.setData({ img_host:app.hostConfig().imghost }); - this.handleFamily(); + + }, /** diff --git a/pages/sickRecord/sickRecord.wxml b/pages/sickRecord/sickRecord.wxml index d677d69..e81dd3b 100644 --- a/pages/sickRecord/sickRecord.wxml +++ b/pages/sickRecord/sickRecord.wxml @@ -7,8 +7,8 @@ - - + + {{item.created_at}} {{item.disease_class_name}} diff --git a/pages/writeSick/writeSick.js b/pages/writeSick/writeSick.js index 0c6f956..44054a3 100644 --- a/pages/writeSick/writeSick.js +++ b/pages/writeSick/writeSick.js @@ -160,6 +160,8 @@ Page({ // } } + }else{ + this.handleOnlineSick(this.data.family_id); } }, handleSetValue(data){ @@ -180,9 +182,16 @@ Page({ } for (const key in obj) { if (key != "product") { - this.setData({ - [key]: data[key] - }) + if(key=="is_taboo" && !data[key]){ + this.setData({ + [key]: null + }) + }else{ + this.setData({ + [key]: data[key] + }) + } + } };