测试完成

WXL (wul)

3 天以前 b57c6c97c7de4cb5aeeb6c766a4642fac5b9b500

测试完成

 src/views/Satisfaction/configurationmyd/batch.vue

@@ -143,9 +143,7 @@
                  </div>
                  <div class="patient-item">
                    <span class="label">性别：</span>
                    <span class="value">{{
                      row.patdescJson.sex
                    }}</span>
                    <span class="value">{{ row.patdescJson.sex }}</span>
                  </div>
                  <div class="patient-item">
                    <span class="label">年龄：</span>
@@ -599,7 +597,8 @@

  created() {
    // ä»Žè·¯ç”±å‚数获取问题ID
    this.filterParams.scriptids = this.$route.query.questionId || this.$route.query.questionIds||null;
    this.filterParams.scriptids =
      this.$route.query.questionId || this.$route.query.questionIds || null;
    // if (this.$route.query.questionId) {
    // } else if (this.$route.query.questionIds) {
    //   console.log(
@@ -607,7 +606,7 @@
    //     "this.$route.query.questionIds"
    //   );

      this.filterParams.templateType = Number(this.$route.query.type)||null;
    this.filterParams.templateType = Number(this.$route.query.type) || null;

    //   this.filterParams.scriptid = null;
    // }
@@ -797,8 +796,10 @@
      this.filterParams = {
        todeptcode: "",
        handleFlag: "",
        templateType: "",
        scriptids: null, // ä¿ç•™é—®é¢˜ID
        scriptids:
          this.$route.query.questionId || this.$route.query.questionIds || null,
        templateType: Number(this.$route.query.type) || null,

        pageNum: 1,
        pageSize: 10,
      };
@@ -831,7 +832,8 @@

    // è¿”回异常列表
    handleGoBack() {
      this.$router.push("/satisfaction/exception/list");
      // this.$router.push("/satisfaction/exception/list");
      this.$router.push("/Intelligentcenter/dispose");
    },

    // æŸ¥çœ‹è¯¦æƒ…

 src/views/Satisfaction/diseaseStatistics/index.vue

@@ -516,6 +516,8 @@

    SeedetailsgGo(row) {
      this.SeedetailsVisible = false;
      this.infotitleVisible = false;

      let type = "";
      if (row.preachformson && row.preachformson.includes("3")) {
        type = 1;

 src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue

@@ -354,7 +354,7 @@
        statisticaltype: 1,
        leavehospitaldistrictcodes: ["all"],
        deptcodes: [],
        serviceType: [2],
        serviceType: [],
        dateRange: [],
        pageNum: 1,
        pageSize: 20,
@@ -373,7 +373,25 @@
      flatArraydept: [],

      // æœåŠ¡ç±»åž‹é€‰é¡¹
      options: [],
      options: [
        {
          value: 6,
          label: "住院满意度",
          raw: {
            cssClass: "",
            listClass: "",
          },
        },

        {
          value: 14,
          label: "门诊满意度",
          raw: {
            cssClass: "",
            listClass: "",
          },
        },
      ],

      // è¡¨æ ¼æ•°æ®
      userList: [],
@@ -457,7 +475,7 @@
    // èŽ·å–科室树
    getDeptTree() {
      // èŽ·å–服务类型
      this.options = this.$store.getters.tasktypes || [];
      // this.options = this.$store.getters.tasktypes || [];

      // èŽ·å–科室列表
      this.flatArraydept = (this.$store.getters.belongDepts || []).map(

 src/views/followvisit/discharge/index.vue

@@ -92,10 +92,11 @@
            v-model="topqueryParams.scopetype"
            placeholder="默认全部"
            :options="sourcetype"
            :props="{ expandTrigger: 'hover' }"
            :props="{ expandTrigger: 'hover', multiple: true }"
            @change="handleChange"
            filterable
            clearable
            collapse-tags
          ></el-cascader>
        </el-form-item>

@@ -1192,6 +1193,7 @@
          label: "全部",
        },
      ],
      lastScopeType: 3, // æ‚£è€…范围上次选择的一级类型（1=科室，2=病区，3=全部）
      loading: false,
      cardlist: [
        {
@@ -1293,7 +1295,7 @@
        visitCount: 1,
        scopetype: [],
        managementDoctor:
          localStorage.getItem("orgname") == "缙云县人民医院"
          localStorage.getItem("orgname") == "缙云县人民医院"||localStorage.getItem("orgname") == "丽水市中医院"
            ? store.getters.nickName
            : "",
        leaveldeptcodes: [],
@@ -1493,13 +1495,7 @@
    /** æŸ¥è¯¢éšè®¿æœåŠ¡åˆ—表 */
    async 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);
      }
      this.applyDeptWardScope();
      if (this.endOut == 0) {
        this.topqueryParams.endSendDateTime = this.formatDateToYYYYMMDDHHMMSS(
          this.getEndOfDay()
@@ -1681,13 +1677,7 @@
      if (type) {
        this.resetQuerykj();
      }
      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.applyDeptWardScope();
      // æŽ¥å—异常跳转
      if (this.errtype) {
        this.topqueryParams.leavehospitaldistrictcodes.push(
@@ -1795,13 +1785,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.applyDeptWardScope();
      this.topqueryParams.pageNum = 1;
      // åˆ¤æ–­æ˜¯ä¸æ˜¯å·¥ä½œå°å¿«æ·æŸ¥è¯¢
      if (this.errtype != 2) {
@@ -1812,33 +1796,65 @@
      }
      this.getList(refresh);
    },
    // æ‚£è€…范围处理
    // æ‚£è€…范围处理：从多选级联 scopetype è§£æžç§‘室/病区
    applyDeptWardScope() {
      const value = this.topqueryParams.scopetype || [];
      const deptCodes = [];
      const wardCodes = [];
      let isAll = false;

      value.forEach((item) => {
        const type = item[0];
        if (type == 3) {
          isAll = true;
        } else if (type == 1) {
          deptCodes.push(item[item.length - 1]);
        } else if (type == 2) {
          wardCodes.push(item[item.length - 1]);
        }
      });

      // é€‰äº†å…¨éƒ¨ æˆ– æœªé€‰æ‹© â†’ ç”¨æˆ·å…¨éƒ¨ç§‘室/病区
      if (isAll || (!deptCodes.length && !wardCodes.length)) {
        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
          (obj) => obj.deptCode
        );
        this.topqueryParams.leavehospitaldistrictcodes =
          store.getters.belongWards.map((obj) => obj.districtCode);
      } else {
        this.topqueryParams.leaveldeptcodes = deptCodes;
        this.topqueryParams.leavehospitaldistrictcodes = wardCodes;
      }
    },
    // æ‚£è€…范围多选变更（科室/病区互斥）
    handleChange(value) {
      console.log("选择的患者范围:", value);
      const types = (value || []).map((item) => item[0]);
      const hasDept = types.includes(1);
      const hasWard = types.includes(2);

      // æ¸…空之前的查询参数
      this.topqueryParams.leavehospitaldistrictcodes = [];
      this.topqueryParams.leaveldeptcodes = [];
      this.topqueryParams.searchscope = null;

      if (!value || value.length === 0) {
      // äº’斥：科室和病区不能同时选
      if (hasDept && hasWard) {
        if (this.lastScopeType == 1) {
          // ä¸Šæ¬¡é€‰äº†ç§‘室，这次新增病区 â†’ ä¿ç•™ç—…区
          this.topqueryParams.scopetype = value.filter(
            (item) => item[0] === 2
          );
          this.lastScopeType = 2;
          this.$message.warning("科室和病区不能同时选择，已切换为病区");
        } else {
          // ä¸Šæ¬¡é€‰äº†ç—…区，这次新增科室 â†’ ä¿ç•™ç§‘室
          this.topqueryParams.scopetype = value.filter(
            (item) => item[0] === 1
          );
          this.lastScopeType = 1;
          this.$message.warning("科室和病区不能同时选择，已切换为科室");
        }
        this.applyDeptWardScope();
        return;
      }

      let type = value[0];
      let code = value.slice(-1)[0];

      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;
      }
      this.lastScopeType = hasDept ? 1 : hasWard ? 2 : 3;
      this.applyDeptWardScope();
    },
    // æœåŠ¡çŠ¶æ€å˜æ›´å¤„理
    handleServiceStatusChange(value) {
@@ -1876,6 +1892,7 @@
      this.dateRange = [];
      this.dateRangefs = [];
      this.serviceStatusValue = 10;
      this.lastScopeType = 3;
      this.topqueryParams = {
        pageNum: 1,
        pageSize: 10,
@@ -1895,6 +1912,7 @@
      this.dateRange = [];
      this.dateRangefs = [];
      this.serviceStatusValue = null;
      this.lastScopeType = 3;
      this.topqueryParams = {
        pageNum: 1,
        pageSize: 10,

 src/views/patient/patient/outpatient.vue

@@ -1232,7 +1232,7 @@
        return;
      }
      this.archivePatients = this.userList.filter((item) =>
        this.ids.includes(item.patid)
        this.ids.includes(item.id)
      );
      this.archiveDialogVisible = true;
    },

 src/views/sfstatistics/percentage/index copy.vue

@@ -2204,6 +2204,8 @@
    },
    SeedetailsgGo(row) {
      this.SeedetailsVisible = false;
      this.infotitleVisible = false;

      let type = "";
      if (row.preachformson && row.preachformson.includes("3")) {
        type = 1;

 src/views/sfstatistics/percentage/index.vue

@@ -521,6 +521,8 @@

    SeedetailsgGo(row) {
      this.SeedetailsVisible = false;
      this.infotitleVisible = false;

      let type = "";
      if (row.preachformson && row.preachformson.includes("3")) {
        type = 1;

 src/views/sfstatistics/percentage/satisfaction.vue

@@ -880,6 +880,7 @@
    },
    SeedetailsgGo(row) {
      this.SeedetailsVisible = false;

      let type = "";
      if (row.preachformson && row.preachformson.includes("3")) {
        type = 1;

 vue.config.js

@@ -37,10 +37,10 @@
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://www.health-y.cn/lssf`,
        // target: `http://192.168.100.10:8096`,
        target: `http://192.168.100.10:8094`,//省立同德
        // target: `http://192.168.100.10:8094`,//省立同德
        // target: `http://192.168.100.10:8095`,//新华
        // target: `http://192.168.100.10:8098`,//市一
        // target:`http://localhost:8095`,
        target:`http://localhost:8095`,
        // target:`http://35z1t16164.qicp.vip`,
        // target: `http://192.168.100.172:8095`,
        // target: `http://192.168.100.10:8089`,//南华

 Ëæ·ÃÍâÁ´.zip

Binary files differ

 Ëæ·ÃͨÓÃ.zip

Binary files differ

 Ëæ·ÃͨÓÃ8.14.zip

Binary files differ

 Ëæ·ÃͨÓÃ8.17.zip

Binary files differ