xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
闫晓茹 2024-03-20 13:16:08 +08:00
commit cfceaac30c
9 changed files with 182 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/manage/signRecord.js
View File

@ -59,4 +59,12 @@ export function servicepackageinfo(query) {
method: 'get',
params: query
})
}
}
// 获取服务包基础信息
export function getById(id) {
return request({
url: `/manage/servicepackage/getById/${id}`,
method: 'get',
})
}

35
src/utils/obtainendtime.js Normal file
View File

@ -0,0 +1,35 @@
//获取endtime
function obtainendtime(starttime, item) {
let currentDate = new Date(starttime)
let nextDate
console.log(item)
if (item.packageTermUnit == '年') {
currentDate.setFullYear(currentDate.getFullYear() + Number(item.packageTerm));
currentDate.setDate(currentDate.getDate() - 1);
let nextYear = currentDate.getFullYear();
let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
let nextday = checkMonth(currentDate.getDate())
nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
} else if (item.packageTermUnit == '月') {
currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月
currentDate.setDate(currentDate.getDate() - 1); // 减一天
let nextYear = currentDate.getFullYear();
let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
let nextday = checkMonth(currentDate.getDate())
nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
} else if (item.packageTermUnit == '日') {
currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm)));
let nextYear = currentDate.getFullYear();
let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1
let nextday = checkMonth(currentDate.getDate())
nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05"
}
return nextDate
}
function checkMonth(i) {
if (i < 10) {
i = "0" + i;
}
return i;
}
export { obtainendtime }

67
src/views/manage/continueSigning/index.vue
View File

@ -23,7 +23,7 @@
<el-descriptions-item label="患者姓名">{{ list.patientName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ list.sex == 'MALE' ? '男' : '' }}{{
list.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
<el-descriptions-item label="年龄">{{ list.age }}</el-descriptions-item>
<!-- <el-descriptions-item label="年龄">{{ list.age }}</el-descriptions-item> -->
<el-descriptions-item label="电话">{{ list.patientPhone }}</el-descriptions-item>
<el-descriptions-item label="就诊方式">{{
list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : list.visitMethod ==
@ -35,9 +35,6 @@
<el-descriptions-item label="住院/门诊号">{{ list.inHospitalNumber }}</el-descriptions-item>
<el-descriptions-item label="医院">{{ list.hospitalAgencyName }}</el-descriptions-item>
<el-descriptions-item label="科室">{{ list.departmentName }}</el-descriptions-item>
<el-descriptions-item label="服务包缴费状态">{{ list.packagePaymentStatus == 'PAID' ? '已缴费' : '' }}
{{ list.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
</el-descriptions-item>
<!-- <el-descriptions-item label="出院/门诊时间">{{ list.patientName }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="注册时间">{{ list.patientName }}</el-descriptions-item> -->
</el-descriptions>
@ -56,14 +53,23 @@
<el-form-item label="选择服务包" prop="packageName">
<el-input v-model="signPackage.packageName" disabled></el-input>
</el-form-item>
<el-form-item label="服务包缴费状态" prop="packagePaymentStatus" label-width="130px">
<el-select v-model="signPackage.packagePaymentStatus" filterable placeholder="请选择服务包" clearable>
<el-option label="已缴费" value="PAID">
</el-option>
<el-option label="未缴费" value="UNPAID_FEES">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="80px" class="demo-ruleForm"
:inline="true" style="padding-left:40px">
<el-form-item label="签约期限" prop="" label-width="100px">
<div>
<el-input v-model="signPackage.packageTerm" style="width:130px"
<el-input v-model="signPackage.packageTerm" style="width:130px" disabled
placeholder="请输入签约周期"></el-input>
<el-select v-model="signPackage.packageTermUnit" style="width:110px" placeholder="周期单位">
<el-select v-model="signPackage.packageTermUnit" style="width:110px" placeholder="周期单位"
disabled>
<el-option label="年" value="年">年</el-option>
<el-option label="月" value="月">月</el-option>
<el-option label="日" value="日">日</el-option>
@ -72,13 +78,13 @@
</el-form-item>
<el-form-item label="服务时长" prop="packageName">
<el-date-picker v-model="signPackage.serviceStartTime" :picker-options="pickerOptions" type="date"
placeholder="选择日期" style="width:150px">
@change="changestarttime" placeholder="选择日期" style="width:150px">
</el-date-picker>
至
<el-input v-model="signPackage.serviceEndTime" style="width:150px" disabled></el-input>
</el-form-item>
<el-form-item label="服务包价格(元)" prop="" label-width="120px">
<el-input v-model="signPackage.packagePrice" style="width:150px"
<el-input v-model="signPackage.packagePrice" style="width:150px" disabled
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
min="0" placeholder="小数点后两位(元)"></el-input>
</el-form-item>
@ -130,7 +136,11 @@ import {
import {
addsign
} from '@/api/manage/newSigning.js'
import {
getById
} from '@/api/manage/signRecord.js'
import { getAge } from "@/utils/age";
import { obtainendtime } from "@/utils/obtainendtime";
import { getToken } from '@/utils/auth'
export default {
dicts: ['hardware_type'],
@ -195,19 +205,36 @@ export default {
methods: {
//签约详情
info() {
let datetime = new Date();
let year = datetime.getFullYear();
let month = datetime.getMonth() + 1;
let day = datetime.getDate();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
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
this.signPackage.packagePrice = this.list.packagePrice
this.signPackage.packagePaymentStatus = res.data.packagePaymentStatus
// 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
// this.signPackage.packagePrice = this.list.packagePrice
this.form.devices = this.list.signDevices
this.form.record = this.list
this.list.age = this.list.birthDate ? getAge(this.list.birthDate) : ''
getById(res.data.servicePackageId).then(resp => {
this.signPackage = { ...this.signPackage, ...resp.data }
this.signPackage.serviceStartTime = `${year}-${month}-${day}`
this.signPackage.servicePackageId = resp.data.id
this.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, this.signPackage)
})
})
},
//选择开始时间
changestarttime(item) {
this.signPackage.serviceEndTime = obtainendtime(item, this.signPackage)
},
//续约
signupload() {
const files = this.$refs.upload.uploadFiles
@ -235,7 +262,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/patient/signRecord",
});
})
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
@ -256,7 +287,11 @@ export default {
},
handlePictureCardPreview(file) { },
goback() {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/patient/signRecord",
});
})
},
}
};

37
src/views/manage/newSigning/index.vue
View File

@ -11,7 +11,7 @@
<el-descriptions-item label="患者姓名">{{ $route.query.patientName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{ $route.query.sex == 'MALE' ? '男' : '' }}{{
$route.query.sex == 'FEMALE' ? '女' : '' }}</el-descriptions-item>
<el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item>
<!-- <el-descriptions-item label="年龄">{{ $route.query.age }}</el-descriptions-item> -->
<el-descriptions-item label="电话">{{ $route.query.patientPhone }}</el-descriptions-item>
<el-descriptions-item label="就诊方式">{{
$route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod ==
@ -38,8 +38,8 @@
</el-descriptions>
<el-form :model="signPackage" :rules="rules" ref="signPackage" label-width="100px" class="demo-ruleForm"
:inline="true" style="padding-left:40px">
<el-form-item label="选择服务包" prop="servicePackageld">
<el-select v-model="signPackage.servicePackageld" filterable placeholder="请选择服务包" clearable
<el-form-item label="选择服务包" prop="servicePackageId">
<el-select v-model="signPackage.servicePackageId" filterable placeholder="请选择服务包" clearable
@change="tappackage">
<el-option v-for="item in packagelist" :key="item.id" :label="item.packageName"
:value="item.id">
@ -131,6 +131,7 @@ import {
servicepackageinfo
} from '@/api/manage/signRecord.js'
import { getToken } from '@/utils/auth'
import { obtainendtime } from "@/utils/obtainendtime";
export default {
dicts: ['hardware_type'],
name: "newSigning",
@ -157,7 +158,7 @@ export default {
packagePaymentStatus: [
{ required: true, message: '缴费状态不能为空', trigger: 'change' }
],
servicePackageld: [
servicePackageId: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
@ -190,14 +191,16 @@ export default {
},
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();
let item = this.packagelist.find(e => e.id == id)
this.signPackage = { ...this.signPackage, ...item }
let datetime = new Date();
let year = datetime.getFullYear();
let month = datetime.getMonth() + 1;
let day = datetime.getDate();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
this.signPackage.serviceStartTime = `${year}-${month}-${day}`
this.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, item)
},
//签约
signupload() {
@ -209,8 +212,8 @@ export default {
}
},
uploadsave() {
if (this.signPackage.servicePackageld) {
this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName
if (this.signPackage.servicePackageId) {
this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageId).packageName
}
this.form.signPackage = this.signPackage
addsign(this.form).then(res => {
@ -219,7 +222,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/patient/signRecord",
});
})
}).catch(() => {
this.$modal.msgSuccess("签约成功");
});
@ -250,7 +257,11 @@ export default {
handlePictureCardPreview(file) {
},
goback() {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/patient/signRecord",
});
})
},
}
};

2
src/views/manage/preHospitalized/index.vue
View File

@ -477,7 +477,7 @@ export default {
this.$router.push({
path: "/patient/patientdetails",
query: {
patientId: row.id,
patientId: row.patientId,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,

5
src/views/manage/propaganda/index.vue
View File

@ -740,7 +740,7 @@ export default {
// 表单校验
rules: {
departmentId: [
{ required: true, message: "科室不能为空", trigger: "blur" }
{ required: true, message: "科室名称不能为空", trigger: "blur" }
],
propagandaType: [
{ required: true, message: "宣教类型不能为空", trigger: "blur" }
@ -1019,6 +1019,7 @@ export default {
propagandaStatus:null,
departmentName: null,
propagandaTitle: null,
departmentId:null,
propagandaType: null,
propagandaCode: null,
propagandaContent: null,
@ -1242,4 +1243,4 @@ audio {
font-size: 16px;
}
}
</style>
</style>

57
src/views/manage/signRecord/index.vue
View File

@ -411,25 +411,28 @@ export default {
this.getList();
},
handlenewsign(row) {
this.$router.push({
path: "/patient/newSigning",
query: {
departmentId: row.departmentId,
patientName: row.patientName,
patientPhone: row.patientPhone,
visitMethod: row.visitMethod,
signDiagnosis: row.signDiagnosis,
visitSerialNumber: row.visitSerialNumber,
hospitalAgencyName: row.hospitalAgencyName,
inHospitalNumber: row.inHospitalNumber,
departmentName: row.departmentName,
paymentStatus: row.paymentStatus,
sex: row.sex,
age: row.birthDate ? getAge(row.birthDate) : '',
patientId: row.id,
createTime: row.createTime,
},
});
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.replace({
path: "/patient/newSigning",
query: {
departmentId: row.departmentId,
patientName: row.patientName,
patientPhone: row.patientPhone,
visitMethod: row.visitMethod,
signDiagnosis: row.signDiagnosis,
visitSerialNumber: row.visitSerialNumber,
hospitalAgencyName: row.hospitalAgencyName,
hospitalAgencyId: row.hospitalAgencyId,
inHospitalNumber: row.inHospitalNumber,
departmentName: row.departmentName,
paymentStatus: row.paymentStatus,
sex: row.sex,
age: row.birthDate ? getAge(row.birthDate) : '',
patientId: row.patientId,
createTime: row.createTime,
},
});
})
},
selectAgencyinfo() {
let query = {
@ -500,19 +503,21 @@ export default {
},
//续约
handleContinue(row) {
this.$router.push({
path: "/patient/continueSigning",
query: {
patientSignRecordId: row.id,
},
});
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.replace({
path: "/patient/continueSigning",
query: {
patientSignRecordId: row.id,
},
});
})
},
/** 详情操作 */
handleAuthRole(row) {
this.$router.push({
path: "/patient/patientdetails",
query: {
patientId: row.id,
patientId: row.patientId,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,

18
src/views/system/addQuestionnaire/index.vue
View File

@ -1033,7 +1033,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/question/question",
});
})
}).catch(() => {
this.$modal.msgSuccess("编辑保存成功");
});
@ -1045,7 +1049,11 @@ export default {
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/question/question",
});
})
}).catch(() => {
this.$modal.msgSuccess("新增保存成功");
});
@ -1108,7 +1116,11 @@ export default {
})
},
goback() {
this.$router.go(-1);
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/question/question",
});
})
},
}
};

22
src/views/system/question/index.vue
View File

@ -259,18 +259,22 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.$router.push({
path: "/question/addQuestionnaire",
});
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/question/addQuestionnaire",
});
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.$router.push({
path: "/question/addQuestionnaire",
query: {
id: row.id,
},
});
this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({
path: "/question/addQuestionnaire",
query: {
id: row.id,
},
});
})
},
/** 删除按钮操作 */
handleDelete(row) {