From 08881d6b6412822d5035f63a0775ca1f213c8668 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 20 十月 2025 10:17:22 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/index.vue |  104 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 6fd7546..080eb02 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -132,7 +132,17 @@
             placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
           ></el-input>
         </el-form-item>
-
+        <el-form-item label="鏃ユ湡闄愬埗" prop="status">
+          <el-select v-model="endOut" placeholder="璇烽�夋嫨">
+            <el-option
+              v-for="item in endOuts"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="鎮h�呰寖鍥�" prop="status">
           <el-cascader
             v-model="topqueryParams.scopetype"
@@ -249,10 +259,7 @@
         <el-col :span="1.5">
           <div class="documentf">
             <div class="document">
-              <el-button
-                type="primary"
-                size="medium"
-                @click="affiliation()"
+              <el-button type="primary" size="medium" @click="affiliation()"
                 >鏈汉鎵�灞炴湇鍔�</el-button
               >
             </div>
@@ -262,7 +269,7 @@
           <div class="documentf">
             <div class="document">
               <el-button type="success" size="medium" @click="onthatday()"
-                >褰撴棩鏈嶅姟</el-button
+                >浠婃棩鏈嶅姟</el-button
               >
             </div>
           </div>
@@ -327,6 +334,15 @@
               }}</span></el-button
             >
           </template>
+        </el-table-column>
+        <el-table-column
+          label="璇婃柇鍚嶇О"
+          align="center"
+          key="leavediagname"
+          prop="leavediagname"
+          width="120"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
         <el-table-column
           label="浠诲姟鐘舵��"
@@ -437,6 +453,7 @@
           prop="drname"
         />
         <el-table-column
+          v-if="orgname != '涓芥按甯備腑鍖婚櫌'"
           label="闅忚浜哄憳"
           align="center"
           key="updateBy"
@@ -444,6 +461,7 @@
           width="120"
         />
         <el-table-column
+          v-if="orgname != '涓芥按甯備腑鍖婚櫌'"
           label="缁忕鍖荤敓"
           align="center"
           key="managementDoctor"
@@ -509,16 +527,6 @@
           key="leavehospitaldistrictname"
           prop="leavehospitaldistrictname"
           width="120"
-        >
-        </el-table-column>
-
-        <el-table-column
-          label="璇婃柇鍚嶇О"
-          align="center"
-          key="leavediagname"
-          prop="leavediagname"
-          width="120"
-          :show-overflow-tooltip="true"
         >
         </el-table-column>
 
@@ -1179,6 +1187,17 @@
         qystatus: "",
         btstatus: "",
       },
+      endOut: 1,
+      endOuts: [
+        {
+          value: 0,
+          label: "鎴鑷冲綋鏃ユ湇鍔�",
+        },
+        {
+          value: 1,
+          label: "鍏ㄩ儴鏈嶅姟",
+        },
+      ],
       topicoptionssort: [
         {
           value: 0,
@@ -1196,13 +1215,21 @@
           value: 3,
           label: "鍙戦�佹椂闂�(鍊掑簭)",
         },
+        {
+          value: 7,
+          label: "搴旈殢璁挎棩鏈�(姝e簭)",
+        },
+        {
+          value: 8,
+          label: "搴旈殢璁挎棩鏈�(鍊掑簭)",
+        },
       ],
       // 鏌ヨ鍙傛暟
       topqueryParams: {
         pageNum: 1,
         pageSize: 10,
         sendstate: 2,
-        sort: 2, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)
+        sort: localStorage.getItem("orgname") == "涓芥按甯備腑鍖婚櫌" ? 8 : 2, //0 鍑洪櫌鏃堕棿(姝e簭)    1 鍑洪櫌鏃堕棿(鍊掑簭)   2 鍙戦�佹椂闂�(姝e簭)    3 鍙戦�佹椂闂�(鍊掑簭)  7搴旈殢璁挎棩鏈�(鍊掑簭) 搴旈殢璁挎棩鏈�(姝e簭)
         serviceType: 2,
         searchscope: 3,
         visitCount: 1,
@@ -1210,6 +1237,7 @@
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
       },
+      orgname: "",
       propss: { multiple: true },
       options: [],
 
@@ -1289,8 +1317,8 @@
           YongHuXX: {
             XiTongID: "SUIFANGXT",
             XiTongMC: "闅忚绯荤粺",
-            YongHuID: "1400466972205912064",
-            YongHuXM: "JNRMYY",
+            YongHuID: localStorage.getItem("YongHuID"),
+            YongHuXM: localStorage.getItem("YongHuXM"),
             ZuZhiJGID: localStorage.getItem("orgid"),
             ZuZhiJGMC: localStorage.getItem("orgname"),
             idp: "lyra",
@@ -1311,6 +1339,7 @@
     this.serviceState = store.getters.serviceState;
     this.checkboxlist = store.getters.checkboxlist;
     this.errtype = this.$route.query.errtype;
+    this.orgname = localStorage.getItem("orgname");
     this.leavehospitaldistrictcode =
       this.$route.query.leavehospitaldistrictcode;
     this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
@@ -1341,13 +1370,21 @@
     /** 鏌ヨ闅忚鏈嶅姟鍒楄〃 */
     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);
+      }
+      console.log(this.endOut);
+
+      if (this.endOut == 0) {
+        this.topqueryParams.endOutHospTime = this.formatDateToYYYYMMDDHHMMSS(
+          this.getEndOfDay()
+        );
+      } else {
+        this.topqueryParams.endOutHospTime = null;
       }
       // 鎺ュ彈寮傚父璺宠浆
       if (this.errtype) {
@@ -1405,8 +1442,24 @@
         this.total = response.total;
       });
     },
+    // 鏃堕棿
+    getEndOfDay() {
+      const date = new Date(); // 鍒涘缓涓�涓〃绀哄綋鍓嶆椂闂寸殑Date瀵硅薄
+      date.setHours(23, 59, 59, 0); // 灏嗘椂闂磋缃负23:59:59.000
+      return date;
+    },
+    formatDateToYYYYMMDDHHMMSS(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, "0"); // 鏈堜唤琛ラ浂
+      const day = String(date.getDate()).padStart(2, "0"); // 鏃ユ湡琛ラ浂
+      const hours = String(date.getHours()).padStart(2, "0");
+      const minutes = String(date.getMinutes()).padStart(2, "0");
+      const seconds = String(date.getSeconds()).padStart(2, "0");
+
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
     affiliation() {
-      this.topqueryParams.managementDoctor = store.getters.hisUserId;
+      this.topqueryParams.managementDoctorCode = store.getters.hisUserId;
       this.getList(1);
     },
     onthatday() {
@@ -1675,13 +1728,10 @@
     },
     //鎮h��360璺宠浆
     gettoken360(sfzh, drcode, drname) {
-      this.$modal.msgWarning("360鍔熻兘鏆傛湭寮�閫�");
+      // this.$modal.msgWarning("360鍔熻兘鏆傛湭寮�閫�");
 
       this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh;
-      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");
@@ -1795,7 +1845,7 @@
       let type = "";
       console.log(row, "rwo");
       if (row.preachformson) {
-        if (row.preachformson.includes("3")) {
+        if (row.preachformson.includes("3") || row.type == 1) {
           type = 1;
         }
       }

--
Gitblit v1.9.3