Merge branch 'master' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture

3 months ago · 12bd34b644
26 changed files with 160 additions and 63 deletions
--- a/acupuncture-前台/.env.productions
+++ b/acupuncture-前台/.env.productions
@ -0,0 +1,12 @@
+# 页面标题
+VUE_APP_TITLE = 朱琏针灸数据云系统
+
+# 生产环境配置
+NODE_ENV = 'production'
+# 因孚生产
+VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+# 筛查访问地址
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+# 访问路径
+VUE_APP_PUBLIC_PATH = '/acupuncture/clientssl/'
--- a/acupuncture-前台/package.json
+++ b/acupuncture-前台/package.json
@ -7,6 +7,7 @@
  "scripts": {
    "dev": "vue-cli-service serve",
    "build:prod": "vue-cli-service build",
+    "build:prods": "vue-cli-service build --mode productions",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
    "lint": "eslint --ext .js,.vue src"
--- a/acupuncture-前台/src/layout/components/Sidebar/Logo.vue
+++ b/acupuncture-前台/src/layout/components/Sidebar/Logo.vue
@ -52,8 +52,9 @@ export default {
  justify-content: center;
  align-items: center;
  img {
-    width: 40px;
-    height: 40px;
+    margin-top: -10px;
+    width: 48px;
+    height: 48px;
  }

  &.collapse {
--- a/acupuncture-前台/src/views/indexCom/XGZL.vue
+++ b/acupuncture-前台/src/views/indexCom/XGZL.vue
@ -13,7 +13,7 @@
                    中西医结合
                  </div>
                  <span class="dian" style="background: #d8d8d8"></span>
-                  纯中医
+                  单纯中医
                </div>
              </div>
            </div>
@ -196,7 +196,7 @@ export default {
            },
            {
              value: zllxtj?.czy || 0,
-              name: "纯中医",
+              name: "单纯中医",
            },
          ];
          this.handleHealType();
--- a/acupuncture-前台/src/views/indexCom/index.js
+++ b/acupuncture-前台/src/views/indexCom/index.js
@ -915,6 +915,31 @@ export const lossFollowEcharts = {
  xAxis: {
    type: "category",
    data: [],
+    axisLabel: {
+      formatter: function (value) {
+        var ret = ""; //拼接加\n返回的类目项
+        var max = 10; //每行显示的文字字数
+        var val = value.length; //X轴内容的文字字数
+        var rowN = Math.ceil(val / max); //需要换的行数
+        // 最后一行不加\n
+        // 根据最大字数限制进行换行处理
+        if (rowN > 1) {
+          // 如果需要换行
+          for (var i = 0; i < rowN; i++) {
+            // 遍历每行
+            var temp = value.substring(i * max, (i + 1) * max); // 截取当前行内容
+            ret += temp; // 添加到结果字符串
+            if (i < rowN - 1) {
+              // 如果不是最后一行
+              ret += "\n"; // 添加换行符
+            }
+          }
+          return ret;
+        } else {
+          return value; // 不需要换行时直接返回原值
+        }
+      },
+    },
  },
  grid: {
    top: "12%",
--- a/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue
+++ b/acupuncture-前台/src/views/medicalFile/components/anxiety/HAMD.vue
@ -247,14 +247,24 @@ export default {
        },
        {
          index: 19,
-          question: "日夜变化",
+          question: "日夜变化（早）",
          criteria: [
            { label: "无", value: 0 },
-            { label: "有日夜变化", value: 1 },
+            { label: "轻度", value: 1 },
+            { label: "中度", value: 2 },
          ],
        },
        {
          index: 20,
+          question: "日夜变化（晚）",
+          criteria: [
+            { label: "无", value: 0 },
+            { label: "轻度", value: 1 },
+            { label: "中度", value: 2 },
+          ],
+        },
+        {
+          index: 21,
          question: "人格解体",
          criteria: [
            { label: "无", value: 0 },
@ -265,7 +275,7 @@ export default {
          ],
        },
        {
-          index: 21,
+          index: 22,
          question: "偏执症状",
          criteria: [
            { label: "无", value: 0 },
@ -276,7 +286,7 @@ export default {
          ],
        },
        {
-          index: 22,
+          index: 23,
          question: "强迫症状",
          criteria: [
            { label: "无", value: 0 },
@ -287,7 +297,7 @@ export default {
          ],
        },
        {
-          index: 23,
+          index: 24,
          question: "躯体化症状",
          criteria: [
            { label: "无", value: 0 },
@ -298,7 +308,7 @@ export default {
          ],
        },
        {
-          index: 24,
+          index: 25,
          question: "社交退缩",
          criteria: [
            { label: "无", value: 0 },
--- a/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue
+++ b/acupuncture-前台/src/views/medicalFile/components/posture/TRACE.vue
@ -49,6 +49,7 @@ export default {
          index: 1,
          question: "肩部-肩膀的不对称性",
          criteria: [
+            { label: "无差异", value: 0 },
            { label: "轻微差异", value: 1 },
            { label: "有差异", value: 2 },
            { label: "差异性很大", value: 3 },
@ -58,6 +59,7 @@ export default {
          index: 2,
          question: "肩胛骨-肩胛骨的对称性",
          criteria: [
+            { label: "无差异", value: 0 },
            { label: "轻微差异", value: 1 },
            { label: "差异较大", value: 2 },
          ],
@ -66,6 +68,7 @@ export default {
          index: 3,
          question: "腰部-腰部的对称性",
          criteria: [
+            { label: "无差异", value: 0 },
            { label: "轻微差异", value: 1 },
            { label: "有差异", value: 2 },
            { label: "差异性很大", value: 3 },
@ -76,6 +79,7 @@ export default {
          index: 4,
          question: "半胸-上半身不对称的状况",
          criteria: [
+            { label: "无差异", value: 0 },
            { label: "轻微差异", value: 1 },
            { label: "差异较大", value: 2 },
          ],
--- a/acupuncture-前台/src/views/medicalFile/details.vue
+++ b/acupuncture-前台/src/views/medicalFile/details.vue
@ -393,7 +393,7 @@
            <div class="human-body">
              <el-form-item prop="PG_JL_HAMD-24_DF">
                <template v-slot:label>
-                  <span>汉密尔顿抑郁评估（HAMD-24）得分(0-96分)</span>
+                  <span>汉密尔顿抑郁评估（HAMD-24）得分(0-76分)</span>
                  <span
                    class="foem-item-pg"
                    @click="
@ -415,7 +415,7 @@
              </el-form-item>
              <el-form-item prop="PG_JL_SAS_DF">
                <template v-slot:label>
-                  <span>焦虑自评（SAS）得分(0-100分)</span>
+                  <span>焦虑自评（SAS）得分(0-80分)</span>
                  <span
                    class="foem-item-pg"
                    @click="handleComponents('PG_JL_SAS_DF', '焦虑自评（SAS）')"
--- a/acupuncture-前台/src/views/patientFile/index.vue
+++ b/acupuncture-前台/src/views/patientFile/index.vue
@ -346,6 +346,7 @@
        </el-form-item>
        <el-form-item label="受教育程度" prop="educationYears">
          <el-select
+            :disabled="formDisabled"
            v-model="form.educationYears"
            placeholder="请选择"
            filterable
@ -462,8 +463,7 @@ export default {
        Authorization: "Bearer " + getToken(),
        deptId: localStorage.getItem("hospitalId"),
      },
-      uploadFileUrl1:
-        process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址
+      uploadFileUrl1: process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址
      fileList: [],
      // 受教育程度，年限
      educationYears: [
--- a/acupuncture-前台/src/views/screening/index.vue
+++ b/acupuncture-前台/src/views/screening/index.vue
@ -177,13 +177,6 @@
          </span>
        </template>
      </el-table-column>
-
-      <el-table-column
-        label="BMI"
-        align="center"
-        prop="SCWJ-BMI"
-        min-width="100"
-      />
      <el-table-column
        label="上床睡觉时间"
        align="center"
--- a/acupuncture-前台/针灸前台http-1.zip
+++ b/acupuncture-前台/针灸前台http-1.zip
--- a/acupuncture-前台/针灸前台http-2.zip
+++ b/acupuncture-前台/针灸前台http-2.zip
--- a/acupuncture-前台/针灸前台ssl-1.zip
+++ b/acupuncture-前台/针灸前台ssl-1.zip
--- a/acupuncture-后台/.env.productions
+++ b/acupuncture-后台/.env.productions
@ -0,0 +1,12 @@
+# 页面标题
+VUE_APP_TITLE = 朱琏针灸数据云系统
+
+# 生产环境配置
+NODE_ENV = 'production'
+# 因孚生产
+VUE_APP_BASE_API = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+VUE_APP_API_QZURL = 'https://nnzjpt.ylinno.com/acupuncture/api/'
+# 筛查访问地址
+VUE_APP_H5_URL = 'https://nnzjpt.ylinno.com/acupuncture/clientssl/screening/h5'
+# 访问路径
+VUE_APP_PUBLIC_PATH = '/acupuncture/adminssl/'
--- a/acupuncture-后台/package.json
+++ b/acupuncture-后台/package.json
@ -7,6 +7,7 @@
  "scripts": {
    "dev": "vue-cli-service serve",
    "build:prod": "vue-cli-service build",
+    "build:prods": "vue-cli-service build --mode productions",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
    "lint": "eslint --ext .js,.vue src"
--- a/acupuncture-后台/src/views/indexCom/XGZL.vue
+++ b/acupuncture-后台/src/views/indexCom/XGZL.vue
@ -13,7 +13,7 @@
                    中西医结合
                  </div>
                  <span class="dian" style="background: #d8d8d8"></span>
-                  纯中医
+                  单纯中医
                </div>
              </div>
            </div>
@ -196,7 +196,7 @@ export default {
            },
            {
              value: zllxtj?.czy || 0,
-              name: "纯中医",
+              name: "单纯中医",
            },
          ];
          this.handleHealType();
--- a/acupuncture-后台/src/views/indexCom/index.js
+++ b/acupuncture-后台/src/views/indexCom/index.js
@ -915,6 +915,31 @@ export const lossFollowEcharts = {
  xAxis: {
    type: "category",
    data: [],
+    axisLabel: {
+      formatter: function (value) {
+        var ret = ""; //拼接加\n返回的类目项
+        var max = 10; //每行显示的文字字数
+        var val = value.length; //X轴内容的文字字数
+        var rowN = Math.ceil(val / max); //需要换的行数
+        // 最后一行不加\n
+        // 根据最大字数限制进行换行处理
+        if (rowN > 1) {
+          // 如果需要换行
+          for (var i = 0; i < rowN; i++) {
+            // 遍历每行
+            var temp = value.substring(i * max, (i + 1) * max); // 截取当前行内容
+            ret += temp; // 添加到结果字符串
+            if (i < rowN - 1) {
+              // 如果不是最后一行
+              ret += "\n"; // 添加换行符
+            }
+          }
+          return ret;
+        } else {
+          return value; // 不需要换行时直接返回原值
+        }
+      },
+    },
  },
  grid: {
    top: "12%",
--- a/acupuncture-后台/src/views/medicalFile/details.vue
+++ b/acupuncture-后台/src/views/medicalFile/details.vue
@ -265,14 +265,14 @@
              <el-form-item label="" prop="PG_TT_TAPS_DF">
                <template v-slot:label>
                  <span>TAPS体态自觉评估得分(3-15分)</span>
-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents('PG_TT_TAPS_DF', 'TAPS体态自觉评估')
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -284,14 +284,14 @@
              <el-form-item prop="PG_TT_TRACE_DF">
                <template v-slot:label>
                  <span>TRACE体态临床评估得分(0-11分)</span>
-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents('PG_TT_TRACE_DF', 'TRACE体态临床评估')
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -303,14 +303,14 @@
              <el-form-item prop="PG_TT_SRS22_DF">
                <template v-slot:label>
                  <span>SRS-22问卷评估得分(1~5分)</span>
-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents('PG_TT_SRS22_DF', 'SRS-22问卷评估')
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -326,7 +326,7 @@
              <el-form-item prop="PG_SM_PHQ-9_DF">
                <template v-slot:label>
                  <span> 患者健康问卷（PHQ-9）评估得分(0-27分)</span>
-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents(
@ -336,7 +336,7 @@
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -348,14 +348,14 @@
              <el-form-item prop="PG_SM_EPSW_DF">
                <template v-slot:label>
                  <span>Epworth嗜睡评估得分(0-24分)</span>
-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents('PG_SM_EPSW_DF', 'Epworth嗜睡评估')
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -368,7 +368,7 @@
                <template v-slot:label>
                  <span>匹兹堡睡眠质量指数（PSQI）评估得分(0~21分)</span>

-                  <span
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents(
@ -378,7 +378,7 @@
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -393,8 +393,8 @@
            <div class="human-body">
              <el-form-item prop="PG_JL_HAMD-24_DF">
                <template v-slot:label>
-                  <span>汉密尔顿抑郁评估（HAMD-24）得分(0-96分)</span>
-                  <span
+                  <span>汉密尔顿抑郁评估（HAMD-24）得分(0-76分)</span>
+                  <!-- <span
                    class="foem-item-pg"
                    @click="
                      handleComponents(
@ -404,7 +404,7 @@
                    "
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
@ -415,13 +415,13 @@
              </el-form-item>
              <el-form-item prop="PG_JL_SAS_DF">
                <template v-slot:label>
-                  <span>焦虑自评（SAS）得分(0-100分)</span>
-                  <span
+                  <span>焦虑自评（SAS）得分(0-80分)</span>
+                  <!-- <span
                    class="foem-item-pg"
                    @click="handleComponents('PG_JL_SAS_DF', '焦虑自评（SAS）')"
                  >
                    评估
-                  </span>
+                  </span> -->
                </template>
                <el-input
                  :disabled="form.status != 0 && form.status != 3"
--- a/acupuncture-后台/src/views/medicalFile/index.vue
+++ b/acupuncture-后台/src/views/medicalFile/index.vue
@ -1676,7 +1676,7 @@ export default {
    /** 导出按钮操作 */
    handleExport() {
      this.download1(
-        "/treatment/exportTreatment",
+        "/admin/treatment/exportTreatment",
        {
          ...this.queryParams.params,
        },
--- a/acupuncture-后台/src/views/patientFile/index.vue
+++ b/acupuncture-后台/src/views/patientFile/index.vue
@ -305,12 +305,21 @@
            :disabled="formDisabled"
          />
        </el-form-item>
-        <el-form-item label="受教育年限" prop="educationYears">
-          <el-input
-            v-model="form.educationYears"
-            placeholder="请输入"
+        <el-form-item label="受教育程度" prop="educationYears">
+          <el-select
            :disabled="formDisabled"
-          />
+            v-model="form.educationYears"
+            placeholder="请选择"
+            filterable
+          >
+            <el-option
+              v-for="item in educationYears"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
        </el-form-item>
        <el-form-item label="手机号码" prop="phone">
          <el-input
@ -412,8 +421,7 @@ export default {
        Authorization: "Bearer " + getToken(),
        deptId: localStorage.getItem("hospitalId"),
      },
-      uploadFileUrl1:
-        process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址
+      uploadFileUrl1: process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址
      fileList: [],
      // 通过年限对象获取学历
      educationYearsValue: {
@ -426,6 +434,17 @@ export default {
        19: "硕士研究生",
        22: "博士研究生",
      },
+      // 受教育程度，年限
+      educationYears: [
+        { label: "文盲", value: 0 },
+        { label: "小学", value: 6 },
+        { label: "初中", value: 9 },
+        { label: "高中", value: 12 },
+        { label: "大专", value: 15 },
+        { label: "大学", value: 16 },
+        { label: "硕士研究生", value: 19 },
+        { label: "博士研究生", value: 22 },
+      ],
      // 现病史
      medicalHistory: [
        "高血压",
@ -748,7 +767,7 @@ export default {
    /** 导出按钮操作 */
    handleExport() {
      this.download1(
-        "/patient/export",
+        "/admin/patient/export",
        {
          ...this.queryParams.params,
        },
--- a/acupuncture-后台/src/views/screening/index.vue
+++ b/acupuncture-后台/src/views/screening/index.vue
@ -178,12 +178,6 @@
        </template>
      </el-table-column>

-      <el-table-column
-        label="BMI"
-        align="center"
-        prop="SCWJ-BMI"
-        min-width="100"
-      />
      <el-table-column
        label="上床睡觉时间"
        align="center"
@ -413,7 +407,7 @@ export default {
      let data = JSON.parse(JSON.stringify(this.queryParams));
      data.param.idList = this.ids;
      this.download1(
-        "/screening/exportScreen",
+        "/screening/admin/exportScreen",
        {
          ...data,
        },
--- a/acupuncture-后台/src/views/screening/qrCode.vue
+++ b/acupuncture-后台/src/views/screening/qrCode.vue
@ -38,7 +38,7 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
        <el-button
          type="primary"
          plain
@ -47,8 +47,8 @@
          @click="handleAdd"
          >新增</el-button
        >
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@ -58,7 +58,7 @@
          @click="handleDelete"
          >删除</el-button
        >
-      </el-col>
+      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="warning"
@ -122,13 +122,13 @@
            @click="handleExport(scope.row)"
            >导出
          </el-button>
-          <el-button
+          <!-- <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            >删除
-          </el-button>
+          </el-button> -->
        </template>
      </el-table-column>
    </el-table>
--- a/acupuncture-后台/针灸-后台1.zip
+++ b/acupuncture-后台/针灸-后台1.zip
--- a/acupuncture-后台/针灸后台http-1.zip
+++ b/acupuncture-后台/针灸后台http-1.zip
--- a/acupuncture-后台/针灸后台http-2.zip
+++ b/acupuncture-后台/针灸后台http-2.zip
--- a/acupuncture-后台/针灸后台ssl-1.zip
+++ b/acupuncture-后台/针灸后台ssl-1.zip