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

This commit is contained in:
shidongli 2024-03-13 09:39:29 +08:00
commit bcb150647f
6 changed files with 91 additions and 9 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询患者信息列表
export function listPatientInfo(query) {
return request({
url: '/manage/preHospital/list',
method: 'get',
params: query
})
}
// 查询患者信息详细
export function getPatientInfo(id) {
return request({
url: '/manage/preHospital/' + id,
method: 'get'
})
}
// 新增患者信息
export function addPatientInfo(data) {
return request({
url: '/manage/preHospital',
method: 'post',
data: data
})
}
// 修改患者信息
export function updatePatientInfo(data) {
return request({
url: '/manage/preHospital',
method: 'put',
data: data
})
}
// 删除患者信息
export function delPatientInfo(id) {
return request({
url: '/manage/preHospital/' + id,
method: 'delete'
})
}

View File

@ -148,11 +148,11 @@
<el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
<el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
<el-table-column label="病区名称" align="center" prop="wardName" width='130' />
<el-table-column label="住院号" align="center" prop="admissionNumber" width='130' />
<el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' />
<!-- <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' /> -->
<!-- <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' /> -->
<el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" />
<el-table-column label="诊断" align="center" prop="mainDiagnosis" />
<el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
<!-- <el-table-column label="就诊时间" align="center" prop="visitTime" width='130'>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
</template>
@ -163,13 +163,13 @@
</template>
</el-table-column>
<el-table-column label="入院时间" align="center" prop="admissionDate" 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="attendingPhysician" />
<el-table-column label="出院方式" align="center" prop="dischargeMethod" />
<el-table-column label="患者来源" align="center" prop="patientSource">
<template slot-scope="scope">
<dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="住址" align="center" prop="address" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
@ -368,7 +368,7 @@
</template>
<script>
import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/patientInfo";
import { listPatientInfo, getPatientInfo, delPatientInfo, addPatientInfo, updatePatientInfo } from "@/api/manage/preHospitalized";
import { getAge } from "@/utils/age";
import { selectAgencyList, getDepartmentList, subordinateAgencyList } from "@/api/manage/selectAgencyList";
import { getToken } from '@/utils/auth'
@ -586,6 +586,18 @@ export default {
},
/** 提交按钮 */
submitForm() {
if (this.form.hospitalAgencyId) {
this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
}
if (this.form.campusAgencyId) {
this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
}
if (this.form.departmentId) {
this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
}
if (this.form.hospitalAgencyId) {
this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
}
console.log(this.form)
this.$refs["form"].validate(valid => {
if (valid) {

View File

@ -373,10 +373,10 @@
<el-input v-model="form.measureResult" placeholder="请输入检测结果,数字或文字描述" />
</el-form-item>
<el-form-item label="项目指标最大值" prop="maxValue">
<el-input v-model="form.maxValue" placeholder="请输入项目指标最大值" />
<el-input v-model="form.maxValue" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请输入项目指标最大值" />
</el-form-item>
<el-form-item label="项目指标最小值" prop="minValue">
<el-input v-model="form.minValue" placeholder="请输入项目指标最小值" />
<el-input v-model="form.minValue" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请输入项目指标最小值" />
</el-form-item>
<el-form-item label="项目指标默认值" prop="defaultValue">
<el-input v-model="form.defaultValue" placeholder="请输入项目指标默认值" />

View File

@ -355,6 +355,7 @@
<el-form-item label="" prop="serviceFrequencyStart" label-width="">
<el-input
:disabled="disableda"
oninput="value=value.replace(/[^\d.]/g,'')"
v-model="form.serviceFrequencyStart"
placeholder="请输入服务频次数字起始值"
/>
@ -363,6 +364,7 @@
<el-form-item label="" prop="serviceFrequencyEnd" label-width="">
<el-input
:disabled="disabledb"
oninput="value=value.replace(/[^\d.]/g,'')"
v-model="form.serviceFrequencyEnd"
placeholder="请输入服务频次数字结束值"
/>

View File

@ -614,6 +614,18 @@ export default {
},
/** 提交按钮 */
submitForm() {
if (this.form.hospitalAgencyId) {
this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
}
if (this.form.campusAgencyId) {
this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
}
if (this.form.departmentId) {
this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
}
if (this.form.hospitalAgencyId) {
this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
}
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {

View File

@ -652,6 +652,18 @@ export default {
} else if (this.form.visitMethod == 'OUTPATIENT_SERVICE') {
this.form.patientType = 'OUTPATIENT'
}
if (this.form.hospitalAgencyId) {
this.form.hospitalAgencyName = this.hospitalAgencylist.find(e => e.id == this.form.hospitalAgencyId).agencyName
}
if (this.form.campusAgencyId) {
this.form.campusAgencyName = this.form_campusAgencylist.find(e => e.id == this.form.campusAgencyId).agencyName
}
if (this.form.departmentId) {
this.form.departmentName = this.form_departmentlist.find(e => e.id == this.form.departmentId).departmentName
}
if (this.form.hospitalAgencyId) {
this.form.wardName = this.form_wardlist.find(e => e.id == this.form.wardId).departmentName
}
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {