From 91e38955922f841f056bf8592a983001e2cc693c Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 18 十一月 2026 15:57:36 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 2
src/views/patient/patient/hospital.vue | 139 ++++++++++++++++++++++++++++++++--
build/cli.js | 41 ++++++++++
src/views/sfstatistics/percentage/components/FirstFollowUp.vue | 2
4 files changed, 174 insertions(+), 10 deletions(-)
diff --git a/build/cli.js b/build/cli.js
new file mode 100644
index 0000000..d214484
--- /dev/null
+++ b/build/cli.js
@@ -0,0 +1,41 @@
+/**
+ * 鑷畾涔夊紑鍙�/鏋勫缓鍏ュ彛锛堝搴� package.json 閲岀殑 node build/cli.js serve|build锛夈��
+ *
+ * 鑳屾櫙锛氭湰椤圭洰浣跨敤 Vue CLI 4 / webpack 4锛屽湪 Node 17+锛圤penSSL 3锛変笅锛�
+ * compression-webpack-plugin 浠嶄細璋冪敤 md4锛屽鑷�
+ * error:0308010C:digital envelope routines::unsupported銆�
+ * 鍥犳鍦� Node 17+ 鏃惰嚜鍔ㄨ拷鍔� --openssl-legacy-provider锛�
+ * Node 16 鍙婁互涓嬩笉闇�瑕侊紙涔熶笉鍏佽锛夎閫夐」锛屾晠鎸夌増鏈潯浠舵坊鍔犮��
+ */
+const { spawn } = require("child_process");
+
+const command = process.argv[2]; // serve | build
+const args = process.argv.slice(3);
+
+if (!command) {
+ console.error("鐢ㄦ硶: node build/cli.js <serve|build> [args]");
+ process.exit(1);
+}
+
+const major = Number(process.versions.node.split(".")[0]);
+if (major >= 17) {
+ const legacyFlag = "--openssl-legacy-provider";
+ const nodeOptions = process.env.NODE_OPTIONS || "";
+ if (!nodeOptions.includes(legacyFlag)) {
+ process.env.NODE_OPTIONS = nodeOptions
+ ? `${nodeOptions} ${legacyFlag}`
+ : legacyFlag;
+ }
+}
+
+// 閫氳繃 node 鐩存帴杩愯 @vue/cli-service 鐨勫叆鍙o紝瑙勯伩 Windows/Linux 涓� .bin 鑴氭湰宸紓
+const cliEntry = require.resolve("@vue/cli-service/bin/vue-cli-service.js");
+
+const child = spawn(process.execPath, [cliEntry, command, ...args], {
+ stdio: "inherit",
+ env: process.env,
+});
+
+child.on("close", (code) => {
+ process.exit(code == null ? 1 : code);
+});
diff --git a/src/views/login.vue b/src/views/login.vue
index 002b4f6..425e2d4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -187,7 +187,7 @@
if (res.code == 200) {
// 鍚屽痉绯诲垪 / 鍗楀崕绯诲垪 / 娴欐睙鐪佹柊鍗庡尰闄細鐢� campusid(organizationID) 浣滀笅鎷夐敭鍊硷紱
// 鍏朵綑锛堜附姘村尯鍩� organizationID 鍏ㄤ负 "1" 涓嶅敮涓�锛夛細鐢� orgid 浣滀笅鎷夐敭鍊�
- const campusidKeywords = ["鍚屽痉", "鍗楀崕", "娴欐睙鐪佹柊鍗庡尰闄�", "鏉窞甯傜涓�浜烘皯鍖婚櫌"];
+ const campusidKeywords = ["鍚屽痉", "鍗楀崕", "娴欐睙鐪佹柊鍗庡尰闄�", "绗竴浜烘皯鍖婚櫌"];
this.options = (res.rows || []).map((item) => {
console.log(item.organizationName);
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 798372a..fbe5da3 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -144,6 +144,20 @@
娣诲姞寤剁画鎶ょ悊浠诲姟
</el-button>
</el-col>
+ <!-- 璇煶鏈嶅姟杞汉宸ユ寜閽� -->
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-refresh-right"
+ size="medium"
+ :disabled="multiple"
+ v-if="orgname === '绗竴浜烘皯鍖婚櫌婀栨花闄㈠尯'||orgname === '绗竴浜烘皯鍖婚櫌鍚村北闄㈠尯'||orgname === '绗竴浜烘皯鍖婚櫌鍩庝笢闄㈠尯'"
+ @click="handleManualVisit"
+ >
+ 璇煶鏈嶅姟杞汉宸�
+ </el-button>
+ </el-col>
<el-col :span="1.5">
<el-button
type="danger"
@@ -352,7 +366,7 @@
<!-- 鎵归噺娣诲姞浠诲姟寮圭獥 -->
<!-- 鎵归噺娣诲姞寤剁画鎶ょ悊浠诲姟寮圭獥 -->
<el-dialog
- title="鎵归噺娣诲姞寤剁画鎶ょ悊"
+ :title="batchMode === 'manual' ? '璇煶鏈嶅姟杞汉宸�' : '鎵归噺娣诲姞寤剁画鎶ょ悊'"
:visible.sync="batchTaskVisible"
width="90%"
append-to-body
@@ -433,7 +447,9 @@
<el-col :span="12">
<div class="batch-task-section">
<div class="section-header">
- <h4>寤剁画鎶ょ悊浠诲姟</h4>
+ <h4>
+ {{ batchMode === "manual" ? "浜哄伐闅忚浠诲姟" : "寤剁画鎶ょ悊浠诲姟" }}
+ </h4>
<div v-if="selectedTask" class="task-selected-hint selected">
<i class="el-icon-success"></i>
<span>宸查�夋嫨锛歿{ selectedTask.taskName }}</span>
@@ -495,7 +511,11 @@
<template #empty>
<div class="empty-message">
<i class="el-icon-document"></i>
- <span>鏆傛棤鍙敤寤剁画鎶ょ悊浠诲姟</span>
+ <span>{{
+ batchMode === "manual"
+ ? "鏆傛棤鍙敤浜哄伐闅忚浠诲姟"
+ : "鏆傛棤鍙敤寤剁画鎶ょ悊浠诲姟"
+ }}</span>
<span class="empty-tips">璇疯仈绯荤鐞嗗憳鍒涘缓浠诲姟</span>
</div>
</template>
@@ -522,7 +542,15 @@
@click="submitBatchTask"
:disabled="!selectedTask || batchLoading"
>
- {{ batchLoading ? "鍒涘缓涓�..." : "鍒涘缓寤剁画鎶ょ悊浠诲姟" }}
+ {{
+ batchLoading
+ ? batchMode === "manual"
+ ? "杞崲涓�..."
+ : "鍒涘缓涓�..."
+ : batchMode === "manual"
+ ? "纭杞汉宸�"
+ : "鍒涘缓寤剁画鎶ょ悊浠诲姟"
+ }}
</el-button>
</div>
</el-dialog>
@@ -622,7 +650,7 @@
<script>
import { delUser } from "@/api/system/user";
-import { listpatient } from "@/api/patient/record";
+import { listpatient, addManualVisit } from "@/api/patient/record";
import {
messagelistpatient,
alterpatient,
@@ -677,7 +705,9 @@
// 榛樿瀵嗙爜
initPassword: undefined,
amendtag: false, //鏄惁淇敼
+ orgname: localStorage.getItem("orgname"),
// 鎵归噺浠诲姟鐩稿叧鏁版嵁
+ batchMode: "continue", // 寮圭獥妯″紡锛歝ontinue 寤剁画鎶ょ悊 / manual 璇煶鏈嶅姟杞汉宸�
batchTaskVisible: false, // 寮圭獥鍙鎬�
selectedPatients: [], // 閫変腑鐨勬偅鑰呭垪琛�
taskList: [], // 浠诲姟鍒楄〃
@@ -913,6 +943,9 @@
return;
}
+ this.batchMode = "continue";
+ this.selectedTask = null;
+
// 鑾峰彇閫変腑鎮h�呯殑绉戝淇℃伅
const patientDepts = new Set();
let deptcode = "";
@@ -924,6 +957,28 @@
}
});
+ // 鑾峰彇閫変腑鎮h�呭垪琛�
+ this.selectedPatients = this.userList.filter((item) =>
+ this.ids.includes(item.patid)
+ );
+
+ // 鏄剧ず寮圭獥
+ this.batchTaskVisible = true;
+
+ // 閲嶇疆浠诲姟鍒嗛〉骞惰幏鍙栦换鍔″垪琛�
+ this.taskQueryParams.pageNum = 1;
+ this.loadTaskList();
+ },
+ /** 璇煶鏈嶅姟杞汉宸ユ寜閽偣鍑� */
+ handleManualVisit() {
+ // 鏍¢獙鏄惁閫変腑鎮h��
+ if (this.ids.length === 0) {
+ this.$modal.msgWarning("璇疯嚦灏戦�変腑1鍚嶆偅鑰�");
+ return;
+ }
+
+ this.batchMode = "manual";
+ this.selectedTask = null;
// 鑾峰彇閫変腑鎮h�呭垪琛�
this.selectedPatients = this.userList.filter((item) =>
this.ids.includes(item.patid)
@@ -959,8 +1014,10 @@
let topqueryParams = {
pageNum: this.taskQueryParams.pageNum,
pageSize: this.taskQueryParams.pageSize,
- type: 2, // 鏍规嵁瀹為檯鎯呭喌璋冩暣
};
+ if (this.batchMode !== "manual") {
+ topqueryParams.type = 2; // 寤剁画鎶ょ悊浠诲姟绫诲瀷
+ }
topqueryParams.deptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
@@ -969,18 +1026,44 @@
);
getTasklist(topqueryParams)
.then((response) => {
- this.taskList = response.rows;
+ this.taskList = response.rows || [];
+ if (this.batchMode === "manual") {
+ // 鍙繚鐣欍�屼汉宸ャ�嶄换鍔″舰寮忥紙preachform 鍚� 1锛�
+ this.taskList = this.taskList.filter((task) =>
+ this.isManualTask(task)
+ );
+ }
this.taskTotal = response.total;
this.batchLoading = false;
if (this.taskList.length === 0) {
- this.$modal.msgWarning("褰撳墠绉戝鏃犲彲鐢ㄤ换鍔�");
+ this.$modal.msgWarning(
+ this.batchMode === "manual"
+ ? "褰撳墠绉戝鏃犲彲鐢ㄤ汉宸ラ殢璁夸换鍔�"
+ : "褰撳墠绉戝鏃犲彲鐢ㄥ欢缁姢鐞嗕换鍔�"
+ );
}
})
.catch((error) => {
this.$modal.msgError("鑾峰彇浠诲姟鍒楄〃澶辫触锛�" + error.message);
this.batchLoading = false;
});
+ },
+
+ /** 鍒ゆ柇鏄惁涓恒�屼汉宸ャ�嶄换鍔″舰寮忥紙preachform 鍚� 1锛� */
+ isManualTask(task) {
+ if (task.preachform != null && task.preachform !== "") {
+ const forms = String(task.preachform)
+ .split(",")
+ .map((s) => s.trim());
+ if (forms.includes("1")) return true;
+ }
+ if (Array.isArray(task.preachformList)) {
+ return task.preachformList.some(
+ (item) => String(item.preachform) === "1"
+ );
+ }
+ return false;
},
/** 澶勭悊浠诲姟閫夋嫨鍙樺寲 */
@@ -993,6 +1076,12 @@
// 鏍¢獙鏄惁閫変腑浠诲姟
if (!this.selectedTask) {
this.$modal.msgWarning("璇烽�夋嫨1涓换鍔�");
+ return;
+ }
+
+ // 璇煶鏈嶅姟杞汉宸ワ細璧版柊鎺ュ彛
+ if (this.batchMode === "manual") {
+ this.submitManualVisit();
return;
}
@@ -1067,6 +1156,40 @@
}
},
+ /** 璇煶鏈嶅姟杞汉宸ワ細鍒犻櫎鏈畬鎴愰殢璁夸换鍔″苟閲嶆柊鐢熸垚浜哄伐闅忚浠诲姟 */
+ async submitManualVisit() {
+ this.batchLoading = true;
+ try {
+ const params = {
+ patids: this.selectedPatients.map((item) => item.patid),
+ taskid: this.selectedTask.taskid,
+ };
+ const response = await addManualVisit(params);
+ if (response.code === 200) {
+ const data = response.data || {};
+ const generated = data.generatedCount || 0;
+ const noDischarge = (data.noDischargeRecordPatids || []).length;
+ const noArchive = (data.noArchivePatids || []).length;
+ const failed = (data.generateFailedPatids || []).length;
+ let msg = `鎴愬姛鐢熸垚 ${generated} 涓汉宸ラ殢璁夸换鍔;
+ if (noDischarge) msg += `锛�${noDischarge} 浜烘棤鍑洪櫌璁板綍`;
+ if (noArchive) msg += `锛�${noArchive} 浜烘棤鎮h�呮。妗坄;
+ if (failed) msg += `锛�${failed} 浜虹敓鎴愬け璐;
+ this.$modal.msgSuccess(msg);
+ this.batchTaskVisible = false;
+ this.getList(); // 鍒锋柊鎮h�呭垪琛�
+ } else {
+ this.$modal.msgError(response.msg || "璇煶鏈嶅姟杞汉宸ュけ璐�");
+ }
+ } catch (error) {
+ this.$modal.msgError(
+ "璇煶鏈嶅姟杞汉宸ュけ璐ワ細" + (error.message || "缃戠粶閿欒")
+ );
+ } finally {
+ this.batchLoading = false;
+ }
+ },
+
/** 鏍煎紡鍖栨椂闂� */
formatTime(time) {
if (!time) return "";
diff --git a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
index 18b247a..c91b536 100644
--- a/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/FirstFollowUp.vue
@@ -183,7 +183,7 @@
</el-table-column>
<el-table-column
v-if="isTargetHospital"
- label="寰呴殢璁�"
+ label="鏈畬鎴�"
align="center"
>
<el-table-column
--
Gitblit v1.9.3