diff --git a/api/api.js b/api/api.js index 20bc648..ad4a680 100644 --- a/api/api.js +++ b/api/api.js @@ -556,6 +556,21 @@ const api = { toAddNickname(data){ return request('/expertAPI/toAddNickname', data, 'post', false); }, + caseDetail(data){ + return request('/expertAPI/caseDetail', data, 'post', false); + }, + conditionRecordList(data){ + return request('/expertAPI/conditionRecordList', data, 'post', false); + }, + addConditionRecord(data){ + return request('/expertAPI/addConditionRecord', data, 'post', false); + }, + updateConditionRecord(data){ + return request('/expertAPI/upConditionRecord', data, 'post', false); + }, + deleteConditionRecord(data){ + return request('/expertAPI/delConditionRecord', data, 'post', false); + }, } export default api \ No newline at end of file diff --git a/package.json b/package.json index 9a8f25a..100d675 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,15 @@ "license": "ISC", "description": "", "dependencies": { + "@xkit-yx/im-store-v2": "^0.8.3", + "@xkit-yx/utils": "^0.7.2", "crypto-js": "^4.2.0", - "@xkit-yx/im-store-v2": "^0.8.3", - "@xkit-yx/utils": "^0.7.2", - "mobx": "^6.6.1", - "nim-web-sdk-ng": "^10.9.30", "dayjs": "^1.11.18", + "image-tools": "^1.4.0", "js-base64": "^3.7.8", "js-md5": "^0.8.3", + "mobx": "^6.6.1", + "nim-web-sdk-ng": "^10.9.30", "pinyin": "^4.0.0", "uview-plus": "^3.4.73" } diff --git a/pages.json b/pages.json index 9391cdd..b8f469b 100644 --- a/pages.json +++ b/pages.json @@ -606,6 +606,58 @@ } } }, + { + "path": "caseRecord/caseRecord", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "searchPatient/searchPatient", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + + { + "path": "visitPlan/visitPlan", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + + { + "path": "caseList/caseList", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, + { + "path": "checkRecord/checkRecord", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "uni-app分页", + "app": { + "bounce": "none" + } + } + }, { "path": "qikan/qikan", "style": { @@ -1011,6 +1063,7 @@ } } }, + { "path": "productDetail/productDetail", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 33dd49d..042dab4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -472,6 +472,11 @@ url='/pages_course/course/course' }else if(name=='积分商城'){ url='/pages_goods/pointMall/pointMall' + }else if(name=='我的福利'){ + url='/pages_app/myWelfare/myWelfare' + }else if(name=='专题e站'){ + const encoded = encodeURIComponent('https://wx.igandan.com/Esite/index.htm#/home?fromtype=doctor') + url=`/pages_app/webview/webview?url=${encoded}` }else{ url='/pages_app/myApplication/myApplication' } diff --git a/pages/my/my.vue b/pages/my/my.vue index 5f43b12..25c6169 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -215,12 +215,35 @@ + + + + + + + + + + 今天是我们相识的第{{signInfo.gdxzday}}天 + 本周共签到{{signInfo.totalDay}}次 + 已经连续签到{{signInfo.continuous_day}}天 + 连续签到获取更多积分 + + {{signInfo.news.summary}} + + + + + + + + \ No newline at end of file diff --git a/pages_app/caseRecord/caseRecord.vue b/pages_app/caseRecord/caseRecord.vue new file mode 100644 index 0000000..9efc496 --- /dev/null +++ b/pages_app/caseRecord/caseRecord.vue @@ -0,0 +1,460 @@ + + + + + \ No newline at end of file diff --git a/pages_app/checkRecord/checkRecord.vue b/pages_app/checkRecord/checkRecord.vue new file mode 100644 index 0000000..dbaa862 --- /dev/null +++ b/pages_app/checkRecord/checkRecord.vue @@ -0,0 +1,341 @@ + + + + + diff --git a/pages_app/patientDetail/patientDetail.vue b/pages_app/patientDetail/patientDetail.vue index dd9c257..bb51ebc 100644 --- a/pages_app/patientDetail/patientDetail.vue +++ b/pages_app/patientDetail/patientDetail.vue @@ -47,7 +47,7 @@ - + 描述 补充患者关键信息，方便随访患者 @@ -62,10 +62,22 @@ - 患者病史 - - {{ patientDetail.medicalHistoryContent }} - {{ showAllHistory ? '收起' : '展开全部' }} + + 患者病史 + + {{ patientDetail.medicalHistoryContent }} + {{ showAllHistory ? '收起' : '展开全部' }} + + + + + 检查报告 + + + {{ $u.timeFormat(item.createDate, 'yyyy-mm-dd') }} + {{ item.diseaseName }} + + @@ -116,8 +128,8 @@ // 计算属性：完整地址 const fullAddress = computed(() => { - const { provName, cityName, countyName, detailed_address } = patientInfo.value; - const addressParts = [provName, cityName, countyName, detailed_address].filter(Boolean); + const { provName, cityName, countyName } = patientInfo.value; + const addressParts = [provName, cityName, countyName].filter(Boolean); return addressParts.length > 0 ? addressParts.join('') : '未设置'; }); @@ -127,13 +139,29 @@ patient_uuid.value = options.uuid; }); const goBack = ()=> uni.navigateBack() - const editPatient = ()=> uni.showToast({ title:'编辑资料', icon:'none' }) - const openGroup = ()=> uni.showToast({ title:'分组', icon:'none' }) - const editDesc = ()=> uni.showToast({ title:'编辑描述', icon:'none' }) - const sendMessage = ()=>{ + const openCase = (uuid)=>{ navTo({ - url: '/pages_app/chat/chat?patient_uuid='+patient_uuid, + url:'/pages_app/checkRecord/checkRecord?uuid='+uuid }) + } + const editPatient = ()=> { + navTo({ + url:'/pages_app/patientSetting/patientSetting?uuid=' + patient_uuid.value + }) + } + const openGroup = ()=>{ + navTo({ + url:'/pages_app/patientRemark/patientRemark?uuid=' + patientInfo.value.uuid + }) + } + const editDesc = ()=> uni.showToast({ title:'编辑描述', icon:'none' }) + const sendMessage = async()=>{ + let userId=uni.getStorageSync('userInfo').uuid.toLowerCase(); + let conversationId=userId+'|1|'+patientInfo.value.uuid.toLowerCase(); + await uni.$UIKitStore.uiStore.selectConversation(conversationId) + navTo({ + url:'/pages_chat/chat/index' + }) }; const nickname = ref(''); const group = ref({}); @@ -186,17 +214,48 @@ getToAddNickname(); getPatientCard(); }); - const goMakePlan = ()=> uni.navigateTo({ url:'/pages_app/visit/visit' }) - const recordIllness = ()=> uni.showToast({ title:'记录病情', icon:'none' }) + const goMakePlan = ()=> { + navTo({ + url:'/pages_app/visitPlan/visitPlan' + }) + } + const recordIllness = ()=> { + navTo({ + url:'/pages_app/caseList/caseList?uuid='+patient_uuid.value + }) + } const toggleHistory = ()=> showAllHistory.value = !showAllHistory.value diff --git a/pages_app/selectPatient/selectPatient.vue b/pages_app/selectPatient/selectPatient.vue index eb7a750..0817e49 100644 --- a/pages_app/selectPatient/selectPatient.vue +++ b/pages_app/selectPatient/selectPatient.vue @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - {{ p.realName || '-' }} + {{ p.nickname || p.realName }} @@ -111,7 +111,9 @@ } } - const onSearch = () => {} + const onSearch = () => { + patientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1) + } const goBack = () => uni.navigateBack() const confirmSelect = () => { const payload = { ids: selectedIds.value, list: selectedDetail.value } diff --git a/pages_app/selectPatientSingle/selectPatientSingle.vue b/pages_app/selectPatientSingle/selectPatientSingle.vue index f616d18..e8e2d08 100644 --- a/pages_app/selectPatientSingle/selectPatientSingle.vue +++ b/pages_app/selectPatientSingle/selectPatientSingle.vue @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - {{ p.realName || '-' }} + {{ p.nickname || p.realName }} @@ -114,7 +114,9 @@ } } - const onSearch = () => {} + const onSearch = () => { + patientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1) + } const goBack = () => uni.navigateBack() const confirmSelect = (id) => { const payload =patientList.value.find(x => x.uuid === id) diff --git a/pages_app/visitPlan/visitPlan.vue b/pages_app/visitPlan/visitPlan.vue new file mode 100644 index 0000000..45603df --- /dev/null +++ b/pages_app/visitPlan/visitPlan.vue @@ -0,0 +1,209 @@ + + + + + + diff --git a/static/point_buy.png b/static/point_buy.png new file mode 100644 index 0000000..2b94ce8 Binary files /dev/null and b/static/point_buy.png differ