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

This commit is contained in:
闫晓茹 2024-04-11 17:22:43 +08:00
commit 73e3f6b909
8 changed files with 122 additions and 73 deletions

View File

@ -0,0 +1,53 @@
<template>
<div class="card">
<div class="cardleft">
<img class="headsculpture" src="../../../assets/manage/touxiang.png" alt="">
<!-- <img class="headsculpture" src="../../../assets/manage/nvtouxiang.png" alt=""> -->
</div>
<div class="cardright">
</div>
</div>
</template>
<script>
export default {
name: "Auditing",
data() {
return {
};
},
created() {
},
methods: {
}
};
</script>
<style lang="scss" scoped>
.card {
width: 100%;
display: flex;
justify-content: space-evenly;
padding: 20px 0;
height: calc(100vh - 84px);
background-color: #F1F3F5;
.cardleft {
width: 35%;
background-color: #fff;
overflow: scroll;
padding: 20px;
.headsculpture {
width: 50px;
height: 50px;
}
}
.cardright {
overflow: scroll;
background-color: #fff;
width: 62%;
}
}
</style>

View File

@ -32,6 +32,9 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item> <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions title="专病管理路径" style="margin-top: 20px;">
<el-descriptions-item label="路径名称">{{ ByRecord.routeName }}</el-descriptions-item>
</el-descriptions>
<el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions"> <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
<el-descriptions-item> <el-descriptions-item>
<el-table :data="ByRecord.signDevices" style="width: 100%"> <el-table :data="ByRecord.signDevices" style="width: 100%">

View File

@ -14,7 +14,7 @@
<el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
@keyup.enter.native="handleQuery" style="width:200px" /> @keyup.enter.native="handleQuery" style="width:200px" />
</el-form-item> </el-form-item>
<el-form-item label="出院/就诊时间" prop="dischargeTimeStart"> <el-form-item label="出院/就诊时间" prop="dischargeTimeStart" label-width="120px">
<el-date-picker v-model="dischargeTime" type="daterange" range-separator="" start-placeholder="开始日期" <el-date-picker v-model="dischargeTime" type="daterange" range-separator="" start-placeholder="开始日期"
style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期"> style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>

View File

@ -438,6 +438,7 @@
</el-form-item> </el-form-item>
<el-form-item label="添加封面" prop="propagandaCoverPath"> <el-form-item label="添加封面" prop="propagandaCoverPath">
<stationAcatar <stationAcatar
v-if="open"
@imgUrl="imgUrl" @imgUrl="imgUrl"
:img="form.propagandaCoverPath" :img="form.propagandaCoverPath"
:type="'propagandaCoverUrl'" :type="'propagandaCoverUrl'"

View File

@ -333,7 +333,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-notebook-2" icon="el-icon-notebook-2"
@click="handledatail(scope.row)" @click="handleUpdate(scope.row)"
>详情</el-button >详情</el-button
> >
</template> </template>
@ -771,6 +771,7 @@ export default {
age: row.birthDate ? getAge(row.birthDate) : "", age: row.birthDate ? getAge(row.birthDate) : "",
manageRouteId: row.manageRouteId, manageRouteId: row.manageRouteId,
manageRouteNodeId: row.manageRouteNodeId, manageRouteNodeId: row.manageRouteNodeId,
visitRecordId:row.visitRecordId,
departmentId: row.departmentId, departmentId: row.departmentId,
departmentName: row.departmentName, departmentName: row.departmentName,

View File

@ -39,7 +39,6 @@
<div style="width: 50%">出生日期{{ list.birthDate }}</div> <div style="width: 50%">出生日期{{ list.birthDate }}</div>
</div> </div>
<div class="bottom"> <div class="bottom">
<!-- <div>注册时间{{ $route.query.createTime }}</div> -->
<div>家属电话{{ list.familyMemberPhone }}</div> <div>家属电话{{ list.familyMemberPhone }}</div>
<div style="width: 50%">住址{{ list.address }}</div> <div style="width: 50%">住址{{ list.address }}</div>
</div> </div>
@ -271,8 +270,6 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- 人工随访 -->
</div> </div>
</div> </div>
</div> </div>
@ -281,9 +278,7 @@
<script> <script>
import { selectFollowPatientInfo, question, addPatientQuestionResult } from "@/api/system/followupsee"; import { selectFollowPatientInfo, question, addPatientQuestionResult } from "@/api/system/followupsee";
import { getScript } from "@/api/manage/script"; import { getScript } from "@/api/manage/script";
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
export default { export default {
name: "patientdetails", name: "patientdetails",
data() { data() {
@ -291,9 +286,8 @@ export default {
obj: {}, obj: {},
checkList: [], checkList: [],
checked: false, checked: false,
formlist:{}, formlist: {},
form: { form: {
taskType: this.$route.query.taskType, taskType: this.$route.query.taskType,
routeHandleId: Cookies.get('userId'), routeHandleId: Cookies.get('userId'),
routeHandlePerson: Cookies.get('userName'), routeHandlePerson: Cookies.get('userName'),
@ -314,12 +308,6 @@ export default {
{ required: true, message: '请输入任务处理信息', trigger: 'change' } { required: true, message: '请输入任务处理信息', trigger: 'change' }
], ],
}, },
options: [
{ id: 1, value: 'A', label: '选项A' },
{ id: 2, value: 'B', label: '选项B', show: 'true' },
{ id: 3, value: 'C', label: '选项C' }
],
radio: "B", radio: "B",
id: "", id: "",
list: [], list: [],
@ -329,9 +317,7 @@ export default {
totalScore: 0, // totalScore: 0, //
routeHandlePerson: null, routeHandlePerson: null,
routeHandleId: null, routeHandleId: null,
}, },
}; };
}, },
@ -344,9 +330,6 @@ export default {
getScript(this.$route.query.templateId).then(response => { getScript(this.$route.query.templateId).then(response => {
if (response.data) { if (response.data) {
this.formlist = response.data; this.formlist = response.data;
} }
}); });
} }
@ -357,9 +340,8 @@ export default {
this.questiondata.questionSubjectList[index].optionAnswer = e this.questiondata.questionSubjectList[index].optionAnswer = e
}, },
// //
timepickerselect(e, index) { timepickerselect(e, index) {
console.log(e)
this.questiondata.questionSubjectList[index].optionAnswer = e this.questiondata.questionSubjectList[index].optionAnswer = e
}, },
radioGroupChange(e, item) { radioGroupChange(e, item) {
@ -386,14 +368,10 @@ export default {
} else { } else {
this.questiondata.questionSubjectList[index].questionSubjectOptionList[aindex].optionChooseSign = '1' this.questiondata.questionSubjectList[index].questionSubjectOptionList[aindex].optionChooseSign = '1'
} }
console.log(this.questiondata, '11111111复选框')
}, },
info() { info() {
selectFollowPatientInfo(this.id).then((res) => { selectFollowPatientInfo(this.id).then((res) => {
this.list = res.data; this.list = res.data;
}); });
}, },
@ -410,6 +388,7 @@ export default {
this.questiondata.manageRouteName = this.$route.query.manageRouteName this.questiondata.manageRouteName = this.$route.query.manageRouteName
this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName
this.questiondata.taskType = this.$route.query.taskType this.questiondata.taskType = this.$route.query.taskType
this.questiondata.visitRecordId=this.$route.query.visitRecordId
this.questiondata.totalScore = 0 this.questiondata.totalScore = 0
this.questiondata.questionSubjectList.forEach(e => { this.questiondata.questionSubjectList.forEach(e => {
if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') { if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {
@ -432,23 +411,9 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submit() { submit() {
if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE') { if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE') {
console.log(this.questiondata, 'questiondata')
// .=. // .=.
this.$delete(this.questiondata, 'updateBy',) this.$delete(this.questiondata, 'updateBy',)
this.$delete(this.questiondata, 'updateTime',) this.$delete(this.questiondata, 'updateTime',)
this.questiondata.subjectResultDTOList = this.questiondata.questionSubjectList
this.obj = JSON.parse(JSON.stringify(this.questiondata))
delete this.obj.questionSubjectList;
this.obj.subjectResultDTOList.forEach(e => {
e.optionResultList = e.questionSubjectOptionList
if (e.optionResultList.optionSubmitAnswer) {
e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
}
this.$delete(this.obj, '0', '')
delete e.questionSubjectOptionList;
});
console.log(this.obj, 'obj')
var score = 0 var score = 0
// //
this.questiondata.questionSubjectList.forEach(e => { this.questiondata.questionSubjectList.forEach(e => {
@ -460,12 +425,26 @@ export default {
} }
} }
}) })
console.log(score, 'score') // console.log(score, 'score')
this.questiondata.totalScore = score this.questiondata.totalScore = score
} }
}) })
this.questiondata.subjectResultDTOList = this.questiondata.questionSubjectList
this.obj = JSON.parse(JSON.stringify(this.questiondata))
delete this.obj.questionSubjectList;
this.obj.subjectResultDTOList.forEach(e => {
e.optionResultList = e.questionSubjectOptionList
if (e.optionResultList.optionSubmitAnswer) {
e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
}
// this.$delete(this.obj, '0', '')
delete e.questionSubjectOptionList;
});
// console.log(this.obj, 'obj')
} else if (this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') { } else if (this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
console.log(this.questiondata, 'questiondata') console.log(this.questiondata, 'questiondata')
// .=. // .=.
@ -479,20 +458,17 @@ export default {
if (e.optionResultList.optionSubmitAnswer) { if (e.optionResultList.optionSubmitAnswer) {
e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer e.optionResultList.optionSubmitAnswer = e.optionResultList.optionSubmitAnswer
} }
this.$delete(this.obj, '0', '') // this.$delete(this.obj, '0', '')
delete e.questionSubjectOptionList; delete e.questionSubjectOptionList;
}); });
console.log(this.obj, 'obj') // this.$delete(this.obj, 'totalScore',)
this.$delete(this.questiondata, 'totalScore',)
} }
// return
// 访 // 访
if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') { if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
// console.log(this.obj, 'objobj')
// return
this.$refs["questiondata"].validate(valid => { this.$refs["questiondata"].validate(valid => {
if (valid) { if (valid) {
addPatientQuestionResult(this.obj).then(response => { addPatientQuestionResult(this.obj).then(response => {
@ -515,6 +491,8 @@ export default {
} }
}); });
} else if (this.$route.query.taskType == 'PHONE_OUTBOUND') { } else if (this.$route.query.taskType == 'PHONE_OUTBOUND') {
console.log(this.form, '话术')
// return
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.form.departmentId=this.formlist.departmentId, this.form.departmentId=this.formlist.departmentId,
@ -544,8 +522,6 @@ export default {
}); });
} }
}, },
// //
cencal() { cencal() {
@ -555,7 +531,6 @@ export default {
}); });
}, },
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
}, },
@ -563,7 +538,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-input.is-disabled .el-input__inner { ::v-deep .el-input.is-disabled .el-input__inner {
background: #fff !important; background: #fff !important;
color: #606266; color: #606266;
} }

View File

@ -43,16 +43,19 @@
<el-table-column label="问卷模板ID" align="center" prop="questionnaireId" /> <el-table-column label="问卷模板ID" align="center" prop="questionnaireId" />
<el-table-column label="问卷状态" align="center" prop="questionnaireStatus"> <el-table-column label="问卷状态" align="center" prop="questionnaireStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- active-text="已发布" inactive-text="未发布" --> <el-tag type="success" v-if="scope.row.questionnaireStatus == 'PUBLISHED'">已发布</el-tag>
<el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949" <el-tag type="warning" v-else>未发布</el-tag>
active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
</el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="病种名称" align="center" prop="diseaseTypeName" /> <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
</el-switch> -->
<el-button size="mini" type="text" @click="switchstatus('UNPUBLISHED', scope.row)"
v-if="scope.row.questionnaireStatus == 'PUBLISHED'">取消发布</el-button>
<el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)" v-else>发布</el-button>
<el-button size="mini" type="text" @click="handleClassification(scope.row)" <el-button size="mini" type="text" @click="handleClassification(scope.row)"
v-hasPermi="['system:question:edit']">分类管理</el-button> v-hasPermi="['system:question:edit']">分类管理</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
@ -172,7 +175,7 @@ export default {
}, },
// //
handleClassification(row) { handleClassification(row) {
this.classificationform = row this.classificationform = JSON.parse(JSON.stringify(row))
if (this.classificationform.departmentId) { if (this.classificationform.departmentId) {
let query = { let query = {
departmentId: this.classificationform.departmentId departmentId: this.classificationform.departmentId
@ -199,6 +202,8 @@ export default {
} }
diseaseList(query).then(res => { diseaseList(query).then(res => {
this.diseaselist = res.data this.diseaselist = res.data
this.classificationform.diseaseTypeId = ''
this.classificationform.diseaseTypeName = ''
}) })
}, },
changediseaseType(e) { changediseaseType(e) {
@ -207,22 +212,32 @@ export default {
// //
switchstatus(e, item) { switchstatus(e, item) {
if (!item.departmentId && !this.diseaseTypeId) { if (!item.departmentId && !this.diseaseTypeId) {
this.$message.error('请选择问卷所属的科室以及科室病种后发布!'); this.$message.error('请选择问卷所属的科室以及科室病种后发布 / 取消发布!');
this.getList();
return return
} }
let query = { let text
id: item.id, if (e == 'PUBLISHED') {
questionnaireStatus: e text = '是否发布此问卷模板?'
} else {
text = '是否取消发布此问卷模板?'
} }
updateclassification(query).then(res => { this.$confirm(`${text}`, '提示', {
if (e == 'PUBLISHED') { confirmButtonText: '确定',
this.$modal.msgSuccess("修改为已发布"); cancelButtonText: '取消',
} else if (e == 'UNPUBLISHED') { }).then(() => {
this.$modal.msgSuccess("修改为未发布"); let query = {
id: item.id,
questionnaireStatus: e
} }
updateclassification(query).then(res => {
if (e == 'PUBLISHED') {
this.$modal.msgSuccess("修改为已发布");
} else if (e == 'UNPUBLISHED') {
this.$modal.msgSuccess("修改为未发布");
}
this.getList();
})
}) })
this.getList();
}, },
// //
handleNodeClick(data) { handleNodeClick(data) {

View File

@ -318,7 +318,7 @@ export default {
specialDiseaseNodeList: [], specialDiseaseNodeList: [],
}, },
form: { form: {
nodeContent: '', nodeContent: '<p></p>',
templateId: '', templateId: '',
templateName: '', templateName: '',
taskType: '', taskType: '',
@ -383,7 +383,7 @@ export default {
routeNodeDay: '', routeNodeDay: '',
list: [ list: [
{ {
nodeContent: '', nodeContent: '<p></p>',
templateId: '', templateId: '',
templateName: '', templateName: '',
taskType: '', taskType: '',
@ -475,6 +475,7 @@ export default {
}, },
bottomclickevent(uitem, index, uindex) { bottomclickevent(uitem, index, uindex) {
this.form = uitem this.form = uitem
this.form.nodeContent = uitem.nodeContent
if (this.form.taskType) { if (this.form.taskType) {
this.changeTaskType(this.form.taskType, this.form.taskSubdivision) this.changeTaskType(this.form.taskType, this.form.taskSubdivision)
} }
@ -530,7 +531,7 @@ export default {
routeNodeDay: '', routeNodeDay: '',
list: [ list: [
{ {
nodeContent: '', nodeContent: '<p></p>',
templateId: '', templateId: '',
templateName: '', templateName: '',
taskType: '', taskType: '',
@ -553,7 +554,7 @@ export default {
}, },
additem(item) { additem(item) {
item.list.push({ item.list.push({
nodeContent: '', nodeContent: '<p></p>',
templateId: '', templateId: '',
templateName: '', templateName: '',
taskType: '', taskType: '',