Merge branch 'master-dev'

# Conflicts:
#	web_client/cgaClient0306-2.zip
#	web_client/src/views/Patient/chooseSetMeal/index.vue
#	web_client/src/views/history/components/scaleInfor.vue
#	web_client/src/views/history/components/scaleInforCopy.vue
#	web_client/vue.config.js

web_client/src/views/Patient/chooseSetMeal/index.vue

@@ -934,7 +934,7 @@ export default {
   right: 0;
   margin: 0 auto;
   bottom: 20px;
-  z-index: 66;
+  z-index: 9999;
 }
 .divul {
   display: flex;
@@ -1041,6 +1041,14 @@ export default {
   line-height: 22px;
   margin-bottom: 0;
 }
+.checkbox-group2 h3 {
+  position: absolute;
+  top: -14px;
+  left: 0px;
+  right: 0px;
+  height: 58px;
+  z-index: 8888;
+}
 .div-scale-box {
   // border-top: 1px solid #e1e9f1;
   // margin: 0 16px;

web_client/src/views/history/components/scaleInfor.vue

@@ -19,6 +19,21 @@
                   <i class="el-icon-document-checked"></i>
                   保存修改
                 </div>
+                <!-- <div
+                  class="div-derive cardRig-but"
+                  style="width: 130px; margin-right: 10px"
+                  @click="handleExport('合并版', true)"
+                >
+                  <i class="el-icon-upload2"></i>导出（合并版）
+                </div>
+                <div
+                  v-if="!isAPP"
+                  class="div-print cardRig-but"
+                  @click="handlePrinting('合并版')"
+                  style="width: 130px; margin-right: 10px"
+                >
+                  <i class="el-icon-printer"></i>打印（合并版）
+                </div> -->
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
@@ -323,10 +338,11 @@ import {
   addSign,
   doctorExport,
   personalExport,
-  queryReportDetail,
+  queryReport,
   queryReportInfo,
   positiveExport,
   icdQuery,
+  reportExportAll,
 } from "api/ams";
 import {
   pasis as pasisConfig,
@@ -423,6 +439,8 @@ export default {
         res = await personalExport(params);
       } else if (_type === "阳性版") {
         res = await positiveExport(params);
+      } else if (_type === "合并版") {
+        res = await reportExportAll(params);
       }
 
       const { code, msg, data } = res;
@@ -558,7 +576,7 @@ export default {
       const params = {
         evaluationId: this.$route.query.evaluationId || this.createId,
       };
-      const res = await queryReportDetail(params);
+      const res = await queryReport(params);
       const { code, msg, data } = res;
       if (code === 200) {
         this.reportDetail1 = data;

web_client/src/views/history/components/scaleInforCopy.vue

@@ -17,7 +17,21 @@
                   <i class="el-icon-document-checked"></i>
                   保存修改
                 </div>
-
+                <!-- <div
+                  class="div-derive cardRig-but"
+                  style="width: 130px; margin-right: 10px"
+                  @click="handleExport('合并版', true)"
+                >
+                  <i class="el-icon-upload2"></i>导出（合并版）
+                </div>
+                <div
+                  v-if="!isAPP"
+                  class="div-print cardRig-but"
+                  @click="handlePrinting('合并版')"
+                  style="width: 130px; margin-right: 10px"
+                >
+                  <i class="el-icon-printer"></i>打印（合并版）
+                </div> -->
                 <div
                   class="div-derive cardRig-but"
                   style="width: 130px; margin-right: 10px"
@@ -322,9 +336,10 @@ import {
   addSign,
   doctorExport,
   personalExport,
-  queryReportDetail,
+  queryReport,
   queryReportInfo,
   positiveExport,
+  reportExportAll,
   icdQuery,
 } from "api/ams";
 import {
@@ -427,6 +442,8 @@ export default {
         res = await personalExport(params);
       } else if (_type === "阳性版") {
         res = await positiveExport(params);
+      }else if (_type === "合并版") {
+        res = await reportExportAll(params);
       }
 
       const { code, msg, data } = res;
@@ -560,7 +577,7 @@ export default {
       const params = {
         evaluationId: this.$route.query.evaluationId || this.createId,
       };
-      const res = await queryReportDetail(params);
+      const res = await queryReport(params);
       const { code, msg, data } = res;
       if (code === 200) {
         this.reportDetail1 = data;

web_client/vue.config.js

@@ -36,7 +36,9 @@ module.exports = {
     proxy: {
       [settings.proxyUrl]: {
         // target: "https://www.ylinno.com/cga/v2/api/client/",
-        target: "http://113.45.159.249:59001/cga/v2/api/client/",
+        // target: "http://113.45.159.249:59001/cga/v2/api/client/",
+        // target: "http://127.0.0.1:19331",
+        target: "http://192.168.1.136:19331",
         changeOrigin: true,
         pathRewrite: {
           ["^" + settings.proxyUrl]: "",