From 60e5b16ec6d1c8a4fbb9c714b2066a5dc5202b46 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 15 四月 2025 18:14:12 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 41 +++
src/views/followvisit/outpatient/index.vue | 131 ++----------
src/views/followvisit/technology/index.vue | 6
src/views/outsideChainxj.vue | 4
src/views/patient/physical/index.vue | 55 +----
src/store/modules/user.js | 5
src/views/repositoryai/templateku/configurat/index.vue | 2
src/views/patient/medtechnician/PatientChart.vue | 38 +++
src/views/patient/subsequent/index.vue | 105 +++-------
src/views/followvisit/record/index.vue | 6
src/views/outsideChainnew.vue | 2
src/views/patient/propaganda/QuestionnaireTask.vue | 53 ++++-
.env.staging | 2
src/views/repositoryai/templateku/configurat/taskub.vue | 2
.env.development | 2
src/views/outsideChainwt.vue | 2
.env.production | 2
src/views/outsideChainxjnew.vue | 4
src/views/patient/propaganda/Missioncreation.vue | 4
src/views/patient/propaganda/particty.vue | 104 +++++++---
src/views/followvisit/discharge/index.vue | 2
src/views/outsideChainwtnew.vue | 2
22 files changed, 275 insertions(+), 299 deletions(-)
diff --git a/.env.development b/.env.development
index 956b84b..ccd4405 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅畞浜烘皯鍖婚櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏅烘収闅忚骞冲彴
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
diff --git a/.env.production b/.env.production
index 9f96aca..c37c754 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅畞浜烘皯鍖婚櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏅烘収闅忚骞冲彴
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
diff --git a/.env.staging b/.env.staging
index bce3b63..8ddc1c0 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鏅畞浜烘皯鍖婚櫌鏅烘収闅忚骞冲彴
+VUE_APP_TITLE = 鏅烘収闅忚骞冲彴
NODE_ENV = production
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 654f219..b4d1ace 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -130,6 +130,11 @@
setToken(res.token)
commit('SET_TOKEN', res.token)
localStorage.setItem('orgid', orgid);
+ if (orgid=='47255004333112711A1001') {
+ localStorage.setItem('orgname', '鏅畞浜烘皯鍖婚櫌');
+ }else if (orgid=='47231022633110211A2101') {
+ localStorage.setItem('orgname', '涓芥按甯備腑鍖婚櫌');
+ }
resolve()
}).catch(error => {
reject(error)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 1f06a96..9e33b7b 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -1572,7 +1572,7 @@
form.finishtime = "";
if (form.resource) {
if (form.resource == 2) {
- form.serviceType = 10;
+ form.serviceType = 13;
}
} else {
this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 35ac394..93a0376 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -26,7 +26,7 @@
<div class="ysfleftvlue">
<el-card shadow="hover">
<div style="padding: 8px">
- <span>宸插彂閫佹湭棰嗗彇</span>
+ <span>琛ㄥ崟宸插彂閫�</span>
<div
style="
text-align: center;
@@ -79,7 +79,7 @@
></el-input>
</el-form-item>
- <el-form-item label="妫�鏌ユ椂闂�">
+ <el-form-item label="褰卞儚鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -192,7 +192,7 @@
<el-table
v-loading="loading"
:data="userList"
- height="806"
+ height="808"
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
@@ -218,7 +218,10 @@
size="medium"
type="text"
@click="
- gettoken360(scope.row.sfzh)
+ $router.push({
+ path: '/patient/indexls/',
+ query: { sfzh: scope.row.idcardno },
+ })
"
><span class="button-textsc">{{
scope.row.sendname
@@ -236,17 +239,17 @@
<template slot-scope="scope">
<div v-if="scope.row.sendstate == 1">
<el-tag type="primary" :disable-transitions="false"
- >琚鍙�</el-tag
+ >琛ㄥ崟宸查鍙�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 2">
<el-tag type="primary" :disable-transitions="false"
- >寰呭彂閫�</el-tag
+ >寰呴殢璁�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 3">
<el-tag type="success" :disable-transitions="false"
- >宸插彂閫佹湭棰嗗彇</el-tag
+ >琛ㄥ崟宸插彂閫�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 4">
@@ -303,7 +306,7 @@
</template>
</el-table-column>
<el-table-column
- label="褰卞儚缁撴灉"
+ label="闅忚缁撴灉"
width="200"
align="center"
key="remark"
@@ -319,7 +322,7 @@
</template>
</el-table-column>
<el-table-column
- label="褰卞儚鏃ユ湡"
+ label="妫�鏌ユ棩鏈�"
width="200"
align="center"
key="endtime"
@@ -341,7 +344,7 @@
</template></el-table-column
>
<el-table-column
- label="褰卞儚澶╂暟"
+ label="宸叉鏌ュぉ鏁�"
width="120"
align="center"
key="endDay"
@@ -649,7 +652,7 @@
resetUserPwd,
changeUserStatus,
} from "@/api/system/user";
-import { getTaskservelist,query360PatInfo } from "@/api/AiCentre/index";
+import { getTaskservelist } from "@/api/AiCentre/index";
import Treeselect from "@riophae/vue-treeselect";
import store from "@/store";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -709,39 +712,7 @@
},
value: [],
list: [],
- postData: {
- XiaoXiTou: {
- FaSongFCSJC: "ZJHES",
- FaSongJGID: "47255004333112711A1001",
- FaSongJGMC: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�",
- FaSongSJ: "2025-01-09聽17:29:36",
- FaSongXTJC: "SUIFANGXT",
- FaSongXTMC: "闅忚绯荤粺",
- XiaoXiID: "5FA92AFB-9833-4608-87C7-F56A654AC171",
- XiaoXiLX: "SC_LC_360STCX",
- XiaoXiMC: "360聽瑙嗗浘鏌ヨ",
- ZuHuID: "1400361376454545408",
- ZuHuMC: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�",
- },
- YeWuXX: {
- BingRenXX: {
- ZhengJianHM: '',
- ZhengJianLXDM: "01",
- ZhengJianLXMC: "灞呮皯韬唤璇�",
- ZuZhiJGID: "47255004333112711A1001",
- ZuZhiJGMC: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�",
- },
- YongHuXX: {
- XiTongID: "SUIFANGXT",
- XiTongMC: "闅忚绯荤粺",
- YongHuID: "1400466972205912064",
- YongHuXM: "JNRMYY",
- ZuZhiJGID: "47255004333112711A1001",
- ZuZhiJGMC: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�",
- idp: "lyra",
- },
- },
- },
+
sourcetype: [
{
value: 1,
@@ -761,7 +732,7 @@
loading: false,
cardlist: [
{
- name: "褰卞儚鎶ュ憡鎬婚噺",
+ name: "褰卞儚鏈嶅姟鎬婚噺",
value: 0,
},
// {
@@ -791,7 +762,7 @@
},
// {
- // name: "宸插彂閫佹湭棰嗗彇",
+ // name: "琛ㄥ崟宸插彂閫�",
// value: 0,
// },
],
@@ -809,12 +780,10 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType: 3,
- searchscope: 3,
+ serviceType: 11,
sendstate:2,
scopetype: [],
- leaveldeptcodes: [],
- leavehospitaldistrictcodes: [],
+
},
propss: { multiple: true },
options: [],
@@ -898,26 +867,11 @@
/** 鏌ヨ褰卞儚闅忚鏈嶅姟鍒楄〃 */
getList(refresh) {
// 榛樿鍏ㄩ儴
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
// 鎺ュ彈寮傚父璺宠浆
- if (this.errtype) {
- this.topqueryParams.leavehospitaldistrictcodes.push(
- this.leavehospitaldistrictcode
- );
- console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
- }
+
this.loading = true;
- if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
- this.topqueryParams.deptOrDistrict=2;
- }else{
- this.topqueryParams.deptOrDistrict=1;
- }
+
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
@@ -992,19 +946,6 @@
row.status = row.status === "0" ? "1" : "0";
});
},
- //鎮ｈ��360璺宠浆s
- gettoken360(sfzh) {
- this.postData.YeWuXX.BingRenXX.ZhengJianHM=sfzh
- query360PatInfo(this.postData).then((res) => {
- if (res.data.url) {
- window.open(res.data.url, '_blank');
- // this.linkUrl = res.data.url;
- }else{
- this.$modal.msgWarning("360鏌ヨ鏃犵粨鏋�");
- }
- });
-
- },
// 鍙栨秷鎸夐挳
cancel() {
this.addalteropen = false;
@@ -1030,13 +971,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
this.topqueryParams.pageNum = 1;
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
@@ -1047,20 +982,9 @@
handleChange(value) {
let type = value[0];
let code = value.slice(-1)[0];
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.leaveldeptcodes = [];
- if (type == 1) {
- this.topqueryParams.leaveldeptcodes.push(code);
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.searchscope = 1;
- } else if (type == 2) {
- this.topqueryParams.leavehospitaldistrictcodes.push(code);
- this.topqueryParams.leaveldeptcodes = [];
- this.topqueryParams.searchscope = 2;
- } else {
- this.topqueryParams.searchscope = 3;
- }
+
+
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
@@ -1068,9 +992,8 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
+ serviceType: 11,
sendstate:2,
- serviceType: 3,
- searchscope: 2,
};
this.handleQuery(1);
},
@@ -1106,7 +1029,7 @@
path: "/followvisit/QuestionnaireTask",
query: {
type: 2,
- serviceType: 3,
+ serviceType: 11,
},
});
},
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index a246c81..e039e6e 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -892,7 +892,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType: 10,
+ serviceType: 13,
searchscope: 3,
sendstate:2,
sort:2,
@@ -1231,7 +1231,7 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- serviceType: 10,
+ serviceType: 13,
sort:2,
searchscope: 2,
sendstate:2,
@@ -1270,7 +1270,7 @@
path: "/followvisit/QuestionnaireTask",
query: {
type: 2,
- serviceType: 10,
+ serviceType: 13,
},
});
},
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index a5ce6e6..e495ccf 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -23,7 +23,7 @@
@keyup.enter.native="handleQuery"
></el-input>
</el-form-item>
- <el-form-item label="鍒涘彂閫佹椂闂�">
+ <el-form-item label="鍙戦�佹椂闂�">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -474,11 +474,15 @@
value: 3,
label: "瀹ｆ暀鍏虫��",
},
+ {
+ value: 4,
+ label: "娑堟伅閫氱煡",
+ },
],
taskoptions: [
{
value: "1",
- label: "蹇冪數闅忚",
+ label: "鐩戞祴璇勪及",
},
{
value: "2",
@@ -486,7 +490,7 @@
},
{
value: "3",
- label: "褰卞儚闅忚",
+ label: "闂ㄨ瘖闅忚",
},
{
value: "4",
@@ -494,16 +498,40 @@
},
{
value: "5",
+ label: "澶嶈瘖绠＄悊",
+ },
+ // {
+ // value: "5",
+ // label: "婊℃剰搴﹁皟鏌�",
+ // },
+ {
+ value: "7",
+ label: "鎮ｈ�呮姤鍛�",
+ },
+ // {
+ // value: "8",
+ // label: "鍏朵粬閫氱煡",
+ // },
+ {
+ value: "9",
label: "浣撴闅忚",
},
+ // {
+ // value: "10",
+ // label: "鍖绘妧闅忚",
+ // },
{
value: "11",
- label: "鍖绘妧闅忚",
+ label: "褰卞儚闅忚",
},
{
- value: "10",
- label: "涓撶闅忚",
+ value: "12",
+ label: "蹇冪數闅忚",
},
+ // {
+ // value: "13",
+ // label: "涓撶闅忚",
+ // },
],
tasktopic: "2", //鏂板绫诲瀷
activname: "",
@@ -689,7 +717,6 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
- console.log(this.topqueryParams.type);
this.topqueryParams.serviceType = Number(this.tasktopic);
if (
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index eec3dd4..6bf1ad4 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -880,7 +880,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType: 11,
+ serviceType: 10,
searchscope: 3,
sendstate:2,
scopetype: [],
@@ -1200,7 +1200,7 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- serviceType: 11,
+ serviceType: 10,
searchscope: 2,
sendstate:2,
};
@@ -1238,7 +1238,7 @@
path: "/followvisit/QuestionnaireTask",
query: {
type: 2,
- serviceType: 11,
+ serviceType: 10,
},
});
},
diff --git a/src/views/outsideChainnew.vue b/src/views/outsideChainnew.vue
index 96c6487..f8738ed 100644
--- a/src/views/outsideChainnew.vue
+++ b/src/views/outsideChainnew.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index fec6b42..a8da2c1 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 0020afa..37858aa 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -8,7 +8,7 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue
index 3fa6b0c..33d82ba 100644
--- a/src/views/outsideChainxj.vue
+++ b/src/views/outsideChainxj.vue
@@ -10,12 +10,12 @@
<div class="CONTENT" >
<div class="preview-left">
<div class="toptitle">
- <div class="title">{{ taskname ? taskname : "鏅畞浜烘皯鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
+ <div class="title">{{ taskname ? taskname : ""+localStorage.getItem("orgname")+"鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
<div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5">
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/outsideChainxjnew.vue b/src/views/outsideChainxjnew.vue
index f2c2e10..d61c135 100644
--- a/src/views/outsideChainxjnew.vue
+++ b/src/views/outsideChainxjnew.vue
@@ -10,12 +10,12 @@
<div class="CONTENT" >
<div class="preview-left">
<div class="toptitle">
- <div class="title">{{ taskname ? taskname : "鏅畞浜烘皯鍖婚櫌鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
+ <div class="title">{{ taskname ? taskname : ""+localStorage.getItem("orgname")+"鍖绘姢鐭ヨ瘑瀹ｆ暀" }}</div>
<div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5">
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
diff --git a/src/views/patient/medtechnician/PatientChart.vue b/src/views/patient/medtechnician/PatientChart.vue
index 8f2022d..72782ef 100644
--- a/src/views/patient/medtechnician/PatientChart.vue
+++ b/src/views/patient/medtechnician/PatientChart.vue
@@ -23,7 +23,7 @@
@keyup.enter.native="handleQuery"
></el-input>
</el-form-item>
- <el-form-item label="鍒涘彂閫佹椂闂�">
+ <el-form-item label="鍙戦�佹椂闂�">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -467,11 +467,15 @@
value: 3,
label: "瀹ｆ暀鍏虫��",
},
+ {
+ value: 4,
+ label: "娑堟伅閫氱煡",
+ },
],
taskoptions: [
{
value: "1",
- label: "蹇冪數闅忚",
+ label: "鐩戞祴璇勪及",
},
{
value: "2",
@@ -479,7 +483,7 @@
},
{
value: "3",
- label: "褰卞儚闅忚",
+ label: "闂ㄨ瘖闅忚",
},
{
value: "4",
@@ -487,20 +491,40 @@
},
{
value: "5",
- label: "浣撴闅忚",
+ label: "澶嶈瘖绠＄悊",
},
+ // {
+ // value: "5",
+ // label: "婊℃剰搴﹁皟鏌�",
+ // },
{
value: "7",
label: "鎮ｈ�呮姤鍛�",
},
+ // {
+ // value: "8",
+ // label: "鍏朵粬閫氱煡",
+ // },
+ {
+ value: "9",
+ label: "浣撴闅忚",
+ },
+ // {
+ // value: "10",
+ // label: "鍖绘妧闅忚",
+ // },
{
value: "11",
- label: "鍖绘妧闅忚",
+ label: "褰卞儚闅忚",
},
{
- value: "10",
- label: "涓撶闅忚",
+ value: "12",
+ label: "蹇冪數闅忚",
},
+ // {
+ // value: "13",
+ // label: "涓撶闅忚",
+ // },
],
tasktopic: "2", //鏂板绫诲瀷
activname: "",
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index eed2493..4f50729 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -780,12 +780,10 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType: 1,
- searchscope: 3,
+ serviceType: 12,
sendstate:2,
scopetype: [],
- leaveldeptcodes: [],
- leavehospitaldistrictcodes: [],
+
},
propss: { multiple: true },
options: [],
@@ -869,26 +867,11 @@
/** 鏌ヨ褰卞儚闅忚鏈嶅姟鍒楄〃 */
getList(refresh) {
// 榛樿鍏ㄩ儴
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
// 鎺ュ彈寮傚父璺宠浆
- if (this.errtype) {
- this.topqueryParams.leavehospitaldistrictcodes.push(
- this.leavehospitaldistrictcode
- );
- console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
- }
+
this.loading = true;
- if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
- this.topqueryParams.deptOrDistrict=2;
- }else{
- this.topqueryParams.deptOrDistrict=1;
- }
+
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
@@ -988,13 +971,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
this.topqueryParams.pageNum = 1;
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
@@ -1005,20 +982,9 @@
handleChange(value) {
let type = value[0];
let code = value.slice(-1)[0];
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.leaveldeptcodes = [];
- if (type == 1) {
- this.topqueryParams.leaveldeptcodes.push(code);
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.searchscope = 1;
- } else if (type == 2) {
- this.topqueryParams.leavehospitaldistrictcodes.push(code);
- this.topqueryParams.leaveldeptcodes = [];
- this.topqueryParams.searchscope = 2;
- } else {
- this.topqueryParams.searchscope = 3;
- }
+
+
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
@@ -1026,8 +992,7 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- serviceType: 1,
- searchscope: 2,
+ serviceType: 12,
sendstate:2,
};
this.handleQuery(1);
@@ -1064,7 +1029,7 @@
path: "/followvisit/QuestionnaireTask",
query: {
type: 2,
- serviceType: 1,
+ serviceType: 12,
},
});
},
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 5ea6e2d..2c5ed42 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -922,7 +922,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
+ kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1351,7 +1351,7 @@
templateid: null,
libtemplateid: null,
serviceType: Number(this.$route.query.serviceType),
- kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+ kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 0a1d7e0..58d1f2e 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -1068,7 +1068,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1114,33 +1114,57 @@
tasktypes: [
{
- value: 1,
- label: "蹇冪數闅忚",
+ value: "1",
+ label: "鐩戞祴璇勪及",
},
{
- value: 2,
+ value: "2",
label: "鍑洪櫌闅忚",
},
{
- value: 3,
- label: "褰卞儚闅忚",
+ value: "3",
+ label: "闂ㄨ瘖闅忚",
},
{
- value: 4,
+ value: "4",
label: "瀹ｆ暀鍏虫��",
},
{
- value: 5,
+ value: "5",
+ label: "澶嶈瘖绠＄悊",
+ },
+ // {
+ // value: "5",
+ // label: "婊℃剰搴﹁皟鏌�",
+ // },
+ {
+ value: "7",
+ label: "鎮ｈ�呮姤鍛�",
+ },
+ // {
+ // value: "8",
+ // label: "鍏朵粬閫氱煡",
+ // },
+ {
+ value: "9",
label: "浣撴闅忚",
},
+ // {
+ // value: "10",
+ // label: "鍖绘妧闅忚",
+ // },
{
- value: 11,
- label: "鍖绘妧闅忚",
+ value: "11",
+ label: "褰卞儚闅忚",
},
{
- value: 10,
- label: "涓撶闅忚",
+ value: "12",
+ label: "蹇冪數闅忚",
},
+ // {
+ // value: "13",
+ // label: "涓撶闅忚",
+ // },
],
// 绉戝/鐥呭尯
belongWards: [],
@@ -1301,6 +1325,9 @@
this.form.serviceType == 7 ||
this.form.serviceType == 10 ||
this.form.serviceType == 11 ||
+ this.form.serviceType == 8 ||
+ this.form.serviceType == 12 ||
+ this.form.serviceType == 13 ||
this.form.serviceType == 9
) {
this.checkboxlist = [
@@ -1853,7 +1880,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 14a31fd..bfa6565 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -267,7 +267,6 @@
</el-option>
</el-select> </el-form-item
></el-col>
-
</el-row>
<el-row v-if="form.appltype == 3">
<div class="xinz-infs">
@@ -541,7 +540,7 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="涓绘不鍖荤敓锛�">
+ <el-form-item label="涓绘不鍖荤敓锛�">
<el-input
v-model="patientqueryParams.drname"
@keyup.enter.native="handleQuery"
@@ -1115,7 +1114,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
},
taskoptions: [
@@ -1157,33 +1156,57 @@
tasktypes: [
{
- value: 1,
- label: "蹇冪數闅忚",
+ value: "1",
+ label: "鐩戞祴璇勪及",
},
{
- value: 2,
+ value: "2",
label: "鍑洪櫌闅忚",
},
{
- value: 3,
- label: "褰卞儚闅忚",
+ value: "3",
+ label: "闂ㄨ瘖闅忚",
},
{
- value: 4,
+ value: "4",
label: "瀹ｆ暀鍏虫��",
},
{
- value: 5,
+ value: "5",
+ label: "澶嶈瘖绠＄悊",
+ },
+ // {
+ // value: "5",
+ // label: "婊℃剰搴﹁皟鏌�",
+ // },
+ {
+ value: "7",
+ label: "鎮ｈ�呮姤鍛�",
+ },
+ // {
+ // value: "8",
+ // label: "鍏朵粬閫氱煡",
+ // },
+ {
+ value: "9",
label: "浣撴闅忚",
},
+ // {
+ // value: "10",
+ // label: "鍖绘妧闅忚",
+ // },
{
- value: 11,
- label: "鍖绘妧闅忚",
+ value: "11",
+ label: "褰卞儚闅忚",
},
{
- value: 10,
- label: "涓撶闅忚",
+ value: "12",
+ label: "蹇冪數闅忚",
},
+ // {
+ // value: "13",
+ // label: "涓撶闅忚",
+ // },
],
// 绉戝/鐥呭尯
belongWards: [],
@@ -1239,6 +1262,8 @@
this.form.typename = this.$route.query.typename;
this.serviceType = Number(this.$route.query.serviceType);
this.form.serviceType = Number(this.$route.query.serviceType);
+ console.log(localStorage.getItem("orgid"),'orgid');
+
this.Acquisitiontype();
this.getillnesslist();
this.Getdetails();
@@ -1357,7 +1382,15 @@
// label: "鏅鸿兘鏈哄櫒浜�",
// },
];
- } else if (this.form.serviceType == 7 || this.form.serviceType == 5|| this.form.serviceType == 10|| this.form.serviceType == 11) {
+ } else if (
+ this.form.serviceType == 7 ||
+ this.form.serviceType == 5 ||
+ this.form.serviceType == 8 ||
+ this.form.serviceType == 9 ||
+ this.form.serviceType == 11 ||
+ this.form.serviceType == 12 ||
+ this.form.serviceType == 10
+ ) {
this.checkboxlist = [
{
value: "1",
@@ -1388,7 +1421,11 @@
label: "鏈悗闅忚",
},
];
- } else if (this.form.serviceType == 2 || this.form.serviceType == 3) {
+ } else if (
+ this.form.serviceType == 2 ||
+ this.form.serviceType == 3 ||
+ this.form.serviceType == 4
+ ) {
this.checkboxlist = [
{
value: "1",
@@ -1446,21 +1483,21 @@
},
];
if (this.form.appltype == 1) {
- this.leavehospitaldistrictcodes=[];
- this.operationcodes=[];
- this.illnesscodes=[];
+ this.leavehospitaldistrictcodes = [];
+ this.operationcodes = [];
+ this.illnesscodes = [];
} else if (this.form.appltype == 2) {
- this.deptcodesWards=[];
- this.operationcodes=[];
- this.illnesscodes=[];
+ this.deptcodesWards = [];
+ this.operationcodes = [];
+ this.illnesscodes = [];
} else if (this.form.appltype == 3) {
- this.deptcodesWards=[];
- this.leavehospitaldistrictcodes=[];
- this.operationcodes=[];
+ this.deptcodesWards = [];
+ this.leavehospitaldistrictcodes = [];
+ this.operationcodes = [];
} else if (this.form.appltype == 4) {
- this.deptcodesWards=[];
- this.illnesscodes=[];
- this.leavehospitaldistrictcodes=[];
+ this.deptcodesWards = [];
+ this.illnesscodes = [];
+ this.leavehospitaldistrictcodes = [];
}
if (this.checkList) {
this.form.preachform = this.checkList;
@@ -1517,7 +1554,8 @@
this.form.opcode = this.operationcodes.join(",");
this.form.icd10code = this.diagglist
.map((item) => item.icdcode)
- .join(","); Editsingletask(this.form).then((res) => {
+ .join(",");
+ Editsingletask(this.form).then((res) => {
if (res.code == 200) {
if (this.form.taskid) {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -1831,7 +1869,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
- kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝杩涜鏈鍥炶鏈嶅姟銆�",
jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
};
@@ -1922,7 +1960,7 @@
icdcode: item.icd10code,
}).then((res) => {
item.icdname = res.rows[0].icdname;
- this.diagglist.push(item);
+ this.diagglist.push(item);
});
this.illnesscodes.push(item.icd10code);
});
@@ -2013,7 +2051,9 @@
if (result.length) {
taskdiaghospgetsondel(result).then((res) => {
if (res.code) {
- this.diagglist=this.diagglist.filter(item => item.icd10code != row);
+ this.diagglist = this.diagglist.filter(
+ (item) => item.icd10code != row
+ );
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
});
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 0129364..8f46ab9 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -26,7 +26,7 @@
<div class="ysfleftvlue">
<el-card shadow="hover">
<div style="padding: 8px">
- <span>宸插彂閫佹湭棰嗗彇</span>
+ <span>琛ㄥ崟宸插彂閫�</span>
<div
style="
text-align: center;
@@ -79,7 +79,7 @@
></el-input>
</el-form-item>
- <el-form-item label="妫�鏌ユ椂闂�">
+ <el-form-item label="浣撴鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -206,7 +206,6 @@
width="180"
/>
<!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
-
<el-table-column
label="濮撳悕"
width="100"
@@ -219,7 +218,7 @@
size="medium"
type="text"
@click="
- $router.push({
+ $router.push({
path: '/patient/indexls/',
query: { sfzh: scope.row.idcardno },
})
@@ -240,17 +239,17 @@
<template slot-scope="scope">
<div v-if="scope.row.sendstate == 1">
<el-tag type="primary" :disable-transitions="false"
- >琚鍙�</el-tag
+ >琛ㄥ崟宸查鍙�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 2">
<el-tag type="primary" :disable-transitions="false"
- >寰呭彂閫�</el-tag
+ >寰呴殢璁�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 3">
<el-tag type="success" :disable-transitions="false"
- >宸插彂閫佹湭棰嗗彇</el-tag
+ >琛ㄥ崟宸插彂閫�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 4">
@@ -307,7 +306,7 @@
</template>
</el-table-column>
<el-table-column
- label="浣撴缁撴灉"
+ label="闅忚缁撴灉"
width="200"
align="center"
key="remark"
@@ -323,7 +322,7 @@
</template>
</el-table-column>
<el-table-column
- label="浣撴鏃ユ湡"
+ label="妫�鏌ユ棩鏈�"
width="200"
align="center"
key="endtime"
@@ -345,7 +344,7 @@
</template></el-table-column
>
<el-table-column
- label="浣撴澶╂暟"
+ label="宸叉鏌ュぉ鏁�"
width="120"
align="center"
key="endDay"
@@ -511,7 +510,7 @@
@pagination="getList"
/>
</el-row>
- <!-- 娣诲姞鎴栦慨鏀逛綋妫�闅忚瀵硅瘽妗� -->
+ <!-- 娣诲姞鎴栦慨鏀瑰奖鍍忛殢璁垮璇濇 -->
<el-dialog
:title="title"
:visible.sync="addalteropen"
@@ -554,7 +553,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="24">
- <el-form-item label="浣撴闅忚瑕佹眰">
+ <el-form-item label="褰卞儚闅忚瑕佹眰">
<el-input type="textarea" v-model="form.desc"></el-input>
</el-form-item>
</el-col>
@@ -679,7 +678,7 @@
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
// 寮瑰嚭灞傛爣棰�
- title: "鏂板浣撴闅忚",
+ title: "鏂板褰卞儚闅忚",
// 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
addalteropen: false,
// 淇敼鍙戦�佹椂闂村璇濇
@@ -701,13 +700,13 @@
yfsvalue: "",
inputValue: "",
preachform: "",
- previewVisible: false, //浣撴闅忚棰勮寮规
+ previewVisible: false, //褰卞儚闅忚棰勮寮规
radio: "",
radios: [],
- previewtype: 2, //棰勮浣撴闅忚绫诲瀷
+ previewtype: 2, //棰勮褰卞儚闅忚绫诲瀷
total: 0, // 鎬绘潯鏁�
- ImportQuantity: 999, //瀵间綋妫�闅忚鏁伴噺
- //棰勮浣撴闅忚淇℃伅
+ ImportQuantity: 999, //瀵煎奖鍍忛殢璁挎暟閲�
+ //棰勮褰卞儚闅忚淇℃伅
previewvalue: {
username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
},
@@ -733,7 +732,7 @@
loading: false,
cardlist: [
{
- name: "浣撴鎶ュ憡鎬婚噺",
+ name: "浣撴鏈嶅姟鎬婚噺",
value: 0,
},
// {
@@ -763,7 +762,7 @@
},
// {
- // name: "宸插彂閫佹湭棰嗗彇",
+ // name: "琛ㄥ崟宸插彂閫�",
// value: 0,
// },
],
@@ -781,12 +780,10 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType: 5,
- searchscope: 3,
+ serviceType: 9,
sendstate:2,
scopetype: [],
- leaveldeptcodes: [],
- leavehospitaldistrictcodes: [],
+
},
propss: { multiple: true },
options: [],
@@ -794,15 +791,15 @@
topicoptions: [
{
value: 1,
- label: "琚鍙�",
+ label: "琛ㄥ崟宸查鍙�",
},
{
value: 2,
- label: "寰呭彂閫�",
+ label: "寰呴殢璁�",
},
{
value: 3,
- label: "宸插彂閫佹湭棰嗗彇",
+ label: "琛ㄥ崟宸插彂閫�",
},
{
value: 4,
@@ -867,29 +864,15 @@
this.getList(1);
},
methods: {
- /** 鏌ヨ浣撴闅忚鏈嶅姟鍒楄〃 */
+ /** 鏌ヨ褰卞儚闅忚鏈嶅姟鍒楄〃 */
getList(refresh) {
// 榛樿鍏ㄩ儴
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
// 鎺ュ彈寮傚父璺宠浆
- if (this.errtype) {
- this.topqueryParams.leavehospitaldistrictcodes.push(
- this.leavehospitaldistrictcode
- );
- console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
- }
+
this.loading = true;
- if (this.topqueryParams.leavehospitaldistrictcodes[0]&&this.topqueryParams.leaveldeptcodes[0]) {
- this.topqueryParams.deptOrDistrict=2;
- }else{
- this.topqueryParams.deptOrDistrict=1;
- }
+
+
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
@@ -930,7 +913,7 @@
this.total = response.total;
});
},
- // 鏌ョ湅浣撴闅忚璇︽儏
+ // 鏌ョ湅褰卞儚闅忚璇︽儏
Referencequestion(row) {
this.previewVisible = true;
},
@@ -948,7 +931,7 @@
this.options = [];
}
},
- // 浣撴闅忚鐘舵�佷慨鏀�
+ // 褰卞儚闅忚鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
this.$modal
@@ -988,13 +971,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
- if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- }
+
this.topqueryParams.pageNum = 1;
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
@@ -1005,20 +982,9 @@
handleChange(value) {
let type = value[0];
let code = value.slice(-1)[0];
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.leaveldeptcodes = [];
- if (type == 1) {
- this.topqueryParams.leaveldeptcodes.push(code);
- this.topqueryParams.leavehospitaldistrictcodes = [];
- this.topqueryParams.searchscope = 1;
- } else if (type == 2) {
- this.topqueryParams.leavehospitaldistrictcodes.push(code);
- this.topqueryParams.leaveldeptcodes = [];
- this.topqueryParams.searchscope = 2;
- } else {
- this.topqueryParams.searchscope = 3;
- }
+
+
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
@@ -1026,8 +992,7 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- serviceType: 5,
- searchscope: 2,
+ serviceType: 9,
sendstate:2,
};
this.handleQuery(1);
@@ -1064,7 +1029,7 @@
path: "/followvisit/QuestionnaireTask",
query: {
type: 2,
- serviceType: 5,
+ serviceType: 9,
},
});
},
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index d7b43ed..3ecd00e 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -1510,7 +1510,7 @@
ruleForm: {
templateName: "",
revisitBefore:
- "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
revisitAfter:
"璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
ivrLibaTemplateTagList: [],
diff --git a/src/views/repositoryai/templateku/configurat/taskub.vue b/src/views/repositoryai/templateku/configurat/taskub.vue
index fe49cdd..7ad9d52 100644
--- a/src/views/repositoryai/templateku/configurat/taskub.vue
+++ b/src/views/repositoryai/templateku/configurat/taskub.vue
@@ -1508,7 +1508,7 @@
ruleForm: {
templateName: "",
revisitBefore:
- "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄櫙瀹佷汉姘戝尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
+ "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚銆�",
revisitAfter:
"璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
ivrLibaTemplateTagList: [],
--
Gitblit v1.9.3