From e54ba0c68a2e035413d3384b1a19070d9034e4ec Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 19 Mar 2024 14:34:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/servicepackage/index.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index b2a3b7b..6479950 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -663,13 +663,17 @@ :inline="true" > - {{ formdetail.diseaseTypeName }} + {{ formdetail.diseaseTypeName }} + {{ formdetail.packageName }} + --> {{ formdetail.packagePrice }}元 +
- {{ formdetail.packageTermAndUnit }} + {{ formdetail.packageTermAndUnit }} {{ From b4482a3c51fb73f87065cfa137b3552e00619000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 19 Mar 2024 15:40:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unitconfig/patientConfiguration.js | 87 ++++ src/views/manage/continueSigning/index.vue | 70 ++- src/views/manage/newSigning/index.vue | 22 +- .../index.vue | 331 ++++++++++++++ .../unitconfig/patientConfiguration/index.vue | 413 ++++++++++++++++++ 5 files changed, 909 insertions(+), 14 deletions(-) create mode 100644 src/api/unitconfig/patientConfiguration.js create mode 100644 src/views/unitconfig/PatientConfigurationVisitRecords/index.vue create mode 100644 src/views/unitconfig/patientConfiguration/index.vue diff --git a/src/api/unitconfig/patientConfiguration.js b/src/api/unitconfig/patientConfiguration.js new file mode 100644 index 0000000..7d0a711 --- /dev/null +++ b/src/api/unitconfig/patientConfiguration.js @@ -0,0 +1,87 @@ +import request from '@/utils/request' + +// 查询患者就诊记录基本信息列表 +export function listVisitRecord(query) { + return request({ + url: '/manage/patientInfo/list', + method: 'get', + params: query + }) +} + +// 查询患者就诊记录基本信息详细 +export function getVisitRecord(id) { + return request({ + url: '/manage/visitRecord/' + id, + method: 'get' + }) +} + +// 新增患者就诊记录基本信息 +export function addVisitRecord(data) { + return request({ + url: '/manage/visitRecord', + method: 'post', + data: data + }) +} + +// 保存修改患者就诊记录基本信息 +export function updateVisitRecord(data) { + return request({ + url: '/manage/visitRecord', + method: 'put', + data: data + }) +} + +// 删除患者就诊记录基本信息 +export function delVisitRecord(id) { + return request({ + url: '/manage/visitRecord/' + id, + method: 'delete' + }) +} + +// 查询患者就诊记录基本信息列表 +export function getList(query) { + return request({ + url: '/manage/visitRecord/getList', + method: 'get', + params: query + }) +} + +//点击左侧获取 +export function visitRecordid(id) { + return request({ + url: `/manage/visitRecord/${id}`, + method: 'get', + }) +} + +//主治医生 +export function usergetList(query) { + return request({ + url: `/system/user/getList`, + method: 'get', + params: query + }) +} + +export function selectAgencyList(query) { + return request({ + url: '/system/agency/selectAgencyList', + method: 'get', + params: query + }) +} + +//新增就诊记录 +export function saveRecord(data) { + return request({ + url: '/manage/visitRecord/saveRecord', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue index e7fba3a..f003f4e 100644 --- a/src/views/manage/continueSigning/index.vue +++ b/src/views/manage/continueSigning/index.vue @@ -41,26 +41,54 @@ + + + + + + + - - + + - - + +
+ + + 年 + 月 + 日 + +
- + + 至 - + - + + + + + + + + @@ -109,10 +137,21 @@ export default { name: "newSigning", data() { return { - list: {}, signPackage: { - packageName: undefined + packageName: undefined, + packagePrice: undefined, + serviceCycle: undefined, + serviceStartTime: undefined, + serviceEndTime: '', }, + pickerOptions: { + disabledDate: (time) => { + if (this.signPackage.serviceEndTime != "") { + return time.getTime() > new Date(this.signPackage.serviceEndTime).getTime(); + } + }, + }, + list: {}, form: { record: { patientId: undefined, @@ -127,7 +166,7 @@ export default { informeds: [] }, rules: { - packageName: [ + packageId: [ { required: true, message: '请选择服务包', trigger: 'change' } ], devices: { @@ -170,7 +209,13 @@ export default { }, //续约 signupload() { - this.$refs.upload.submit(); + const files = this.$refs.upload.uploadFiles + if (files.length > 0) { + this.$refs.upload.submit(); + } else { + this.uploadsave(); + } + console.log(this.signPackage) }, //文件上传完成 handleSuccess(response, file, fileList) { @@ -179,7 +224,10 @@ export default { this.form.informeds.push({ informedFilePath: e.response.imgUrl, }) + this.uploadsave(); }) + }, + uploadsave() { this.form.signPackage = this.signPackage addsign(this.form).then(res => { this.$confirm('签约成功, 是否返回上一页?', '提示', { diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index 5919bee..6968681 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -29,12 +29,28 @@ + + + + + + + - - + + + + + + + + + @@ -96,7 +112,7 @@ export default { informeds: [] }, rules: { - packageName: [ + packageId: [ { required: true, message: '请选择服务包', trigger: 'change' } ], devices: { diff --git a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue new file mode 100644 index 0000000..b53a6ff --- /dev/null +++ b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue @@ -0,0 +1,331 @@ + + + + \ No newline at end of file diff --git a/src/views/unitconfig/patientConfiguration/index.vue b/src/views/unitconfig/patientConfiguration/index.vue new file mode 100644 index 0000000..f4fe2a4 --- /dev/null +++ b/src/views/unitconfig/patientConfiguration/index.vue @@ -0,0 +1,413 @@ + + + From a9a738428214e62534a3ae387772d622b2964c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 19 Mar 2024 15:43:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/unitconfig/PatientConfigurationVisitRecords/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue index b53a6ff..6ee9d4c 100644 --- a/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue +++ b/src/views/unitconfig/PatientConfigurationVisitRecords/index.vue @@ -199,6 +199,7 @@ export default { this.info(); }) } else { + this.form = { ...this.form, ...this.$route.query } saveRecord(this.form).then(res => { this.$modal.msgSuccess("新增就诊记录成功"); this.info(); From d5f735889f7acc7fb8b5c98f13bb0f15f7f2cfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 19 Mar 2024 15:45:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/unitconfig/patientConfiguration/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/unitconfig/patientConfiguration/index.vue b/src/views/unitconfig/patientConfiguration/index.vue index f4fe2a4..4b9b650 100644 --- a/src/views/unitconfig/patientConfiguration/index.vue +++ b/src/views/unitconfig/patientConfiguration/index.vue @@ -404,7 +404,8 @@ export default { patientPhone: row.patientPhone, sex: row.sex, age: row.birthDate ? getAge(row.birthDate) : '', - hospitalAgencyId: row.hospitalAgencyId + hospitalAgencyId: row.hospitalAgencyId, + hospitalAgencyName: row.hospitalAgencyName }, }); }, From 0cd8a58883c48a7b129b0d53de0d28b0136d93a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 19 Mar 2024 15:50:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/specialDiseaseRoute.js | 44 +++ .../system/specialDiseaseRoute/index.vue | 318 ++++++++++++++++++ 2 files changed, 362 insertions(+) create mode 100644 src/api/system/specialDiseaseRoute.js create mode 100644 src/views/system/specialDiseaseRoute/index.vue diff --git a/src/api/system/specialDiseaseRoute.js b/src/api/system/specialDiseaseRoute.js new file mode 100644 index 0000000..2dfdec2 --- /dev/null +++ b/src/api/system/specialDiseaseRoute.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询专病路径信息列表 +export function listSpecialDiseaseRoute(query) { + return request({ + url: '/system/specialDiseaseRoute/list', + method: 'get', + params: query + }) +} + +// 查询专病路径信息详细 +export function getSpecialDiseaseRoute(id) { + return request({ + url: '/system/specialDiseaseRoute/' + id, + method: 'get' + }) +} + +// 新增专病路径信息 +export function addSpecialDiseaseRoute(data) { + return request({ + url: '/system/specialDiseaseRoute', + method: 'post', + data: data + }) +} + +// 修改专病路径信息 +export function updateSpecialDiseaseRoute(data) { + return request({ + url: '/system/specialDiseaseRoute', + method: 'put', + data: data + }) +} + +// 删除专病路径信息 +export function delSpecialDiseaseRoute(id) { + return request({ + url: '/system/specialDiseaseRoute/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/specialDiseaseRoute/index.vue b/src/views/system/specialDiseaseRoute/index.vue new file mode 100644 index 0000000..58bcef4 --- /dev/null +++ b/src/views/system/specialDiseaseRoute/index.vue @@ -0,0 +1,318 @@ + + + From 4e0f20e2213b4e8c6eb252325fdcd53d22a6fa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 19 Mar 2024 17:18:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/signRecord.js | 9 ++ src/views/manage/continueSigning/index.vue | 10 +- src/views/manage/newSigning/index.vue | 104 +++++++++++++++++---- src/views/manage/signRecord/index.vue | 33 +++---- 4 files changed, 118 insertions(+), 38 deletions(-) diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js index 83b3fa1..f1a3e2a 100644 --- a/src/api/manage/signRecord.js +++ b/src/api/manage/signRecord.js @@ -50,4 +50,13 @@ export function updateSignStatus(data) { method: 'post', data: data }) +} + +//服务包list +export function servicepackageinfo(query) { + return request({ + url: `/manage/servicepackage/getList`, + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue index f003f4e..06056e3 100644 --- a/src/views/manage/continueSigning/index.vue +++ b/src/views/manage/continueSigning/index.vue @@ -53,8 +53,8 @@ - - + + - @@ -166,7 +166,7 @@ export default { informeds: [] }, rules: { - packageId: [ + packageName: [ { required: true, message: '请选择服务包', trigger: 'change' } ], devices: { @@ -198,6 +198,7 @@ export default { getByRecordId(this.$route.query.patientSignRecordId).then(res => { this.list = res.data this.signPackage.packageName = this.list.packageName + this.signPackage.packageId = this.list.servicePackageId this.signPackage.serviceCycle = this.list.serviceCycle this.signPackage.serviceStartTime = this.list.serviceStartTime this.signPackage.serviceEndTime = this.list.serviceEndTime @@ -215,7 +216,6 @@ export default { } else { this.uploadsave(); } - console.log(this.signPackage) }, //文件上传完成 handleSuccess(response, file, fileList) { diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index 6968681..be4bcee 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -23,9 +23,6 @@ {{ $route.query.inHospitalNumber }} {{ $route.query.hospitalAgencyName }} {{ $route.query.departmentName }} - {{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }} - {{ $route.query.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }} - @@ -41,8 +38,49 @@ - - + + + + + + + + + + + + + + + + + +
+ + + 年 + 月 + 日 + +
+ + + + + 至 + + + + @@ -89,6 +127,9 @@ import { addsign } from '@/api/manage/newSigning.js' +import { + servicepackageinfo +} from '@/api/manage/signRecord.js' import { getToken } from '@/utils/auth' export default { dicts: ['hardware_type'], @@ -96,7 +137,8 @@ export default { data() { return { signPackage: { - packageName: undefined + packageName: undefined, + packagePaymentStatus: '', }, form: { record: { @@ -112,7 +154,10 @@ export default { informeds: [] }, rules: { - packageId: [ + packagePaymentStatus: [ + { required: true, message: '缴费状态不能为空', trigger: 'change' } + ], + servicePackageld: [ { required: true, message: '请选择服务包', trigger: 'change' } ], devices: { @@ -132,25 +177,41 @@ export default { Authorization: 'Bearer ' + getToken(), }, url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile' - } + }, + packagelist: [], }; }, created() { this.form.record = this.$route.query + this.signPackage.packagePaymentStatus = this.form.record.paymentStatus + servicepackageinfo({ departmentId: this.$route.query.departmentId }).then(res => { + this.packagelist = res.data + }) }, methods: { + tappackage(id) { + this.signPackage = { ...this.signPackage, ...this.packagelist.find(e => e.id == id) } + let currentDate = new Date(); + let year = currentDate.getFullYear(); + let month = currentDate.getMonth() + 1; + let day = currentDate.getDate(); + month >= 1 && month <= 9 ? (month = "0" + month) : ""; + day >= 0 && day <= 9 ? (day = "0" + day) : ""; + this.signPackage.serviceStartTime = `${year}-${month}-${day}` + }, //签约 signupload() { - this.$refs.upload.submit(); + const files = this.$refs.upload.uploadFiles + if (files.length > 0) { + this.$refs.upload.submit(); + } else { + this.uploadsave(); + } }, - //文件上传完成 - handleSuccess(response, file, fileList) { - this.form.informeds = [] - fileList.forEach(e => { - this.form.informeds.push({ - informedFilePath: e.response.imgUrl, - }) - }) + uploadsave() { + if (this.signPackage.servicePackageld) { + this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName + } this.form.signPackage = this.signPackage addsign(this.form).then(res => { this.$confirm('签约成功, 是否返回上一页?', '提示', { @@ -164,6 +225,15 @@ export default { }); }) }, + //文件上传完成 + handleSuccess(response, file, fileList) { + this.form.informeds = [] + fileList.forEach(e => { + this.form.informeds.push({ + informedFilePath: e.response.imgUrl, + }) + }) + }, //新增硬件 addhardware() { this.form.devices.push({ diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index b743400..245e7df 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -410,26 +410,11 @@ export default { this.queryParams.signTimeEnd = null this.getList(); }, - // 格式化日期格式如：2017-9-19 18:04:33 - formatDate(value) { - if (!value) { - return - } - // 计算日期相关值 - let time = new Date(value) - let Y = time.getFullYear(); - let M = time.getMonth() + 1; - let D = time.getDate(); - let h = time.getHours(); - let m = time.getMinutes(); - let s = time.getSeconds(); - // 如果传递了type的话 - return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); - }, handlenewsign(row) { this.$router.push({ path: "/patient/newSigning", query: { + departmentId: row.departmentId, patientName: row.patientName, patientPhone: row.patientPhone, visitMethod: row.visitMethod, @@ -541,6 +526,22 @@ export default { }, }); }, + // 格式化日期格式如：2017-9-19 18:04:33 + formatDate(value) { + if (!value) { + return + } + // 计算日期相关值 + let time = new Date(value) + let Y = time.getFullYear(); + let M = time.getMonth() + 1; + let D = time.getDate(); + let h = time.getHours(); + let m = time.getMinutes(); + let s = time.getSeconds(); + // 如果传递了type的话 + return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s); + }, } };