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:
shidongli 2024-03-29 10:51:44 +08:00
commit 9e1ab10d9e
7 changed files with 98 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/manage/patientInfo/index.vue
View File

@ -84,8 +84,8 @@
<el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="入院时间" prop="admissionDateStart">
<el-date-picker v-model="admissionDate" type="daterange" range-separator="至" start-placeholder="开始日期"
<!-- <el-form-item label="入院时间" prop="admissionTimeStart">
<el-date-picker v-model="admissionTime" type="daterange" range-separator="至" start-placeholder="开始日期"
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker>
</el-form-item> -->
@ -124,7 +124,7 @@
</template>
</el-table-column>
<el-table-column label="诊断" align="center" prop="mainDiagnosis" />
<!-- <el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
<!-- <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' /> -->
<el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
<el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
<el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@ -195,8 +195,8 @@ export default {
wardId: null,
wardName: null,
surgicalName: null,
admissionDateStart: null,
admissionDateEnd: null,
admissionTimeStart: null,
admissionTimeEnd: null,
outpatientNumber: null,
visitTimeStart: null,
visitTimeEnd: null,
@ -204,7 +204,7 @@ export default {
patientSource: null,
},
visitTime: [],
admissionDate: [],
admissionTime: [],
//医院list
hospitalAgencylist: [],
// 院区list
@ -268,18 +268,18 @@ export default {
this.queryParams.visitTimeStart = this.visitTime[0]
this.queryParams.visitTimeEnd = this.visitTime[1]
}
if (this.admissionDate.length > 0) {
this.queryParams.admissionDateStart = this.admissionDate[0]
this.queryParams.admissionDateEnd = this.admissionDate[1]
if (this.admissionTime.length > 0) {
this.queryParams.admissionTimeStart = this.admissionTime[0]
this.queryParams.admissionTimeEnd = this.admissionTime[1]
}
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.admissionDate = [];
this.queryParams.admissionDateStart = null
this.queryParams.admissionDateEnd = null
this.admissionTime = [];
this.queryParams.admissionTimeStart = null
this.queryParams.admissionTimeEnd = null
this.visitTime = []
this.queryParams.visitTimeStart = null
this.queryParams.visitTimeEnd = null

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

@ -19,8 +19,8 @@
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="入院时间" prop="admissionDate">
<el-date-picker v-model="queryParams.admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
<el-form-item label="入院时间" prop="admissionTime">
<el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> -->
<!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
@ -166,7 +166,7 @@
<dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
</template>
</el-table-column>
<el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />
<el-table-column label="入院时间" align="center" prop="admissionTime" width='130' />
<el-table-column label="主治医生" align="center" prop="attendingPhysician" />
<el-table-column label="出院方式" align="center" prop="dischargeMethod" />
<el-table-column label="患者来源" align="center" prop="patientSource">
@ -319,13 +319,13 @@
<el-form-item label="手术名称" prop="surgicalName">
<el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
</el-form-item>
<el-form-item label="入院时间" prop="admissionDate">
<el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
<el-form-item label="入院时间" prop="admissionTime">
<el-date-picker clearable v-model="form.admissionTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
placeholder="请选择入院时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出院时间" prop="dischargeDate">
<el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
<el-form-item label="出院时间" prop="dischargeTime">
<el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
placeholder="请选择出院时间">
</el-date-picker>
</el-form-item>
@ -452,7 +452,7 @@ export default {
wardId: null,
wardName: null,
surgicalName: null,
admissionDate: null,
admissionTime: null,
outpatientNumber: null,
visitTime: null,
dischargeMethod: null,

46
src/views/manage/visitin/index.vue
View File

@ -14,8 +14,8 @@
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker>
</el-form-item> -->
<el-form-item label="入院时间" prop="admissionDateStart">
<el-date-picker v-model="admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
<el-form-item label="入院时间" prop="admissionTimeStart">
<el-date-picker v-model="admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<!-- <el-form-item label="就诊时间" prop="visitTime">
@ -163,7 +163,7 @@
<dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
</template>
</el-table-column>
<el-table-column label="入院时间" align="center" prop="admissionDate" width='130' />-->
<el-table-column label="入院时间" align="center" prop="admissionTime" width='130' />-->
<el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
<el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
<el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@ -277,9 +277,9 @@
<el-form-item label="就诊流水号" prop="visitSerialNumber">
<el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
</el-form-item>
<el-form-item label="入院时间" prop="admissionDate">
<el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd"
style="width:200px" placeholder="请选择入院时间">
<el-form-item label="入院时间" prop="admissionTime">
<el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
</el-date-picker>
</el-form-item>
<el-form-item label="手术名称" prop="surgicalName">
@ -289,7 +289,7 @@
<el-input type="textarea" v-model="form.surgicalRecord" style="width:800px" placeholder="请输入手术记录" :rows="8" />
</el-form-item>
<el-form-item label="病历内容">
<editor v-model="form.medicalRecordContent" :min-height="192" />
<editor v-model="form.inHospitalInfo" :min-height="192" />
</el-form-item>
<!-- <el-form-item label="患者来源" prop="patientSource">
<el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
@ -333,8 +333,8 @@
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="出院时间" prop="dischargeDate">
<el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
<el-form-item label="出院时间" prop="dischargeTime">
<el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
placeholder="请选择出院时间">
</el-date-picker>
</el-form-item>
@ -438,13 +438,13 @@ export default {
open: false,
uploadopen: false,
// 查询参数
admissionDate: [],
admissionTime: [],
queryParams: {
attendingPhysicianId: '',
pageNum: 1,
pageSize: 10,
admissionDateStart: '',
admissionDateEnd: '',
admissionTimeStart: '',
admissionTimeEnd: '',
patientName: null,
patientPhone: null,
birthDate: null,
@ -462,7 +462,7 @@ export default {
wardName: null,
surgicalName: null,
surgicalRecord: null,
admissionDate: null,
admissionTime: null,
outpatientNumber: null,
visitTime: null,
dischargeMethod: null,
@ -503,7 +503,7 @@ export default {
visitMethod: [
{ required: true, message: '请输入就诊方式', trigger: 'change' }
],
admissionDate: [
admissionTime: [
{ required: true, message: '请选择患者入院时间', trigger: 'change' }
],
},
@ -587,9 +587,9 @@ export default {
visitSerialNumber: null,
surgicalRecord: null,
surgicalName: null,
admissionDate: null,
dischargeDate: null,
medicalRecordContent: null,
admissionTime: null,
dischargeTime: null,
inHospitalInfo: null,
appointmentTreatmentGroup: null,
registrationNo: null,
registrationDate: null,
@ -607,18 +607,18 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
if (this.admissionDate.length > 0) {
this.queryParams.admissionDateStart = this.admissionDate[0]
this.queryParams.admissionDateEnd = this.admissionDate[1]
if (this.admissionTime.length > 0) {
this.queryParams.admissionTimeStart = this.admissionTime[0]
this.queryParams.admissionTimeEnd = this.admissionTime[1]
}
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.admissionDate = []
this.queryParams.admissionDateStart = ''
this.queryParams.admissionDateEnd = ''
this.admissionTime = []
this.queryParams.admissionTimeStart = ''
this.queryParams.admissionTimeEnd = ''
this.resetForm("queryForm");
this.handleQuery();
},

78
src/views/manage/visitout/index.vue
View File

@ -9,18 +9,13 @@
<el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
style="width:200px" />
</el-form-item>
<el-form-item label="门诊/出院时间" prop="dischargeDateStart" label-width="120px">
<el-date-picker v-model="dischargeDate" type="daterange" range-separator="至" start-placeholder="开始日期"
<el-form-item label="门诊/出院时间" prop="dischargeTimeStart" label-width="120px">
<el-date-picker v-model="dischargeTime" type="daterange" range-separator="至" start-placeholder="开始日期"
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="就诊时间" prop="visitTime">
<el-date-picker v-model="queryParams.visitTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="入院时间" prop="admissionDate">
<el-date-picker v-model="queryParams.admissionDate" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
<!-- <el-form-item label="入院时间" prop="admissionTime">
<el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> -->
<!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
@ -158,7 +153,7 @@
<span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="入院时间" align="center" prop="admissionDate" width='130' /> -->
<el-table-column label="入院时间" align="center" prop="admissionTime" width='130' /> -->
<el-table-column label="医院" align="center" prop="hospitalAgencyName" width='130' />
<el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
<el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
@ -172,9 +167,9 @@
<dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
</template>
</el-table-column>
<el-table-column label="门诊/出院时间" align="center" prop="dischargeDate" width='130'>
<el-table-column label="门诊/出院时间" align="center" prop="dischargeTime" width='130'>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.dischargeDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.dischargeTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="患者来源" align="center" prop="patientSource">
@ -285,19 +280,19 @@
<el-form-item label="就诊流水号" prop="visitSerialNumber">
<el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
</el-form-item>
<el-form-item label="就诊时间" prop="visitTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
<el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
style="width:200px">
<el-form-item label="门诊时间" prop="dischargeTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
<el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
format='yyyy-MM-dd HH:mm' placeholder="请选择门诊时间" style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="入院时间" prop="admissionDate" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
<el-date-picker clearable v-model="form.admissionDate" type="date" value-format="yyyy-MM-dd"
style="width:200px" placeholder="请选择入院时间">
<el-form-item label="入院时间" prop="admissionTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
<el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出院时间" prop="dischargeTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
<el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd"
:picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
<el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
</el-date-picker>
</el-form-item>
<el-form-item label="手术名称" prop="surgicalName">
@ -307,7 +302,7 @@
<el-input type="textarea" v-model="form.surgicalRecord" style="width:800px" placeholder="请输入手术记录" :rows="8" />
</el-form-item>
<el-form-item label="病历内容">
<editor v-model="form.medicalRecordContent" :min-height="192" />
<editor v-model="form.outHospitalInfo" :min-height="192" />
</el-form-item>
<!-- <el-form-item label="患者来源" prop="patientSource">
<el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
@ -351,8 +346,8 @@
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="出院时间" prop="dischargeDate">
<el-date-picker clearable v-model="form.dischargeDate" type="date" value-format="yyyy-MM-dd" style="width:200px"
<el-form-item label="出院时间" prop="dischargeTime">
<el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd" style="width:200px"
placeholder="请选择出院时间">
</el-date-picker>
</el-form-item>
@ -453,8 +448,8 @@ export default {
return {
pickerOptions: {
disabledDate: (time) => {
if (this.form.admissionDate != "") {
return time.getTime() < new Date(this.form.admissionDate).getTime();
if (this.form.admissionTime != "") {
return time.getTime() < new Date(this.form.admissionTime).getTime();
}
},
},
@ -503,12 +498,12 @@ export default {
uploadopen: false,
uploadopentwo: false,
// 查询参数
dischargeDate: [],
dischargeTime: [],
queryParams: {
pageNum: 1,
pageSize: 10,
dischargeDateStart: '',
dischargeDateEnd: '',
dischargeTimeStart: '',
dischargeTimeEnd: '',
patientName: null,
patientPhone: null,
birthDate: null,
@ -526,10 +521,9 @@ export default {
wardName: null,
surgicalName: null,
surgicalRecord: null,
admissionDate: null,
admissionTime: null,
dischargeTime: null,
outpatientNumber: null,
visitTime: null,
dischargeMethod: null,
patientSource: null,
},
@ -568,15 +562,12 @@ export default {
visitMethod: [
{ required: true, message: '请输入就诊方式', trigger: 'change' }
],
admissionDate: [
admissionTime: [
{ required: true, message: '请选择患者入院时间', trigger: 'change' }
],
dischargeTime: [
{ required: true, message: '请选择患者出院时间', trigger: 'change' }
],
visitTime: [
{ required: true, message: '请选择患者就诊时间', trigger: 'change' }
],
billingDoctorId: [
{ required: true, message: '请选择开单医生', trigger: 'change' }
],
@ -704,16 +695,15 @@ export default {
visitSerialNumber: null,
surgicalName: null,
surgicalRecord: null,
admissionDate: null,
admissionTime: null,
dischargeTime: null,
dischargeDate: null,
medicalRecordContent: null,
dischargeTime: null,
outHospitalInfo: null,
appointmentTreatmentGroup: null,
registrationNo: null,
registrationDate: null,
appointmentDate: null,
outpatientNumber: null,
visitTime: null,
dischargeMethod: null,
openId: null,
unionId: null,
@ -724,18 +714,18 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
if (this.dischargeDate.length > 0) {
this.queryParams.dischargeDateStart = this.dischargeDate[0]
this.queryParams.dischargeDateEnd = this.dischargeDate[1]
if (this.dischargeTime.length > 0) {
this.queryParams.dischargeTimeStart = this.dischargeTime[0]
this.queryParams.dischargeTimeEnd = this.dischargeTime[1]
}
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dischargeDate = []
this.queryParams.dischargeDateStart = ''
this.queryParams.dischargeDateEnd = ''
this.dischargeTime = []
this.queryParams.dischargeTimeStart = ''
this.queryParams.dischargeTimeEnd = ''
this.resetForm("queryForm");
this.handleQuery();
},

13
src/views/system/specialDiseaseNode/index.vue
View File

@ -83,7 +83,9 @@
</el-form-item>
</el-form>
</div>
<wangeditor style="height:300px;width:100%;" ref="editor" />
<div class="bottomform">
<wangeditor style="height:300px;width:100%;" ref="editor" />
</div>
</div>
</div>
</div>
@ -204,8 +206,14 @@ export default {
};
</script>
<style scoped lang="scss">
.bottomform {
overflow: scroll;
height: 930px;
}
.topform {
padding: 15px 0 0 15px;
height: 70px;
.form {
::v-deep .el-input__inner {
@ -260,6 +268,8 @@ export default {
width: 22%;
background-color: #fff;
padding: 0 20px 20px;
height: 1000px;
overflow: scroll;
.timetitle {
height: 60px;
@ -278,6 +288,7 @@ export default {
width: 75%;
background-color: #fff;
height: 1000px;
overflow: scroll;
}
}

8
src/views/system/taskExecuteRecord/index.vue
View File

@ -320,21 +320,21 @@
<el-table-column
label="入院时间"
align="center"
prop="admissionDate"
prop="admissionTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.admissionDate, "{y}-{m}-{d}") }}</span>
<span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
label="出院时间"
align="center"
prop="dischargeDate"
prop="dischargeTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.dischargeDate, "{y}-{m}-{d}") }}</span>
<span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="就诊方式" align="center" prop="visitMethod">

8
src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
View File

@ -75,12 +75,14 @@
</el-form-item>
<el-form-item label="入院时间" prop="admissionTime">
<el-date-picker style="width:300px" v-model="form.admissionTime" type="datetime"
:picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="出院时间" prop="dischargeTime">
<el-date-picker style="width:300px" v-model="form.dischargeTime" type="datetime"
:picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间">
:picker-options="pickerOptionstwo" value-format="yyyy-MM-dd HH:mm" format='yyyy-MM-dd HH:mm'
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_HOSPITALIZED'">
@ -272,7 +274,7 @@ export default {
var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
// 拼接
this.todaytime = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
this.todaytime = year + "-" + month + "-" + day + " " + hours + ":" + minutes
},
}
};