diff --git a/pages.json b/pages.json index 411b3d0..2f527c0 100644 --- a/pages.json +++ b/pages.json @@ -275,6 +275,6 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "海宁康华互联网医院" + "navigationBarTitleText": "海宁康华医院互联网医院" } } \ No newline at end of file diff --git a/pages/chat/consult-head.vue b/pages/chat/consult-head.vue index ae4998a..d39b0d9 100644 --- a/pages/chat/consult-head.vue +++ b/pages/chat/consult-head.vue @@ -17,9 +17,9 @@ - 海宁康华互联网医院 + - | {{ consult.deptName }} + {{ consult.deptName }} diff --git a/pages/chat/info-window.vue b/pages/chat/info-window.vue index 2c4d95a..3bb18aa 100644 --- a/pages/chat/info-window.vue +++ b/pages/chat/info-window.vue @@ -3,7 +3,7 @@ - 海宁康华互联网医院 + 海宁康华医院互联网医院 {{ order.doctorName }} diff --git a/pages/components/consult-head.vue b/pages/components/consult-head.vue index d4870a7..b4fa602 100644 --- a/pages/components/consult-head.vue +++ b/pages/components/consult-head.vue @@ -6,7 +6,7 @@ {{ consult.doctorTitle }}
- 海宁康华互联网医院 + 海宁康华医院互联网医院 | {{ consult.deptName }}
diff --git a/pages/consult/agreement.vue b/pages/consult/agreement.vue index 45914ab..bdbb2c5 100644 --- a/pages/consult/agreement.vue +++ b/pages/consult/agreement.vue @@ -39,7 +39,7 @@ 一、协议说明 - 1.1本协议是用户（以下简称“您”）与[海宁康华互联网医院]（以下简称“我们”）之间关于使用海宁康华互联网医院支付宝小程序（以下简称“小程序”）所订立的协议。 + 1.1本协议是用户（以下简称“您”）与[海宁康华医院互联网医院]（以下简称“我们”）之间关于使用海宁康华医院互联网医院支付宝小程序（以下简称“小程序”）所订立的协议。 请您在使用小程序前仔细阅读本协议。如您不同意本协议内容，请立即停止使用小程序；如您继续使用小程序，即视为您已阅读、理解并同意本协议的全部内容。 1.2我们保留随时修改本协议的权利，修改后的协议将在小程序内发布并立即生效。如您继续使用小程序，视为接受修改后的协议。 @@ -102,9 +102,9 @@ 8.1如本用户服务协议中的任何条款无论因何种原因完全或部分无效或不具有执行力，本用户服务协议的其余条款仍应有效并且具有约束力。 - 8.2本协议的解释权归【海宁康华互联网医院】所有。 + 8.2本协议的解释权归【海宁康华医院互联网医院】所有。 - 感谢您使用海宁康华互联网医院支付宝小程序！ + 感谢您使用海宁康华医院互联网医院支付宝小程序！ diff --git a/pages/consult/doctor-list.vue b/pages/consult/doctor-list.vue index 55710b3..907906d 100644 --- a/pages/consult/doctor-list.vue +++ b/pages/consult/doctor-list.vue @@ -23,7 +23,7 @@ {{ i.title }} - 海宁康华互联网医院 + 海宁康华医院互联网医院 | {{ i.deptName }} diff --git a/pages/consult/info.vue b/pages/consult/info.vue index f4c9b8e..2368f61 100644 --- a/pages/consult/info.vue +++ b/pages/consult/info.vue @@ -154,6 +154,7 @@ const displayDrugs = ref([]) const visible = ref(false); const { order, repeatDrugs, ybVisitRecord, inappropriateDrugs, formatDrugs } = storeToRefs(orderStore()); +const { autoFillDisease } = orderStore(); const { storeId } = useUser(); const waiting = ref(false); const orderId = ref(""); @@ -178,7 +179,8 @@ function changeDrug(drug) { if (index >= 0) { order.value.drugs.splice(index, 1, drug) } else if (drug && drug._id) { - order.value.drugs.push(drug) + order.value.drugs.push(drug); + autoFillDisease([drug._id]); } showEditPopup.value = false } @@ -216,7 +218,7 @@ function importHistory() { uni.navigateTo({ url: '/pages/consult/history-drugs/history-drugs' }) } -function toAddDrug(code ='') { +function toAddDrug(code = '') { uni.navigateTo({ url: `/pages/consult/select-drug/select-drug?code=${code}` }) } diff --git a/pages/consult/select-drug/select-drug.vue b/pages/consult/select-drug/select-drug.vue index 84ccc84..098baf4 100644 --- a/pages/consult/select-drug/select-drug.vue +++ b/pages/consult/select-drug/select-drug.vue @@ -95,6 +95,7 @@ const { elderMode, elderClass, elderVarStyle } = useElder(); const proofTipText = '*购买该药品需上传用药证明'; const { order } = storeToRefs(orderStore()); +const { autoFillDisease } = orderStore(); const keyword = ref(''); const drugs = ref([]); const editDrug = ref({}) @@ -219,7 +220,11 @@ function clear() { const confirm = useDebounce(_confirm, 1000); function _confirm() { if (drugs.value.length) { + const preDrugIds = order.value.drugs.map(i => i._id); + const drugIds = drugs.value.map(i => i._id); + const newDrugIds = drugIds.filter(i => !preDrugIds.includes(i)); order.value.drugs = drugs.value.map(i => ({ ...i })) + autoFillDisease(newDrugIds); uni.navigateBack() } else { toast('请添加药品') diff --git a/pages/home/agreenment-popup.vue b/pages/home/agreenment-popup.vue index 10dd6b0..05719e9 100644 --- a/pages/home/agreenment-popup.vue +++ b/pages/home/agreenment-popup.vue @@ -8,10 +8,10 @@ - 您正在使用海宁康华互联网医院在线诊疗服务平台。 + 您正在使用海宁康华医院互联网医院在线诊疗服务平台。 - 接下来的问诊、开方服务将由海宁康华互联网医院的注册医师提供，药店工作人员仅提供操作辅助。 + 接下来的问诊、开方服务将由海宁康华医院互联网医院的注册医师提供，药店工作人员仅提供操作辅助。 请确认您已了解并同意上述安排。 diff --git a/pages/home/home.vue b/pages/home/home.vue index 996bedf..a4c7e92 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -9,7 +9,7 @@ - 海宁康华互联网医院 + 海宁康华医院互联网医院 diff --git a/pages/member/detail.vue b/pages/member/detail.vue index 877b902..9ada6f9 100644 --- a/pages/member/detail.vue +++ b/pages/member/detail.vue @@ -15,7 +15,11 @@ 证件类型 身份证 - + + 证件号 + {{ maskCertNo }} + + 证件号 @@ -99,6 +103,15 @@ const canDelete = computed(() => ( && loadedPatientKey.value === `${accountId.value}:${id.value}` && loadedPatientIsSelf.value === false )); +const maskCertNo = computed(() => { + if (isYbQrcode.value && form.value.certNo) { + const pre = form.value.certNo.slice(0, 4); + const post = form.value.certNo.slice(-4); + return `${pre}****${post}`; + } + return ''; +}); + function validateForm() { if (!form.value.name.trim()) { @@ -322,9 +335,15 @@ onLoad(options => { id.value = options.id || ''; type.value = options.type || ''; feeType.value = options.feeType || ''; - uni.setNavigationBarTitle({ - title: isYbQrcode.value ? '医保建档' : (id.value ? '编辑就诊人' : '新增就诊人'), - }); + if (type.value === 'ybQrcode') { + uni.setNavigationBarTitle({ + title: '医保授权身份确认', + }); + } else { + uni.setNavigationBarTitle({ + title: isYbQrcode.value ? '医保建档' : (id.value ? '编辑就诊人' : '新增就诊人'), + }); + } const savedElderMode = uni.getStorageSync('elderMode'); if (savedElderMode !== null && savedElderMode !== undefined) { diff --git a/pages/record/disease-summary.vue b/pages/record/disease-summary.vue index 0992946..ba1a720 100644 --- a/pages/record/disease-summary.vue +++ b/pages/record/disease-summary.vue @@ -7,7 +7,7 @@ {{ order.title }} - 海宁康华互联网医院 + 海宁康华医院互联网医院 | {{ order.deptName }} diff --git a/pages/record/order-detail.vue b/pages/record/order-detail.vue index abe3ebd..3cf356b 100644 --- a/pages/record/order-detail.vue +++ b/pages/record/order-detail.vue @@ -12,7 +12,7 @@ {{ order.doctorTitle }} - 海宁康华互联网医院 + 海宁康华医院互联网医院 | {{ order.deptName }} diff --git a/pages/record/rx-paper.vue b/pages/record/rx-paper.vue index 9bb522a..33bf03f 100644 --- a/pages/record/rx-paper.vue +++ b/pages/record/rx-paper.vue @@ -3,13 +3,13 @@ - 海宁康华互联网医院 + 海宁康华医院互联网医院 普通 处方 - 海宁康华互联网处方笺 + 海宁康华医院互联网医院处方笺 NO:{{ data.medOrgOrderNo }} diff --git a/store/order.js b/store/order.js index 05510eb..bda2e63 100644 --- a/store/order.js +++ b/store/order.js @@ -5,6 +5,7 @@ import userStore from "./user"; import { toast } from "@/utils/widget"; const orderSource = 'ALIPAY_MINI'; const hospitalId = process.env.HOSPITAL_ID; +import { getDrugMatchedDisease } from "@/utils/api"; const FeeType = ['YB', 'ZF']; @@ -269,6 +270,16 @@ export default defineStore("orderStore", () => { order.value.pastHistoryStr = pastHistoryStr.value; } + async function autoFillDisease(drugIds) { + if (drugIds.length === 0) { + return; + } + const res = await getDrugMatchedDisease({ drugIds }); + const diseases = res && Array.isArray(res.list) ? res.list.filter(i=> typeof i === "string" && i.trim()) : []; + const newDiseases = diseases.filter(i => !order.value.diseases.includes(i)); + order.value.diseases = [...order.value.diseases, ...newDiseases]; + } + watch( pastHistoryStr, (n) => { @@ -299,5 +310,6 @@ export default defineStore("orderStore", () => { reuse, inappropriateDrugs, repeatDrugs, + autoFillDisease }; }); diff --git a/utils/api.js b/utils/api.js index 6601a19..3037270 100644 --- a/utils/api.js +++ b/utils/api.js @@ -752,6 +752,16 @@ export async function getOnlineSimilarDrugInfo({ accountId, patientId, patientNa }); } +export async function getDrugMatchedDisease({ drugIds }) { + return await request({ + url: "/getYoucanData/hlw", + data: { + type: "getDrugMatchedDisease", + drugIds + }, + }); +} + export async function getStoreSimilarDrugInfo({ accountId, patientId, patientName, phone, drugs }) { return await request({ url: "/getYoucanData/hlw",