From 400d13ddc80a7560860939f65b318b2fa78f9004 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期日, 27 四月 2025 15:49:56 +0800 Subject: [PATCH] 测试完成 --- src/views/followvisit/record/detailpage/index.vue | 15 ++ src/views/patient/patient/hospital.vue | 137 ++++++++++++---------- src/views/patient/patient/outpatient.vue | 27 +++- src/views/patient/patient/behospitalized.vue | 35 ++++- src/views/patient/patient/index.vue | 12 - src/api/patient/homepage.js | 8 + src/views/followvisit/discharge/index.vue | 81 +++++++------ src/views/patient/follow/index.vue | 5 8 files changed, 191 insertions(+), 129 deletions(-) diff --git a/src/api/patient/homepage.js b/src/api/patient/homepage.js index f40660b..975a446 100644 --- a/src/api/patient/homepage.js +++ b/src/api/patient/homepage.js @@ -17,6 +17,14 @@ data: data }) }; +// 鐢ㄦ埛淇℃伅鏌ヨ鎮h�呭垪琛� +export function patarchivelist(data) { + return request({ + url: '/smartor/patarchive/list', + method: 'post', + data: data + }) +}; // 淇敼鎮h�呮。妗� export function alterpatient(data) { diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue index 01e3ca2..2c6f80d 100644 --- a/src/views/followvisit/discharge/index.vue +++ b/src/views/followvisit/discharge/index.vue @@ -131,16 +131,16 @@ </el-select> </el-form-item> <el-form-item label="鎺掑簭鏂瑰紡" prop="status"> - <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in topicoptionssort" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> + <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨"> + <el-option + v-for="item in topicoptionssort" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> <el-form-item> <el-button @@ -249,12 +249,11 @@ prop="sendname" > <template slot-scope="scope"> - <el-button size="medium" type="text" @click=" - gettoken360(scope.row.sfzh,scope.row.drcode,scope.row.drname) + gettoken360(scope.row.sfzh, scope.row.drcode, scope.row.drname) " ><span class="button-textsc">{{ scope.row.sendname @@ -409,7 +408,6 @@ prop="nurseName" /> - <!-- <el-table-column label="鐥呭巻鍙�" align="center" @@ -521,8 +519,8 @@ <el-button size="medium" type="text" + v-if="scope.row.isVisitAgain!=2" @click="followupvisit(scope.row)" - v-hasPermi="['system:user:edit']" ><span class="button-bb" ><i class="el-icon-s-promotion"></i>鍐嶆闅忚</span ></el-button @@ -789,12 +787,9 @@ getTaskservelist, buidegetTasklist, addserviceSubtask, - query360PatInfo + query360PatInfo, } from "@/api/AiCentre/index"; -import { - alterpatient, - particularpatient, -} from "@/api/patient/homepage"; +import { alterpatient, particularpatient } from "@/api/patient/homepage"; import Treeselect from "@riophae/vue-treeselect"; import store from "@/store"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -924,7 +919,7 @@ qystatus: "", btstatus: "", }, - topicoptionssort:[ + topicoptionssort: [ { value: 0, label: "鍑洪櫌鏃堕棿(姝e簭)", @@ -1024,7 +1019,7 @@ }, YeWuXX: { BingRenXX: { - ZhengJianHM: '', + ZhengJianHM: "", ZhengJianLXDM: "01", ZhengJianLXMC: "灞呮皯韬唤璇�", ZuZhiJGID: localStorage.getItem("orgid"), @@ -1041,7 +1036,7 @@ }, }, }, - amendtag:false, + amendtag: false, errtype: "", leavehospitaldistrictcode: "", serviceState: [], @@ -1149,9 +1144,9 @@ this.total = response.total; }); }, - affiliation(){ - this.topqueryParams.drcode=store.getters.hisUserId; - this.topqueryParams.nurseId=store.getters.hisUserId; + affiliation() { + this.topqueryParams.drcode = store.getters.hisUserId; + this.topqueryParams.nurseId = store.getters.hisUserId; this.getList(1); }, buidegetTasklist(type) { @@ -1277,14 +1272,14 @@ this.topqueryParams.leavehospitaldistrictcodes = store.getters.belongWards.map((obj) => obj.districtCode); } - console.log('1'); + console.log("1"); this.topqueryParams.pageNum = 1; this.topqueryParams.startOutHospTime = this.dateRange[0]; this.topqueryParams.endOutHospTime = this.dateRange[1]; this.topqueryParams.startSendDateTime = this.dateRangefs[0]; this.topqueryParams.endSendDateTime = this.dateRangefs[1]; - console.log('2'); + console.log("2"); this.getList(refresh); }, // 鎮h�呰寖鍥村鐞� @@ -1309,7 +1304,7 @@ resetQuery() { this.dateRange = []; this.dateRangefs = []; - this.topqueryParams = { + (this.topqueryParams = { pageNum: 1, pageSize: 10, sendstate: 2, @@ -1319,8 +1314,8 @@ scopetype: [], leaveldeptcodes: [], leavehospitaldistrictcodes: [], - }, - this.handleQuery(1); + }), + this.handleQuery(1); }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { @@ -1359,21 +1354,20 @@ }); }, //鎮h��360璺宠浆 - gettoken360(sfzh,drcode,drname) { + gettoken360(sfzh, drcode, drname) { this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh; - if (this.postData.XiaoXiTou.ZuHuMC=='涓芥按甯備腑鍖婚櫌') { - this.postData.YeWuXX.YongHuXX.YongHuID = '1400398571877961728'; - this.postData.YeWuXX.YongHuXX.YongHuXM = 'LSZYY'; + if (this.postData.XiaoXiTou.ZuHuMC == "涓芥按甯備腑鍖婚櫌") { + this.postData.YeWuXX.YongHuXX.YongHuID = "1400398571877961728"; + this.postData.YeWuXX.YongHuXX.YongHuXM = "LSZYY"; } query360PatInfo(this.postData).then((res) => { if (res.data.url) { - window.open(res.data.url, '_blank'); + window.open(res.data.url, "_blank"); // this.linkUrl = res.data.url; - }else{ + } else { this.$modal.msgWarning("360鏌ヨ鏃犵粨鏋�"); } }); - }, /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */ @@ -1571,6 +1565,8 @@ setupsubtask() { this.$refs["zcform"].validate((valid) => { if (valid) { + this.zcform.remark = + this.zcform.remark + "銆�" + this.getCurrentTime() + "銆�"; let form = structuredClone(this.zcform); form.longSendTime = this.formatTime(form.date1); form.finishtime = ""; @@ -1595,6 +1591,17 @@ } }); }, + getCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, "0"); + const day = String(now.getDate()).padStart(2, "0"); + const hours = String(now.getHours()).padStart(2, "0"); + const minutes = String(now.getMinutes()).padStart(2, "0"); + const seconds = String(now.getSeconds()).padStart(2, "0"); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, }, }; </script> diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue index 60a7b10..b51ea96 100644 --- a/src/views/followvisit/record/detailpage/index.vue +++ b/src/views/followvisit/record/detailpage/index.vue @@ -243,7 +243,7 @@ <el-button plain type="info" @click="Editsingletaskson('5')" >涓績闅忚</el-button > - <el-button type="primary" round @click="sendAgain()" + <el-button type="primary" round v-if="this.form.isVisitAgain!=2" @click="sendAgain()" >鍐嶆闅忚</el-button > </div> @@ -1019,6 +1019,8 @@ setupsubtask() { this.$refs["zcform"].validate((valid) => { if (valid) { + this.form.remark = + this.form.remark + "銆�" + this.getCurrentTime() + "銆�"; let form = structuredClone(this.form); form.longSendTime = this.formatTime(form.date1); form.finishtime = ""; @@ -1043,6 +1045,17 @@ } }); }, + getCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, "0"); + const day = String(now.getDate()).padStart(2, "0"); + const hours = String(now.getHours()).padStart(2, "0"); + const minutes = String(now.getMinutes()).padStart(2, "0"); + const seconds = String(now.getSeconds()).padStart(2, "0"); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, updateScore(a, b, c) { console.log(a); console.log(b); diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue index 37918ba..3ce1f0e 100644 --- a/src/views/patient/follow/index.vue +++ b/src/views/patient/follow/index.vue @@ -221,7 +221,7 @@ import { delUser } from "@/api/system/user"; import { - messagelistpatient, + patarchivelist, alterpatient, addfiltration, particularpatient, @@ -369,8 +369,7 @@ /** 鏌ヨ鎮h�呭垪琛� */ getList() { this.loading = true; - - messagelistpatient(this.queryParams).then((response) => { + patarchivelist(this.queryParams).then((response) => { console.log(response); this.userList = response.rows; this.total = response.total; diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue index b3f9181..d5af2eb 100644 --- a/src/views/patient/patient/behospitalized.vue +++ b/src/views/patient/patient/behospitalized.vue @@ -168,7 +168,13 @@ <el-button size="medium" type="text" - @click="gettoken360(scope.row.idcardno,scope.row.drcode,scope.row.drname)" + @click=" + gettoken360( + scope.row.idcardno, + scope.row.drcode, + scope.row.drname + ) + " ><span class="button-textsc">{{ scope.row.patname }}</span></el-button @@ -706,11 +712,11 @@ this.handleQuery(); }, //鎮h��360璺宠浆 - gettoken360(sfzh,drcode,drname) { + gettoken360(sfzh, drcode, drname) { this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh; - if (this.postData.XiaoXiTou.ZuHuMC=='涓芥按甯備腑鍖婚櫌') { - this.postData.YeWuXX.YongHuXX.YongHuID = '1400398571877961728'; - this.postData.YeWuXX.YongHuXX.YongHuXM = 'LSZYY'; + if (this.postData.XiaoXiTou.ZuHuMC == "涓芥按甯備腑鍖婚櫌") { + this.postData.YeWuXX.YongHuXX.YongHuID = "1400398571877961728"; + this.postData.YeWuXX.YongHuXX.YongHuXM = "LSZYY"; } query360PatInfo(this.postData).then((res) => { if (res.data.url) { @@ -742,8 +748,14 @@ }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { - this.queryParams.startInHospTime = this.dateRange[0]; - this.queryParams.endInHospTime = this.dateRange[1]; + + if (this.dateRange) { + this.queryParams.startInHospTime = this.dateRange[0]; + this.queryParams.endInHospTime = this.dateRange[1]; + }else{ + this.queryParams.startInHospTime = ''; + this.queryParams.endInHospTime = ''; + } this.queryParams.pageNum = 1; this.getList(); }, @@ -751,12 +763,15 @@ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - (this.queryParams = { + this.queryParams = { pageNum: 1, pageSize: 10, cry: 0, - searchscope: 2, - }), + searchscope: 3, + scopetype: [], + leaveldeptcodes: [], + leavehospitaldistrictcodes: [], + }; this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue index 43b7c87..8bc58fd 100644 --- a/src/views/patient/patient/hospital.vue +++ b/src/views/patient/patient/hospital.vue @@ -46,26 +46,25 @@ /> </el-form-item> - <el-form-item label="鎮h�呰寖鍥�" prop="status"> - <el-cascader - v-model="queryParams.scopetype" - placeholder="榛樿鍏ㄩ儴" - :options="sourcetype" - :props="{ expandTrigger: 'hover' }" - @change="handleChange" - ></el-cascader> - </el-form-item> + <el-cascader + v-model="queryParams.scopetype" + placeholder="榛樿鍏ㄩ儴" + :options="sourcetype" + :props="{ expandTrigger: 'hover' }" + @change="handleChange" + ></el-cascader> + </el-form-item> <el-form-item label=" 鍑洪櫌鏃ユ湡 " prop="createTime"> <el-date-picker - v-model="dateRange" - style="width: 240px" - value-format="yyyy-MM-dd" - type="daterange" - range-separator="-" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" - ></el-date-picker> + v-model="dateRange" + style="width: 240px" + value-format="yyyy-MM-dd" + type="daterange" + range-separator="-" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + ></el-date-picker> </el-form-item> <el-row> @@ -129,7 +128,7 @@ <el-table v-loading="loading" :data="userList" - height="808" + height="808" @selection-change="handleSelectionChange" > <el-table-column type="selection" width="50" align="center" /> @@ -157,7 +156,7 @@ align="center" key="inhospno" prop="inhospno" - width="120" + width="120" /> <!-- <el-table-column label="濮撳悕" @@ -167,26 +166,37 @@ prop="patname" /> --> <el-table-column - fixed - label="濮撳悕" - width="100" - align="center" - key="patname" - prop="patname" + fixed + label="濮撳悕" + width="100" + align="center" + key="patname" + prop="patname" + > + <template slot-scope="scope"> + <el-button + size="medium" + type="text" + @click=" + gettoken360( + scope.row.idcardno, + scope.row.drcode, + scope.row.drname + ) + " + ><span class="button-textsc">{{ + scope.row.patname + }}</span></el-button > - <template slot-scope="scope"> - <el-button - size="medium" - type="text" - @click="gettoken360(scope.row.idcardno,scope.row.drcode,scope.row.drname)" - ><span class="button-textsc" - >{{scope.row.patname}}</span - ></el-button - > - - </template> - </el-table-column> - <el-table-column label="鎬у埆"width="100" align="center" key="sex" prop="sex"> + </template> + </el-table-column> + <el-table-column + label="鎬у埆" + width="100" + align="center" + key="sex" + prop="sex" + > <template slot-scope="scope"> <span>{{ scope.row.sex == 1 ? "鐢�" : "濂�" }}</span> </template> @@ -280,7 +290,6 @@ query: { id: scope.row.patid }, }) " - ><span class="button-textsc" ><i class="el-icon-zoom-in"></i>鏌ョ湅</span ></el-button @@ -348,9 +357,10 @@ <div class="uploading" v-else-if="dractive == 2"> <el-table :data="uploadingData" style="width: 100%"> <el-table-column prop="serial" label="搴忓彿"> </el-table-column> - <el-table-column prop="name" label="濮撳悕" - width="100"> </el-table-column> - <el-table-column prop="sex" label="鎬у埆"width="100"> </el-table-column> + <el-table-column prop="name" label="濮撳悕" width="100"> + </el-table-column> + <el-table-column prop="sex" label="鎬у埆" width="100"> + </el-table-column> <el-table-column prop="certificate" label="璇佷欢绫诲瀷"> </el-table-column> <el-table-column prop="certificatenum" label="璇佷欢鍙风爜"> @@ -394,10 +404,7 @@ <script> import { delUser } from "@/api/system/user"; -import { - listpatient, - -} from "@/api/patient/record"; +import { listpatient } from "@/api/patient/record"; import { messagelistpatient, alterpatient, @@ -572,15 +579,13 @@ pageNum: 1, pageSize: 10, cry: 1, - searchscope:3, + searchscope: 3, scopetype: [], leaveldeptcodes: [], leavehospitaldistrictcodes: [], }, // 琛ㄥ崟鏍¢獙 - rules: { - - }, + rules: {}, }; }, watch: { @@ -631,11 +636,11 @@ }); }, //鎮h��360璺宠浆 - gettoken360(sfzh,drcode,drname) { + gettoken360(sfzh, drcode, drname) { this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh; - if (this.postData.XiaoXiTou.ZuHuMC=='涓芥按甯備腑鍖婚櫌') { - this.postData.YeWuXX.YongHuXX.YongHuID = '1400398571877961728'; - this.postData.YeWuXX.YongHuXX.YongHuXM = 'LSZYY'; + if (this.postData.XiaoXiTou.ZuHuMC == "涓芥按甯備腑鍖婚櫌") { + this.postData.YeWuXX.YongHuXX.YongHuID = "1400398571877961728"; + this.postData.YeWuXX.YongHuXX.YongHuXM = "LSZYY"; } query360PatInfo(this.postData).then((res) => { if (res.data.url) { @@ -660,8 +665,8 @@ this.optionstag = response.rows; }); }, - // 鎮h�呰寖鍥村鐞� - handleChange(value) { + // 鎮h�呰寖鍥村鐞� + handleChange(value) { let type = value[0]; let code = value.slice(-1)[0]; this.queryParams.leavehospitaldistrictcodes = []; @@ -721,8 +726,13 @@ }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { - this.queryParams.startOutHospTime = this.dateRange[0]; - this.queryParams.endOutHospTime = this.dateRange[1]; + if (this.dateRange) { + this.queryParams.startOutHospTime = this.dateRange[0]; + this.queryParams.endOutHospTime = this.dateRange[1]; + } else { + this.queryParams.startOutHospTime = ""; + this.queryParams.endOutHospTime = ""; + } this.queryParams.pageNum = 1; this.getList(); }, @@ -730,13 +740,16 @@ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - this.queryParams={ + this.queryParams = { pageNum: 1, pageSize: 10, cry: 1, - searchscope:2, - }, - this.handleQuery(); + searchscope: 3, + scopetype: [], + leaveldeptcodes: [], + leavehospitaldistrictcodes: [], + }; + this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue index e11cc97..8c1dec9 100644 --- a/src/views/patient/patient/index.vue +++ b/src/views/patient/patient/index.vue @@ -1257,18 +1257,16 @@ /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { this.dateRange = []; - (this.queryParams = { + this.queryParams = { pageNum: 1, allhosp: "1", pageSize: 10, notrequiredFlag: 0, searchscope: 2, - idcardno: undefined, - name: undefined, - status: undefined, - tagIds: undefined, - telcode: undefined, - }), + scopetype: [], + leaveldeptcodes: [], + leavehospitaldistrictcodes: [], + }; this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue index b554ba7..d317a51 100644 --- a/src/views/patient/patient/outpatient.vue +++ b/src/views/patient/patient/outpatient.vue @@ -20,10 +20,10 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="闂ㄨ瘖鍙�" prop="outhospno"> + <el-form-item label="鐥呮鍙�" prop="outhospno"> <el-input v-model="queryParams.outhospno" - placeholder="璇疯緭鍏ラ棬璇婂彿" + placeholder="璇疯緭鍏ョ梾妗堝彿" clearable style="width: 250px" @keyup.enter.native="handleQuery" @@ -177,14 +177,14 @@ <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> - <el-table-column + <!-- <el-table-column label="鐥呮鍙�" align="center" key="patno" prop="patno" - /> + /> --> <el-table-column - label="闂ㄨ瘖鍙�" + label="鐥呮鍙�" align="center" key="outhospno" prop="outhospno" @@ -649,8 +649,13 @@ this.queryParams.leavehospitaldistrictcodes = store.getters.belongWards.map((obj) => obj.districtCode); } - this.queryParams.beginTime = this.dateRange[0]; - this.queryParams.endTime = this.dateRange[1]; + if (this.dateRange) { + this.queryParams.beginTime = this.dateRange[0]; + this.queryParams.endTime = this.dateRange[1]; + }else{ + this.queryParams.beginTime = ''; + this.queryParams.endTime = ''; + } listPatouthosp(this.queryParams).then((response) => { this.userList = response.rows; this.total = response.total; @@ -755,10 +760,14 @@ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - (this.queryParams = { + this.queryParams = { pageNum: 1, pageSize: 10, - }), + searchscope: 3, + scopetype: [], + leaveldeptcodes: [], + leavehospitaldistrictcodes: [], + }; this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 -- Gitblit v1.9.3