diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index bc0bb29..56a5e87 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -15,7 +15,7 @@ diff --git a/api/doctorOrder.js b/api/doctorOrder.js new file mode 100644 index 0000000..f59e6ed --- /dev/null +++ b/api/doctorOrder.js @@ -0,0 +1,19 @@ +import { + req +} from '@/common/js/index.js'; + + + +// 添加西药-全部西药列表 +/** + * @param {Object} data + * 参数名称 必须 参数类型 说明 + */ +export function doctorOrderCommonList(data) { + return req.request({ + url: '/newApi/doctor-order/common-list', + method: 'get', + data + }) +} + diff --git a/common/js/common.js b/common/js/common.js index d5f3ad8..cea80f3 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -1,9 +1,16 @@ +import {config} from "@/common/js/index"; - export async function requestConfig(ins, options, successHandler = null, failHandler = null, completeHandler = null){ +export async function requestConfig(ins, options, successHandler = null, failHandler = null, completeHandler = null){ + //原来是：ins.baseUrl = options.baseUrl || ins.baseUrl + let baseUrl = options.baseUrl || ins.baseUrl; + if (options.url.split('/').indexOf('newApi') !== -1) { + // baseUrl = "http://127.0.0.1:18001/api/doctor/" + baseUrl = "https://api.xiaokang88.com/api/doctor/" + } + options.url = options.url.replace('/oldApi/', ''); + options.url = options.url.replace('/newApi/', ''); // base ins.header = options.header || ins.header - //原来是：ins.baseUrl = options.baseUrl || ins.baseUrl - let baseUrl = options.baseUrl || ins.baseUrl; // config base let config = { url:`${baseUrl}${options.url?options.url:''}`, @@ -13,7 +20,7 @@ let _cg = null // 合并请求拦截器配置 try { - _cg = await ins.requestInterceptor(Object.assign({}, options, config)) + _cg = await ins.requestInterceptor(Object.assign({}, options, config)) } catch (e){ return false } @@ -47,7 +54,7 @@ } return config } - + function _isPromise(obj) { return obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function' } diff --git a/common/js/index.js b/common/js/index.js index d00ec6f..6a0edf5 100644 --- a/common/js/index.js +++ b/common/js/index.js @@ -1,12 +1,10 @@ import Request from './request.js'; import errorCode from './errorCode.js'; import {Base64} from "js-base64"; -let protocol = 'https'; //协议 -let baseUrl = 'app.xiaokang88.com/service/v1/'; // 域名 -// let protocol = 'http'; //协议 -// let baseUrl = 'www.xk888.com/service/v1/'; // 域名 +let baseUrl = 'https://app.xiaokang88.com/service/v1/'; // 域名 +// let baseUrl = 'http://www.xk888.com/service/v1/'; // 域名 export const config = { - baseUrl: `${protocol}://${baseUrl}` + baseUrl: baseUrl } const arr = [ diff --git a/pages/my/prescriptionDetail.vue b/pages/my/prescriptionDetail.vue index 750df26..d1379a8 100644 --- a/pages/my/prescriptionDetail.vue +++ b/pages/my/prescriptionDetail.vue @@ -107,6 +107,9 @@ 共 {{item.dosage}} 剂 + + 包装方式：{{item.process_rule}} + @@ -661,7 +664,7 @@ font-weight: 400; color: #31353D; } - + image { width: 82rpx; height: 62rpx; @@ -774,4 +777,4 @@ color: #fff; border-radius: 12rpx; } - \ No newline at end of file + diff --git a/subPackages/sub_my/my_diagnose_common.vue b/subPackages/sub_my/my_diagnose_common.vue index fb1a5ec..11d75a1 100644 --- a/subPackages/sub_my/my_diagnose_common.vue +++ b/subPackages/sub_my/my_diagnose_common.vue @@ -8,6 +8,13 @@ {{item.content}} + + + + + + + @@ -17,10 +24,10 @@ 删除医嘱 添加医嘱 - - 暂不删除 - 删除医嘱 - + + + + @@ -43,6 +50,7 @@ addDiagnoseCommon, deleteDiagnoseCommon } from "@/api/all.js"; + import {doctorOrderCommonList} from "@/api/doctorOrder"; export default { data() { @@ -55,6 +63,7 @@ current: 0, keyword: "", list: [], + commonList: [], oldList: [], }; }, @@ -169,6 +178,14 @@ uni.hideLoading(); this.loading2 = false; }); + doctorOrderCommonList({store_id: uni.getStorageSync('store_id') || 11001,}) + .then((res) => { + if (res.code === 0) { + this.commonList = res.result; + } else { + this.$toast(res.msg); + } + }) }, chang(c) { @@ -334,4 +351,4 @@ height: 28rpx; } } - \ No newline at end of file + diff --git a/subPackages/sub_pharmacist/myrecord-detail.vue b/subPackages/sub_pharmacist/myrecord-detail.vue index d4882a7..f5552c1 100644 --- a/subPackages/sub_pharmacist/myrecord-detail.vue +++ b/subPackages/sub_pharmacist/myrecord-detail.vue @@ -27,7 +27,7 @@ 开具日期：{{infoList.created_at}}} - + @@ -56,7 +56,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -81,14 +81,14 @@ - + Rp - + @@ -107,11 +107,14 @@ 共 {{item.dosage}} 剂 + + 包装方式：{{item.process_rule}} + - - + + @@ -127,9 +130,9 @@ - + - + @@ -144,7 +147,7 @@ 处方开具已完毕 - + @@ -173,13 +176,13 @@ - + 价格 ￥{{infoList.total_pay_price}} - - + + @@ -203,7 +206,7 @@ 温馨提示：请遵医嘱服药！处方{{lists.valid_hours}}小时有效！ - + \ No newline at end of file + diff --git a/subPackages/sub_workbench/workbench_recipe/addType2.vue b/subPackages/sub_workbench/workbench_recipe/addType2.vue index 6319902..abd8d7d 100644 --- a/subPackages/sub_workbench/workbench_recipe/addType2.vue +++ b/subPackages/sub_workbench/workbench_recipe/addType2.vue @@ -96,12 +96,22 @@ 自调剂 - 委托调剂 + 委托调剂 - + - + + + + + + {{ mParms.process_rule_id1 !== '' ? getPackageMethodName() : '选择包法' }} + + + + + @@ -203,6 +213,16 @@ isFresh: false, ruleRemarkList: [], ruleList: [], + package_method: [ + { + id: 1, + name: '味包' + }, + { + id: 2, + name: '剂包' + }, + ], ruleSecList: [], priceChines: '', mParms: { @@ -246,7 +266,8 @@ }, idx: 0, useWay: [], - see_rate:uni.getStorageSync('see_rate') + see_rate:uni.getStorageSync('see_rate'), + packageMethodSelect: '' } }, computed: { @@ -254,14 +275,14 @@ let prices = 0; let arr = this.mInfo let nub=this.mParms.dosage - + if (arr) { prices = arr.reduce((total, item) => { total += Number(item.price * item.number) return total }, 0); prices = prices > 0 ? (prices*nub).toFixed(4) : prices - } + } console.log(3333333) return prices }, @@ -393,6 +414,15 @@ } this.getRuleList(this.ruleList[e.detail.value].id) }, + getPackageMethodName() { + if (this.mParms.process_rule_id1) { + return this.package_method.find(item => item.id == this.mParms.process_rule_id1).name + } + }, + changePackageMethod(e) { + this.mParms.process_rule_id1 = this.package_method[e.detail.value].id + this.packageMethodSelect = e.detail.value + }, changeRuleNote(e) { this.mParms = { ...this.mParms, @@ -443,7 +473,7 @@ // }) // return // } - + // volume // if (!mParms.volume ||mParms.volume>280||mParms.volume<50 ) { // uni.showModal({ @@ -460,7 +490,7 @@ return g }, 0) mParms.directions = (mParms.process_rule_type ? '代煎' : '外配') + '，共' + mParms - .dosage + '剂' + '，每剂' + mInfo.length + '味' + .dosage + '剂' + '，每剂' + mInfo.length + '味' api({ ...mParms, process_rule_id: mParms.process_rule_type == 0 ? 0 : this.ruleSecList[mParms.process_rule_id].id, @@ -938,7 +968,7 @@ .color0 { color: #000 !important; } - + .color { color: #FC3636 !important; } @@ -973,4 +1003,4 @@ color: #A7ABB0; text-align-last: justify; } - \ No newline at end of file + diff --git a/subPackages/sub_workbench/workbench_recipe/components/add-setUsage.vue b/subPackages/sub_workbench/workbench_recipe/components/add-setUsage.vue index 6f6fa1c..f8cc1a6 100644 --- a/subPackages/sub_workbench/workbench_recipe/components/add-setUsage.vue +++ b/subPackages/sub_workbench/workbench_recipe/components/add-setUsage.vue @@ -169,8 +169,8 @@ - - + + diff --git a/subPackages/sub_workbench/workbench_recipe/index.vue b/subPackages/sub_workbench/workbench_recipe/index.vue index 512c591..9dbff41 100644 --- a/subPackages/sub_workbench/workbench_recipe/index.vue +++ b/subPackages/sub_workbench/workbench_recipe/index.vue @@ -359,6 +359,13 @@ v-for="item in commentList" :key="item.id"> {{item.content}} + + 大家常用 + + + {{item.content}} + @@ -387,6 +394,7 @@ getDiagnoseCommonList } from '@/api/all.js' import {addServicePackagePrescription} from "../../../api/servicePackage"; + import {doctorOrderCommonList} from "@/api/doctorOrder"; export default { components: { diagnose, @@ -397,7 +405,9 @@ return { treatement_price: '', commentList: [], + commonListAll: [], selectComment: [], + allSelectComment: [], showComment: false, buttonLodging: false, see_rate: uni.getStorageSync('see_rate'), @@ -499,7 +509,6 @@ this.tabsActive === 1 && (arr = this.mInfo) this.tabsActive === 2 && (arr = this.servicePackage) this.tabsActive === 3 && (arr = this.mInfoG) - console.log(this.mParms, this.tabsActive, '22') if (this.tabsActive === 1 || this.tabsActive === 2) { const dosage = this.tabsActive === 1 ? (this.mParms ? this.mParms.dosage || 0 : 0) : (this.mParmsG ? @@ -626,7 +635,6 @@ this.mParms = mParms this.cr_ids = cr_ids } - console.log(this.cr_ids, 'this.cr_ids') } if (uni.getStorageSync('clinical_diagnose')) { this.diagnoses = [] @@ -649,7 +657,6 @@ }) }, onLoad(op) { - console.log(op, 'cfadd'); this.register_id = op.r_id this.addType = op.addType let userInfo = uni.getStorageSync("userInfo"); @@ -678,23 +685,52 @@ this.getDiseaseCommon() }, methods: { + /** + * 添加医嘱 + */ confirmComment() { + let that = this; let txt = this.entrust ? this.entrust + '，' : '' - this.selectComment.forEach(item => { - const t = this.commentList.find(row => row.id == item).content + '，' + // 收藏的医嘱 + this.selectComment.forEach(id => { + let t = that.commentList.find(row => row.id === id).content + '，' txt += t }) + // 公共医嘱 + this.allSelectComment.forEach(id => { + let t = that.commonListAll.find(row => row.id === id).content + '，' + txt += t + }) + txt = txt.replace(/，，/g, '，') + txt = txt.replace(/，$/g, '') this.entrust = txt this.showComment = false this.selectComment = [] + this.allSelectComment = [] }, + /** + * 自己添加的医嘱选择 + * @param id + */ handleSelect(id) { - const index = this.selectComment.findIndex(item => item == id) - if (index < 0) { - this.selectComment.push(id) - } else { - this.selectComment.splice(index, 1) - } + const index = this.selectComment.findIndex(item => item === id) + if (index < 0) { + this.selectComment.push(id) + } else { + this.selectComment.splice(index, 1) + } + }, + /** + * 通用医嘱选择 + * @param id + */ + allHandleSelect(id) { + const index = this.allSelectComment.findIndex(item => item === id) + if (index < 0) { + this.allSelectComment.push(id) + } else { + this.allSelectComment.splice(index, 1) + } }, getDiagnoseCommonList() { getDiagnoseCommonList({store_id: uni.getStorageSync('store_id') || 11001}) @@ -709,6 +745,16 @@ uni.hideLoading(); this.loading2 = false; }); + + + doctorOrderCommonList({store_id: uni.getStorageSync('store_id') || 11001,}) + .then((res) => { + if (res.code === 0) { + this.commonListAll = res.result; + } else { + this.$toast(res.msg); + } + }) }, customBack() { if (this.searchIll) { @@ -781,7 +827,6 @@ let servicePackage = uni.getStorageSync(uni.getStorageSync('add') ? 'addServicePackage' : 'servicePackage') || [] - // console.log(chineses,'chineses') this.$set(this, 'wests', JSON.parse(JSON.stringify(wests))) this.$set(this, 'chineses', chineses) this.$set(this, 'granular', granular) @@ -852,7 +897,6 @@ return; // 发送处方 } else if (type == 0) { - // console.log('addd'); try { let res = {} @@ -993,7 +1037,6 @@ } } } catch (error) { - // console.log(error) this.$toast(res.msg) } } @@ -1156,7 +1199,6 @@ // this.loading = false // if (res.errcode == 0) { - // console.log(res, '000') // this.uniqueIdList = [res.data.syncResult.uniqueId] // this.prescription_id = res.data.id // this.signShow = false @@ -1164,12 +1206,10 @@ // this.$toast(res.msg) // } // } catch (error) { - // console.log(error) // } // }, swt(index) { - // console.log(index,'tabs'); this.tabsActive = index }, // 获取临床诊断模块高度 @@ -1218,7 +1258,6 @@ this.flag = false }, handleDel(id) { - console.log(id, 'ddd') uni.showModal({ title: '提示信息', content: '是否删除',