From dce69c73df8457e538946b0a58e04e9193334974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 10:56:28 +0800 Subject: [PATCH 01/17] xg --- src/api/manage/healthEducation.js | 2 +- src/views/manage/Auditing/index.vue | 2 +- .../RehabilitationPlanandRecords.vue | 293 ++++++++++++++++++ .../manage/components/healthEducation.vue | 60 +++- src/views/manage/details/patientdetails.vue | 10 +- 5 files changed, 355 insertions(+), 12 deletions(-) create mode 100644 src/views/manage/components/RehabilitationPlanandRecords.vue diff --git a/src/api/manage/healthEducation.js b/src/api/manage/healthEducation.js index afc5a67..52687c3 100644 --- a/src/api/manage/healthEducation.js +++ b/src/api/manage/healthEducation.js @@ -4,7 +4,7 @@ import request from '@/utils/request' // 查询患者宣教信息列表 export function getList(query) { return request({ - url: '/manage/patientPropaganda/getList', + url: '/manage/signnode/getNodeList', method: 'get', params: query }) diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index 795ec96..726fbab 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -133,7 +133,7 @@
- 随访详情:预览 + 人工随访详情:预览
diff --git a/src/views/manage/components/RehabilitationPlanandRecords.vue b/src/views/manage/components/RehabilitationPlanandRecords.vue new file mode 100644 index 0000000..3a132ba --- /dev/null +++ b/src/views/manage/components/RehabilitationPlanandRecords.vue @@ -0,0 +1,293 @@ + + + \ No newline at end of file diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue index 2eb6fac..d553524 100644 --- a/src/views/manage/components/healthEducation.vue +++ b/src/views/manage/components/healthEducation.vue @@ -1,15 +1,27 @@ + \ No newline at end of file diff --git a/src/views/manage/components/wangEditor.vue b/src/views/manage/components/wangEditor.vue new file mode 100644 index 0000000..de39f8b --- /dev/null +++ b/src/views/manage/components/wangEditor.vue @@ -0,0 +1,583 @@ + + + + + diff --git a/src/views/system/components/wangEditor.vue b/src/views/system/components/wangEditor.vue index d9f864e..995ddf9 100644 --- a/src/views/system/components/wangEditor.vue +++ b/src/views/system/components/wangEditor.vue @@ -95,7 +95,6 @@ export default ({ }, methods: { emit() { - console.log() this.$emit("on-nodeContent", { nodeContent: this.html }); }, panelchange(item) { From 6972bc535e1837e8098df0d1c11801997da29421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:15:18 +0800 Subject: [PATCH 03/17] xg --- .../RehabilitationPlanandRecords.vue | 92 +++++++++---------- 1 file changed, 42 insertions(+), 50 deletions(-) diff --git a/src/views/manage/components/RehabilitationPlanandRecords.vue b/src/views/manage/components/RehabilitationPlanandRecords.vue index f4b31d0..c43e3ba 100644 --- a/src/views/manage/components/RehabilitationPlanandRecords.vue +++ b/src/views/manage/components/RehabilitationPlanandRecords.vue @@ -76,7 +76,7 @@
-
+
专病管理路径:
@@ -92,55 +92,32 @@
路径详情: 预览
-
-
-
-
- 任务内容:{{ uitem.taskType == 'PHONE_OUTBOUND' ? "电话外呼" : "" }} - {{ uitem.taskType == 'QUESTIONNAIRE_SCALE' ? "问卷量表" : "" }} - {{ uitem.taskType == 'PROPAGANDA_ARTICLE' ? "宣教文案" : "" }} - {{ uitem.taskType == 'TEXT_REMIND' ? "文字提醒" : "" }} - {{ uitem.taskType == 'ARTIFICIAL_FOLLOW_UP' ? "人工随访" : "" }} -
-
- 话术模板:{{ uitem.phoneTemplateName }} -
-
- 问卷模板:{{ uitem.questionnaireName }} -
-
- 问卷有效期:{{ uitem.questionExpirationDate }}天 -
-
- 宣教模板:{{ uitem.propagandaTitle }} -
-
- 提醒内容:{{ uitem.textRemindContent }} -
-
- 人工随访模板:{{ uitem.questionnaireName }} -
-
- 人工随访详情:预览 -
-
- 问卷模板详情:预览 -
-
- 宣教模板详情:预览 -
-
- 话术模板详情:预览 +
+
+
+ 触发条件: +
+
+
+
+
+ + {{ uitem.triggerConditionName == 'DIAGNOSIS' ? '诊断' : '' }} + {{ uitem.triggerConditionName == 'DRESSING_CHANGE_DATE' ? '换药日期' : '' }} + {{ uitem.triggerConditionName == 'TREATMENT_METHOD' ? '治疗方式' : '' }} + {{ uitem.triggerConditionName == 'SURGICAL_NAME' ? '手术名称' : '' }} + {{ uitem.triggerConditionName == 'DRUG_NAME' ? '药品名称' : '' }} + + + {{ uitem.triggerConditionOperator == 'CONTAIN' ? '包含' : '' }} + {{ uitem.triggerConditionOperator == 'NOT_CONTAIN' ? '不包含' : '' }} + {{ uitem.triggerConditionOperator == 'EQUAL_TO' ? '等于' : '' }} + {{ uitem.triggerConditionOperator == 'NOT_EQUAL_TO' ? '不等于' : '' }} + + + {{ uitem.triggerConditionValue }} +
@@ -280,6 +257,19 @@ export default { width: 75%; padding-top: 20px; + .tagtitle { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 100%; + margin: 0px; + color: black; + + span { + padding-left: 10px; + } + } + .titletop { font-size: 16px; font-weight: 700; @@ -346,6 +336,8 @@ export default { .text { font-size: 16px; font-weight: bold; + height: 30px; + line-height: 30px; } } } From 56bc4656b165459926dacfd8b247e0eb7a7aef95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:20:13 +0800 Subject: [PATCH 04/17] xg --- .../RehabilitationPlanandRecords.vue | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/views/manage/components/RehabilitationPlanandRecords.vue b/src/views/manage/components/RehabilitationPlanandRecords.vue index c43e3ba..90e54d8 100644 --- a/src/views/manage/components/RehabilitationPlanandRecords.vue +++ b/src/views/manage/components/RehabilitationPlanandRecords.vue @@ -190,10 +190,11 @@ export default { phoneopen: false, propagandaopen: false, specialDiseaseNodeopen: false, + loading: null, }; }, mounted() { - this.info(); + this.info(0); }, methods: { //查看专病节点 @@ -227,19 +228,32 @@ export default { this.lookitem = {} }, clicknameitem(item, index) { - this.itemindex = index + this.loading = this.$loading({ + lock: true, + text: '加载数据中', + spinner: 'el-icon-loading', + background: 'rgba(255,255,255,0.7)' + }); if (index == 1) { this.query.taskCreateType = 'MANUAL_CREATE' } else { this.query.taskCreateType = 'MANUAL_MATCHE' } - this.info(); + this.info(index); }, - info() { + info(index) { + this.loading = this.$loading({ + lock: true, + text: '加载数据中', + spinner: 'el-icon-loading', + background: 'rgba(255,255,255,0.7)' + }); this.query.patientId = this.$route.query.patientId getList(this.query).then(res => { if (res.data.length > 0) { this.categorylist = res.data + this.itemindex = index + this.loading.close(); } }) }, From 76f3cb1e93556bf05ecff1e7f6bec3312376787e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:29:00 +0800 Subject: [PATCH 05/17] xg --- src/api/unitconfig/patientConfiguration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/unitconfig/patientConfiguration.js b/src/api/unitconfig/patientConfiguration.js index 512b375..2481f64 100644 --- a/src/api/unitconfig/patientConfiguration.js +++ b/src/api/unitconfig/patientConfiguration.js @@ -29,7 +29,7 @@ export function addVisitRecord(data) { // 保存修改患者就诊记录基本信息 export function updateVisitRecord(data) { return request({ - url: '/manage/visitRecord/updateRecord', + url: '/manage/patientInfo', method: 'put', data: data }) From a1d3f44c5b5fd7f0713637f09ad80c85ad0d57c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:38:10 +0800 Subject: [PATCH 06/17] xg --- src/api/unitconfig/patientConfiguration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/unitconfig/patientConfiguration.js b/src/api/unitconfig/patientConfiguration.js index 2481f64..d2e56ac 100644 --- a/src/api/unitconfig/patientConfiguration.js +++ b/src/api/unitconfig/patientConfiguration.js @@ -20,7 +20,7 @@ export function getVisitRecord(id) { // 新增患者就诊记录基本信息 export function addVisitRecord(data) { return request({ - url: '/manage/visitRecord', + url: '/manage/patientInfo', method: 'post', data: data }) From 0bd778ee3f0828b7662d191802d6a96598c71202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:55:41 +0800 Subject: [PATCH 07/17] xg --- src/api/system/specialDiseaseRoute.js | 2 +- .../manage/components/specialDiseaseRoute.vue | 15 ++++++------- src/views/manage/newSigning/index.vue | 22 ++++++++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/api/system/specialDiseaseRoute.js b/src/api/system/specialDiseaseRoute.js index 2bf6679..133ee65 100644 --- a/src/api/system/specialDiseaseRoute.js +++ b/src/api/system/specialDiseaseRoute.js @@ -45,7 +45,7 @@ export function delSpecialDiseaseRoute(id) { //科室 export function selectDiseaseCount(departmentName) { return request({ - url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}`, + url: `/system/specialDiseaseRoute/departmentRouteCount?departmentName=${departmentName}&releaseStatus=PUBLISHED`, method: 'get', }) diff --git a/src/views/manage/components/specialDiseaseRoute.vue b/src/views/manage/components/specialDiseaseRoute.vue index c1cd89a..aca945a 100644 --- a/src/views/manage/components/specialDiseaseRoute.vue +++ b/src/views/manage/components/specialDiseaseRoute.vue @@ -3,7 +3,7 @@ {{ handleselectName ? handleselectName : '请选择专病管理路径' }} - +
@@ -23,12 +23,9 @@ - - - - - - + + @@ -116,7 +113,7 @@ export default { routeCode: null, version: null, routeClassify: null, - releaseStatus: null, + releaseStatus: 'PUBLISHED', suitRange: null, routeSort: null, routeRemark: null, @@ -170,6 +167,7 @@ export default { }, //科室 infolists() { + this.DepartmentoList.releaseStatus = 'PUBLISHED' selectDiseaseCount(this.departmentName).then((res) => { this.DepartmentoList = res.data; }); @@ -177,6 +175,7 @@ export default { /** 查询专病路径信息列表 */ getList() { this.loading = true; + this.queryParams.releaseStatus = 'PUBLISHED' listSpecialDiseaseRoute(this.queryParams).then(response => { this.specialDiseaseRouteList = response.rows; this.total = response.total; diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index 7b9a05c..21b80e3 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -28,7 +28,7 @@ - - - +
@@ -90,15 +90,19 @@ - - + + + + 请选择专病管理路径 -
From d97af31c58191dad3ac445c499584bc7dd8213cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 16 Apr 2024 14:57:18 +0800 Subject: [PATCH 08/17] xg --- src/views/manage/components/specialDiseaseRoute.vue | 4 ++-- src/views/manage/newSigning/index.vue | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/manage/components/specialDiseaseRoute.vue b/src/views/manage/components/specialDiseaseRoute.vue index aca945a..24b6a29 100644 --- a/src/views/manage/components/specialDiseaseRoute.vue +++ b/src/views/manage/components/specialDiseaseRoute.vue @@ -75,8 +75,8 @@