fix: 问题修复
This commit is contained in:
parent
4e22412ea0
commit
f97c59c7c0
@ -275,6 +275,6 @@
|
|||||||
],
|
],
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
"navigationBarTextStyle": "black",
|
"navigationBarTextStyle": "black",
|
||||||
"navigationBarTitleText": "海宁康华互联网医院"
|
"navigationBarTitleText": "海宁康华医院互联网医院"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -17,9 +17,9 @@
|
|||||||
</template>
|
</template>
|
||||||
<!-- 医院和科室信息 -->
|
<!-- 医院和科室信息 -->
|
||||||
<view class="doctor-info" :class="{ 'doctor-info--elder': elderMode }">
|
<view class="doctor-info" :class="{ 'doctor-info--elder': elderMode }">
|
||||||
<text class="doctor-hos" :class="{ 'doctor-hos--elder': elderMode }">海宁康华互联网医院</text>
|
<!-- <text class="doctor-hos" :class="{ 'doctor-hos--elder': elderMode }">海宁康华医院互联网医院</text> -->
|
||||||
<text v-if="consult.deptName" class="doctor-dept" :class="{ 'doctor-dept--elder': elderMode }">
|
<text v-if="consult.deptName" class="doctor-dept" :class="{ 'doctor-dept--elder': elderMode }">
|
||||||
| {{ consult.deptName }}
|
{{ consult.deptName }}
|
||||||
</text>
|
</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<view class="info-card">
|
<view class="info-card">
|
||||||
<view class="info-card__header">
|
<view class="info-card__header">
|
||||||
<image src="/static/icon-hospital.svg" class="icon-hospital" />
|
<image src="/static/icon-hospital.svg" class="icon-hospital" />
|
||||||
<view class="header-tip">海宁康华互联网医院</view>
|
<view class="header-tip">海宁康华医院互联网医院</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-card__content">
|
<view class="info-card__content">
|
||||||
<view class="doctor-name"> {{ order.doctorName }}</view>
|
<view class="doctor-name"> {{ order.doctorName }}</view>
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
<text class="doctor-title">{{ consult.doctorTitle }}</text>
|
<text class="doctor-title">{{ consult.doctorTitle }}</text>
|
||||||
</div>
|
</div>
|
||||||
<div class="doctor-info" style="margin-top: 10rpx;">
|
<div class="doctor-info" style="margin-top: 10rpx;">
|
||||||
<text class="doctor-hos">海宁康华互联网医院</text>
|
<text class="doctor-hos">海宁康华医院互联网医院</text>
|
||||||
<text v-if="consult.deptName" class="doctor-dept">| {{ consult.deptName }}</text>
|
<text v-if="consult.deptName" class="doctor-dept">| {{ consult.deptName }}</text>
|
||||||
</div>
|
</div>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -39,7 +39,7 @@
|
|||||||
<view v-else-if="type === 'protocol'" class="agreement">
|
<view v-else-if="type === 'protocol'" class="agreement">
|
||||||
一、协议说明
|
一、协议说明
|
||||||
<view></view>
|
<view></view>
|
||||||
1.1本协议是用户(以下简称“您”)与[海宁康华互联网医院](以下简称“我们”)之间关于使用海宁康华互联网医院支付宝小程序(以下简称“小程序”)所订立的协议。
|
1.1本协议是用户(以下简称“您”)与[海宁康华医院互联网医院](以下简称“我们”)之间关于使用海宁康华医院互联网医院支付宝小程序(以下简称“小程序”)所订立的协议。
|
||||||
请您在使用小程序前仔细阅读本协议。如您不同意本协议内容,请立即停止使用小程序;如您继续使用小程序,即视为您已阅读、理解并同意本协议的全部内容。
|
请您在使用小程序前仔细阅读本协议。如您不同意本协议内容,请立即停止使用小程序;如您继续使用小程序,即视为您已阅读、理解并同意本协议的全部内容。
|
||||||
<view></view>
|
<view></view>
|
||||||
1.2我们保留随时修改本协议的权利,修改后的协议将在小程序内发布并立即生效。如您继续使用小程序,视为接受修改后的协议。
|
1.2我们保留随时修改本协议的权利,修改后的协议将在小程序内发布并立即生效。如您继续使用小程序,视为接受修改后的协议。
|
||||||
@ -102,9 +102,9 @@
|
|||||||
<view></view>
|
<view></view>
|
||||||
8.1如本用户服务协议中的任何条款无论因何种原因完全或部分无效或不具有执行力,本用户服务协议的其余条款仍应有效并且具有约束力。
|
8.1如本用户服务协议中的任何条款无论因何种原因完全或部分无效或不具有执行力,本用户服务协议的其余条款仍应有效并且具有约束力。
|
||||||
<view></view>
|
<view></view>
|
||||||
8.2本协议的解释权归【海宁康华互联网医院】所有。
|
8.2本协议的解释权归【海宁康华医院互联网医院】所有。
|
||||||
<view></view>
|
<view></view>
|
||||||
感谢您使用海宁康华互联网医院支付宝小程序!
|
感谢您使用海宁康华医院互联网医院支付宝小程序!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<text :class="{ 'title--elder': elderMode }">{{ i.title }}</text>
|
<text :class="{ 'title--elder': elderMode }">{{ i.title }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
||||||
<text :class="{ 'hospital--elder': elderMode }">海宁康华互联网医院</text>
|
<text :class="{ 'hospital--elder': elderMode }">海宁康华医院互联网医院</text>
|
||||||
<text v-if="i.deptName" :class="{ 'dept--elder': elderMode }"> | {{ i.deptName }}</text>
|
<text v-if="i.deptName" :class="{ 'dept--elder': elderMode }"> | {{ i.deptName }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -154,6 +154,7 @@ const displayDrugs = ref([])
|
|||||||
const visible = ref(false);
|
const visible = ref(false);
|
||||||
|
|
||||||
const { order, repeatDrugs, ybVisitRecord, inappropriateDrugs, formatDrugs } = storeToRefs(orderStore());
|
const { order, repeatDrugs, ybVisitRecord, inappropriateDrugs, formatDrugs } = storeToRefs(orderStore());
|
||||||
|
const { autoFillDisease } = orderStore();
|
||||||
const { storeId } = useUser();
|
const { storeId } = useUser();
|
||||||
const waiting = ref(false);
|
const waiting = ref(false);
|
||||||
const orderId = ref("");
|
const orderId = ref("");
|
||||||
@ -178,7 +179,8 @@ function changeDrug(drug) {
|
|||||||
if (index >= 0) {
|
if (index >= 0) {
|
||||||
order.value.drugs.splice(index, 1, drug)
|
order.value.drugs.splice(index, 1, drug)
|
||||||
} else if (drug && drug._id) {
|
} else if (drug && drug._id) {
|
||||||
order.value.drugs.push(drug)
|
order.value.drugs.push(drug);
|
||||||
|
autoFillDisease([drug._id]);
|
||||||
}
|
}
|
||||||
showEditPopup.value = false
|
showEditPopup.value = false
|
||||||
}
|
}
|
||||||
@ -216,7 +218,7 @@ function importHistory() {
|
|||||||
uni.navigateTo({ url: '/pages/consult/history-drugs/history-drugs' })
|
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}` })
|
uni.navigateTo({ url: `/pages/consult/select-drug/select-drug?code=${code}` })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -95,6 +95,7 @@ const { elderMode, elderClass, elderVarStyle } = useElder();
|
|||||||
const proofTipText = '*购买该药品需上传用药证明';
|
const proofTipText = '*购买该药品需上传用药证明';
|
||||||
|
|
||||||
const { order } = storeToRefs(orderStore());
|
const { order } = storeToRefs(orderStore());
|
||||||
|
const { autoFillDisease } = orderStore();
|
||||||
const keyword = ref('');
|
const keyword = ref('');
|
||||||
const drugs = ref([]);
|
const drugs = ref([]);
|
||||||
const editDrug = ref({})
|
const editDrug = ref({})
|
||||||
@ -219,7 +220,11 @@ function clear() {
|
|||||||
const confirm = useDebounce(_confirm, 1000);
|
const confirm = useDebounce(_confirm, 1000);
|
||||||
function _confirm() {
|
function _confirm() {
|
||||||
if (drugs.value.length) {
|
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 }))
|
order.value.drugs = drugs.value.map(i => ({ ...i }))
|
||||||
|
autoFillDisease(newDrugIds);
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
} else {
|
} else {
|
||||||
toast('请添加药品')
|
toast('请添加药品')
|
||||||
|
|||||||
@ -8,10 +8,10 @@
|
|||||||
<view class="p-10 rounded mb-10 content-bg">
|
<view class="p-10 rounded mb-10 content-bg">
|
||||||
<scroll-view class="content-scroll">
|
<scroll-view class="content-scroll">
|
||||||
<view class="text-base leading-normal">
|
<view class="text-base leading-normal">
|
||||||
您正在使用海宁康华互联网医院在线诊疗服务平台。
|
您正在使用海宁康华医院互联网医院在线诊疗服务平台。
|
||||||
</view>
|
</view>
|
||||||
<view class="pt-5 text-base leading-normal">
|
<view class="pt-5 text-base leading-normal">
|
||||||
接下来的问诊、开方服务将由海宁康华互联网医院的注册医师提供,药店工作人员仅提供操作辅助。
|
接下来的问诊、开方服务将由海宁康华医院互联网医院的注册医师提供,药店工作人员仅提供操作辅助。
|
||||||
</view>
|
</view>
|
||||||
<view class="pt-5 text-base leading-normal">
|
<view class="pt-5 text-base leading-normal">
|
||||||
请确认您已了解并同意上述安排。
|
请确认您已了解并同意上述安排。
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
<view class="back-button" @click="goBack">
|
<view class="back-button" @click="goBack">
|
||||||
<view class="back-arrow"></view>
|
<view class="back-arrow"></view>
|
||||||
</view>
|
</view>
|
||||||
<text class="hospital-name">海宁康华互联网医院</text>
|
<text class="hospital-name">海宁康华医院互联网医院</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,11 @@
|
|||||||
<text class="item-label">证件类型</text>
|
<text class="item-label">证件类型</text>
|
||||||
<text class="item-value">身份证</text>
|
<text class="item-value">身份证</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-item">
|
<view v-if="isYbQrcode" class="info-item">
|
||||||
|
<text class="item-label">证件号</text>
|
||||||
|
<text class="item-value">{{ maskCertNo }}</text>
|
||||||
|
</view>
|
||||||
|
<view v-else class="info-item">
|
||||||
<text class="item-label">证件号</text>
|
<text class="item-label">证件号</text>
|
||||||
<input v-model="form.certNo" :maxlength="18" class="item-value" type="idcard"
|
<input v-model="form.certNo" :maxlength="18" class="item-value" type="idcard"
|
||||||
placeholder="请输入证件号" />
|
placeholder="请输入证件号" />
|
||||||
@ -99,6 +103,15 @@ const canDelete = computed(() => (
|
|||||||
&& loadedPatientKey.value === `${accountId.value}:${id.value}`
|
&& loadedPatientKey.value === `${accountId.value}:${id.value}`
|
||||||
&& loadedPatientIsSelf.value === false
|
&& 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() {
|
function validateForm() {
|
||||||
if (!form.value.name.trim()) {
|
if (!form.value.name.trim()) {
|
||||||
@ -322,9 +335,15 @@ onLoad(options => {
|
|||||||
id.value = options.id || '';
|
id.value = options.id || '';
|
||||||
type.value = options.type || '';
|
type.value = options.type || '';
|
||||||
feeType.value = options.feeType || '';
|
feeType.value = options.feeType || '';
|
||||||
uni.setNavigationBarTitle({
|
if (type.value === 'ybQrcode') {
|
||||||
title: isYbQrcode.value ? '医保建档' : (id.value ? '编辑就诊人' : '新增就诊人'),
|
uni.setNavigationBarTitle({
|
||||||
});
|
title: '医保授权身份确认',
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
uni.setNavigationBarTitle({
|
||||||
|
title: isYbQrcode.value ? '医保建档' : (id.value ? '编辑就诊人' : '新增就诊人'),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const savedElderMode = uni.getStorageSync('elderMode');
|
const savedElderMode = uni.getStorageSync('elderMode');
|
||||||
if (savedElderMode !== null && savedElderMode !== undefined) {
|
if (savedElderMode !== null && savedElderMode !== undefined) {
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<text class="title" :class="{ 'title--elder': elderMode }">{{ order.title }}</text>
|
<text class="title" :class="{ 'title--elder': elderMode }">{{ order.title }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
||||||
<text class="hospital" :class="{ 'hospital--elder': elderMode }">海宁康华互联网医院</text>
|
<text class="hospital" :class="{ 'hospital--elder': elderMode }">海宁康华医院互联网医院</text>
|
||||||
<text v-if="order.deptName" class="dept" :class="{ 'dept--elder': elderMode }"> | {{ order.deptName }}</text>
|
<text v-if="order.deptName" class="dept" :class="{ 'dept--elder': elderMode }"> | {{ order.deptName }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
<text :class="{ 'title-text--elder': elderMode }">{{ order.doctorTitle }}</text>
|
<text :class="{ 'title-text--elder': elderMode }">{{ order.doctorTitle }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
<view class="info-row" :class="{ 'info-row--elder': elderMode }">
|
||||||
<text :class="{ 'hospital-text--elder': elderMode }">海宁康华互联网医院</text>
|
<text :class="{ 'hospital-text--elder': elderMode }">海宁康华医院互联网医院</text>
|
||||||
<text v-if="order.deptName" :class="{ 'dept-text--elder': elderMode }"> | {{ order.deptName }}</text>
|
<text v-if="order.deptName" :class="{ 'dept-text--elder': elderMode }"> | {{ order.deptName }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -3,13 +3,13 @@
|
|||||||
<view v-if="data" class="relative prescription-container">
|
<view v-if="data" class="relative prescription-container">
|
||||||
<view class="header">
|
<view class="header">
|
||||||
<view class="row">
|
<view class="row">
|
||||||
<view class="company">海宁康华互联网医院</view>
|
<view class="company">海宁康华医院互联网医院</view>
|
||||||
<view class="prescription-type">
|
<view class="prescription-type">
|
||||||
<view>普通</view>
|
<view>普通</view>
|
||||||
<view>处方</view>
|
<view>处方</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="hospital">海宁康华互联网处方笺</view>
|
<view class="hospital">海宁康华医院互联网医院处方笺</view>
|
||||||
<view class="sub-header">
|
<view class="sub-header">
|
||||||
<span class="no">NO:{{ data.medOrgOrderNo }}</span>
|
<span class="no">NO:{{ data.medOrgOrderNo }}</span>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import userStore from "./user";
|
|||||||
import { toast } from "@/utils/widget";
|
import { toast } from "@/utils/widget";
|
||||||
const orderSource = 'ALIPAY_MINI';
|
const orderSource = 'ALIPAY_MINI';
|
||||||
const hospitalId = process.env.HOSPITAL_ID;
|
const hospitalId = process.env.HOSPITAL_ID;
|
||||||
|
import { getDrugMatchedDisease } from "@/utils/api";
|
||||||
|
|
||||||
const FeeType = ['YB', 'ZF'];
|
const FeeType = ['YB', 'ZF'];
|
||||||
|
|
||||||
@ -269,6 +270,16 @@ export default defineStore("orderStore", () => {
|
|||||||
order.value.pastHistoryStr = pastHistoryStr.value;
|
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(
|
watch(
|
||||||
pastHistoryStr,
|
pastHistoryStr,
|
||||||
(n) => {
|
(n) => {
|
||||||
@ -299,5 +310,6 @@ export default defineStore("orderStore", () => {
|
|||||||
reuse,
|
reuse,
|
||||||
inappropriateDrugs,
|
inappropriateDrugs,
|
||||||
repeatDrugs,
|
repeatDrugs,
|
||||||
|
autoFillDisease
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|||||||
10
utils/api.js
10
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 }) {
|
export async function getStoreSimilarDrugInfo({ accountId, patientId, patientName, phone, drugs }) {
|
||||||
return await request({
|
return await request({
|
||||||
url: "/getYoucanData/hlw",
|
url: "/getYoucanData/hlw",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user