Merge branch 'master-dev' of http://116.204.114.73:3000/ccsens_zhengzhichuan/cga_v2 into master-dev

web_client/src/api/ams.js

@@ -46,6 +46,9 @@ export const doctorExport = (params) =>
 // 导出报告单（阳性版）
 export const positiveExport = (params) =>
   axios.post(`${proxyUrl}/report/exportYx`, params);
+// 导出报告单（整）
+export const reportExportAll = (params) =>
+  axios.post(`${proxyUrl}/report/exportAll`, params);
 // 导出指定量表
 export const exportWorkingScore = (params) =>
   axios.post(`${rms}/exportWorkingScore`, params);

web_client/src/views/Patient/Assist.vue

@@ -78,7 +78,7 @@
     <div v-else>
       <el-empty description=" "></el-empty>
       <div style="text-align: center; padding-bottom: 20px">
-        暂无用药信息，<span style="color: #5cc0be" @click="handleAdd(0)"
+        暂无诊断信息，<span style="color: #5cc0be" @click="handleAdd(0)"
           >添加</span
         >
       </div>
@@ -202,8 +202,15 @@ export default {
           }
           let params = {
             param: {
+              patientId: this.recordPatientData.patientId,
+              visitNo: this.bodyArray[0].outpatientNo,
               editType: "PmsPatientDiagnosis",
-              model: data.filter((item) => item.diagnosisCode || item.diagnosisName || item.diagnosisDate),
+              model: data.filter(
+                (item) =>
+                  item.diagnosisCode ||
+                  item.diagnosisName ||
+                  item.diagnosisDate,
+              ),
             },
           };
           const res = await editPatientOtherMsg(params);

web_client/src/views/Patient/pastNowHistory.vue

@@ -227,6 +227,8 @@ export default {
           }
           let params = {
             param: {
+              patientId: this.recordPatientData.patientId,
+              visitNo: this.bodyArray[0].outpatientNo,
               editType: "PmsPatientParentIllness",
               model: data.filter(
                 (item) =>

web_client/src/views/Patient/pastNowHistoryCopy.vue

@@ -96,7 +96,7 @@
       </div>
     </div>
     <div v-else>
-      <el-empty description="暂无病史信息"></el-empty>
+      <el-empty description="暂无用药信息"></el-empty>
     </div>
   </div>
 </template>

web_client/src/views/Patient/personalHistory.vue

@@ -194,6 +194,8 @@ export default {
             }
             let params = {
               param: {
+                patientId: this.recordPatientData.patientId,
+                visitNo: this.bodyArray[0].outpatientNo,
                 editType: "PmsPatientPersonal",
                 model: item,
               },

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"
@@ -327,6 +342,7 @@ import {
   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;

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"
@@ -325,6 +339,7 @@ import {
   queryReport,
   queryReportInfo,
   positiveExport,
+  reportExportAll,
   icdQuery,
 } from "api/ams";
 import {

web_client/vue.config.js

@@ -36,9 +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",
+        target: "http://192.168.1.136:19331",
         changeOrigin: true,
         pathRewrite: {
           ["^" + settings.proxyUrl]: "",