Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -1150,8 +1150,10 @@
         }
 
         console.log("第一条监测数据23333333333333333",this.first_monitor)
-
-        this.assessmentBeforeDislysis.last_weight = (this.last_record.weight_after - this.last_record.additional_weight).toFixed(1)
+        if(this.last_record!=null){
+          this.assessmentBeforeDislysis.last_weight = (this.last_record.weight_after - this.last_record.additional_weight).toFixed(1)
+        }
+       
 
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
+    <el-button type="primary" @click="toUpload">一键上传</el-button>
 
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
@@ -208,7 +209,9 @@
                     </div>
                   </div>
 
-                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"> 
+                  <div class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
                     <!-- <div class="inline_block" style=" flex: 1">
                       透析期间：
                       <div
@@ -273,6 +276,14 @@
                         {{ predialysis.complication ? predialysis.complication : "/" }}
                       </div>
                     </div>
+                    <!-- <div class="inline_block" style=" flex: 1">
+                      跌倒评估：
+                      <div
+                        style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
+                      >
+                        {{ receiverTreatmentAccess.score ? receiverTreatmentAccess.score : '/' }}
+                      </div>
+                    </div> -->
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
@@ -289,7 +300,7 @@
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        {{ predialysis.weight_before ? 
+                        {{ predialysis.weight_before ?
                           parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) : "/"
                         }}
                       </div>kg
@@ -302,17 +313,17 @@
                         class="under_line"
                         style=" width: 50%;text-align: center;white-space: normal;"
                       >
-                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ? 
+                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ?
                       parseFloat(predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2): "/" }}
                       </div>kg
                     </div>
                     <div class="inline_block" style=" flex: 1">
-                      <!-- 合并症：
-                      <div class="under_line"
-                        style=" width: 50%;text-align: center; white-space: normal;"
+                      <!-- 预增脱水量：
+                      <div
+                        style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
-                        {{ predialysis.complication ? predialysis.complication : "/" }}
-                      </div> -->
+                         {{predialysis.dehydration?predialysis.dehydration:"" }}
+                      </div>L -->
                     </div>
                   </div>
                 </td>
@@ -398,7 +409,7 @@
                         {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "/" }}
                       </div>
                     </div>
-                    
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex"
@@ -434,7 +445,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex:1;" v-if="prescription.mode_id ==2 || prescription.mode_id == 12">
+                    <div class="inline_block" style="flex:1;">
                       实际置换量：
                       <div style="width: 50%;text-align: center;display: inline-block;border-bottom: 1px solid #999; ">
                         {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "/" }}
@@ -493,13 +504,13 @@
                       </div>kg
                     </div>
                     <div class="inline_block" style="flex:1;">
-                      <!-- 透析中入量：
+                      透析中入量：
                       <div style="width: 50%;text-align: center;display: inline-block;border-bottom: 1px solid #999; ">
                         {{ afterdialysis.dialysis_intakes
                             ? afterdialysis.dialysis_intakes
                             : "/"}}
                       </div>
-                      {{ getUnit(afterdialysis.dialysis_intakes_unit) }} -->
+                      {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                     </div>
                   </div>
                 </td>
@@ -539,11 +550,36 @@
                       <div class="under_line"
                         style="width: 80px; text-align: center; font-weight: 600;
                         "
-                      > 
-                        {{ prescription.mode ? prescription.mode :'' }}
+                      >
+                        <span v-if="!prescription.mode_id">/</span>
+                        <span v-if="prescription.mode_id == 1">HD</span>
+                        <span v-if="prescription.mode_id == 2">HDF</span>
+                        <span v-if="prescription.mode_id == 3">HD+HP</span>
+                        <span v-if="prescription.mode_id == 4">HP</span>
+                        <span v-if="prescription.mode_id == 5">HF</span>
+                        <span v-if="prescription.mode_id == 6">SCUF</span>
+                        <span v-if="prescription.mode_id == 7">IUF</span>
+                        <span v-if="prescription.mode_id == 8">HFHD</span>
+                        <span v-if="prescription.mode_id == 9">HFHD+HP</span>
+                        <span v-if="prescription.mode_id == 10">PHF</span>
+                        <span v-if="prescription.mode_id == 11">HFR</span>
+                        <span v-if="prescription.mode_id == 12">HDF+HP</span>
+                        <span v-if="prescription.mode_id == 13">CRRT</span>
+                        <span v-if="prescription.mode_id == 14">腹水回输</span>
+                        <span v-if="prescription.mode_id == 15">HD前置换</span>
+                        <span v-if="prescription.mode_id == 16">HD后置换</span>
+                        <span v-if="prescription.mode_id == 17">HDF前置换</span>
+                        <span v-if="prescription.mode_id == 18">HDF后置换</span>
+                        <span v-if="prescription.mode_id == 19">IUF+HD</span>
+                        <span v-if="prescription.mode_id == 22">血浆胆红素吸附+HDF</span>
+                        <span v-if="prescription.mode_id == 23">血浆胆红素吸附</span>
+                        <span v-if="prescription.mode_id == 24">I-HDF</span>
+                        <span v-if="prescription.mode_id == 25">HD高通</span>
+                        <span v-if="prescription.mode_id == 29">PE</span>
+                        <span v-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="prescription.mode_id ==2 || prescription.mode_id == 12">
+                    <div class="inline_block" style="flex: 1">
                       置换方式：
                       <div class="under_line" style="width: 80px; text-align: center">
                         {{
@@ -551,7 +587,7 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="prescription.mode_id ==2 || prescription.mode_id == 12">
+                    <div class="inline_block" style="flex: 1">
                       置换总量：
                       <div class="under_line" style="width: 70px; text-align: center">
                         <span > {{
@@ -573,6 +609,16 @@
                         {{ predialysis.blood_access_part_opera_name }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex: 1">
+                      血流量：
+                      <div class="under_line" style="width: 50px; text-align: center">
+                        {{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}
+                      </div>ml/min
+                    </div>
+
+                  </div>
+
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block" style="flex: 2">
                       人工肾装置：
                       <div class="under_line" style="width: 50%; text-align: center">
@@ -582,11 +628,23 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1">
-                      血流量：
+                     <div class="inline_block" style="flex: 1">
+                      膜面积：
                       <div class="under_line" style="width: 50px; text-align: center">
-                        {{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}
-                      </div>ml/min
+
+                      </div>㎡
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      膜材质：
+                      <div class="under_line" style="width: 80px; text-align: center">
+
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      透析机型：
+                      <div class="under_line" style="width: 80px; text-align: center">
+                        {{ predialysis.machine_type ? predialysis.machine_type : '' }}
+                      </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
                       机号：
@@ -594,6 +652,7 @@
                         {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                         ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                       </div>
+
                     </div>
                   </div>
 
@@ -610,14 +669,13 @@
                             : "/"
                         }}
                         </span>
-                        
+
                       </div>
                     </div>
                     <div
                       class="inline_block"
                       style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5 && 
-                      prescription.anticoagulant !=1 && prescription.anticoagulant !=''"
+                      v-if="prescription.anticoagulant != 5"
                     >
                       首剂：
                       <div
@@ -643,12 +701,12 @@
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
 
-                  
+
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
                       <div
-                        v-if="prescription.anticoagulant != 1 && prescription.anticoagulant !=''"
+                        v-if="prescription.anticoagulant == 1"
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
@@ -658,8 +716,8 @@
                             : "/"
                         }}
                       </div>
-                      <!-- <div
-                        v-if="prescription.anticoagulant != 1 && prescription.anticoagulant !=''"
+                      <div
+                        v-if="prescription.anticoagulant != 1"
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
@@ -668,7 +726,7 @@
                             ? prescription.anticoagulant_weichi
                             : "0"
                         }}
-                      </div> -->
+                      </div>
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -684,8 +742,10 @@
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
 
                     </div>
-                    <div class="inline_block" style="margin-left: 20px"
-                      v-if="prescription.anticoagulant == 5 "
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant == 5"
                     >
                       钙名称：
                       <div
@@ -699,7 +759,9 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="margin-left: 20px"
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
                       v-if="prescription.anticoagulant == 5"
                     >
                       钙剂量：
@@ -715,9 +777,10 @@
                       </div>
                       ml
                     </div>
-                    <div class="inline_block" style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5 && 
-                      prescription.anticoagulant != 1 && prescription.anticoagulant !=''"
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant != 5"
                     >
                       总量：
                       <div
@@ -742,14 +805,9 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                   
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      透析机型：
-                      <div class="under_line" style="width: 80px; text-align: center">
-                        {{ predialysis.machine_type ? predialysis.machine_type : '' }}
-                      </div>
+
                     </div>
+
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
@@ -879,7 +937,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                       
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.advice_doctor>0">
                               <span
@@ -921,7 +979,7 @@
                           <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                         </td>
                       </tr>
-                  
+
                     </tbody>
                   </table>
                 </td>
@@ -988,12 +1046,12 @@
                           {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0'  }}
                         </td>
                         <td>
-                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} / 
+                          {{ monitor.replacement_rate ? monitor.replacement_rate : '0' }} /
                           {{ monitor.displacement_quantity ? monitor.displacement_quantity : '0'  }}
                         </td>
                         <!-- 钠浓度(mmol/L)/温度°C -->
                         <td>
-                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
+                          {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} /
                           {{ monitor.temperature ? monitor.temperature : '0' }}
                         </td>
 
@@ -1018,7 +1076,7 @@
                                 "
                                 >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
-                              
+
                                 {{ monitor.dispose }} {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
@@ -1244,9 +1302,9 @@
 
                     <div class="inline_block" style="flex: 2">
                       透后宣教：
-                      <div class="under_line" style="width: 80%; text-align: center;white-space: normal;">
+                      <div class="under_line" style="width: 70%; text-align: center">
                         {{ summary.mission ? summary.mission : '/' }}
-                      </div>                     
+                      </div>
                     </div>
                   </div>
 
@@ -1576,7 +1634,7 @@
         </div>
       </div>
     </div>
-     
+
   </div>
 </template>
 
@@ -1728,11 +1786,61 @@ export default {
       },
       org_id: 0,
       projectsOne: [],
-      checkDate:[{value:'this.predialysis.temperature',label:'透前体温未填'},
-                  {value:'this.predialysis.pulse_frequency',label:'透前脉搏未填'}],
     };
   },
   methods: {
+    toUpload() {
+
+         let dom = document.getElementById("dialysis-print-box-1")
+         //调用方法下载
+         html2canvas(dom, {
+           useCORS: true, //允许跨域
+           allowTaint: false,
+           logging: false,
+           letterRendering: true,
+           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+           scale: 4, //按比例增加分辨率
+           background: '#fff',//pdf背景色为白色，默认是黑色的
+         }).then((canvas) => {
+           //返回图片dataURL，参数：图片格式和清晰度(0-1)
+           var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+           //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+           var pdf = new jsPDF('', 'pt', 'a4');
+
+           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+           //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+           pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+
+           console.log("pdf222222222222222222",pdf)
+
+           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+           // console.log("base63",newBase64Data)
+           const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+           console.log("blobwoowowowwo",blob)
+           this.openPdf(blob);
+
+           // var data = {
+           //   name:newBase64Data,
+           // }
+           // UploadPrintOrder(data).then(response=>{
+           //   if(response.data.state == 1){
+           //     var sign =  response.data.data.sign
+           //     console.log("SIGNWWOOWWO")
+           //     var pdfBase64 = response.data.data.pdfBase64
+           //     console.log("pdfBase64",pdfBase64)
+           //     this.$message.success("保存成功!")
+           //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+           //     this.openPdf(blob);
+           //   }
+           // })
+
+           // this.viewPdf(newBase64Data)
+           //保存到pdf，名字是stone
+           // pdf.save('stone.pdf');
+
+         });
+       },
 
      viewPdf(content) {
        console.log("content",content);
@@ -1819,279 +1927,219 @@ export default {
     },
 
     checkData() {
-      var checkDate =[]
       if (this.predialysis.temperature == '') {
-        const obj = "透前体温"
-        checkDate.push(obj)
-      } if (this.predialysis.pulse_frequency == "") {
-        const obj1 = "透前脉搏"
-        checkDate.push(obj1)
-      } if (this.predialysis.breathing_rate == "") {
-         const obj2 = "透前呼吸频率"
-         checkDate.push(obj2)
-      } if (
+        this.$message.error("透前体温未填");
+      } else if (this.predialysis.pulse_frequency == "") {
+        this.$message.error("透前脉搏未填");
+      } else if (this.predialysis.breathing_rate == "") {
+        this.$message.error("透前呼吸频率未填");
+      } else if (
         this.predialysis.systolic_blood_pressure == 0 ||
         this.predialysis.diastolic_blood_pressure == 0
       ) {
-        const obj3 = "透前血压"
-        checkDate.push(obj3)
-      } if (this.predialysis.symptom_before_dialysis == "") {
-        const obj5 = "透前症状"
-        checkDate.push(obj5)
-      } if (this.predialysis.internal_fistula == "" || this.predialysis.catheter == "") {
-        const obj6 = "透前内瘘,导管"
-        checkDate.push(obj6)
-      } if (this.predialysis.complication == "" ) {
-        const obj7 = "合并症"
-        checkDate.push(obj7)
-      } if (this.predialysis.dry_weight == '' ) {
-        const obj8 = "干体重"
-        checkDate.push(obj8)
-      } if ( this. predialysis.weight_before == '') {
-        const obj9 = "透前体重"
-        checkDate.push(obj9)
-      } if (this.afterdialysis.temperature == '') {
-        const obj10 = "透后体温"
-        checkDate.push(obj10)
-      } if (this.afterdialysis.pulse_frequency == "") {
-        const obj11 = "透后脉搏"
-        checkDate.push(obj11)
-      } if (this.afterdialysis.breathing_rate == "") {
-        const obj12 = "透后呼吸频率"
-        checkDate.push(obj12)
-      } if (
+        this.$message.error("透前血压未填完整");
+      }
+      // else if (this.predialysis.dialysis_interphase == "") {
+      //   this.$message.error("透析期间未填");
+      // }
+      else if (this.predialysis.symptom_before_dialysis == "") {
+        this.$message.error("透前症状未填");
+      } else if (this.predialysis.internal_fistula == "") {
+        this.$message.error("透前内瘘未填");
+      } else if (this.predialysis.catheter == "") {
+        this.$message.error("透前导管未填");
+      } else if (this.predialysis.complication == "" ) {
+        this.$message.error("合并症未填");
+      } else if (this.receiverTreatmentAccess.score == "") {
+        this.$message.error("跌倒评估未填");
+      } else if (this.predialysis.dry_weight == '' ) {
+        this.$message.error("干体重未填");
+      } else if ( this. predialysis.weight_before == '') {
+        this.$message.error("透前体重未填");
+      } else if (this.predialysis.dehydration == '') {
+        this.$message.error("预增脱水量未填");
+      } else if (this.afterdialysis.temperature == '') {
+        this.$message.error("透后体温未填");
+      } else if (this.afterdialysis.pulse_frequency == "") {
+        this.$message.error("透后脉搏未填");
+      } else if (this.afterdialysis.breathing_rate == "") {
+        this.$message.error("透后呼吸频率未填");
+      } else if (
         this.afterdialysis.systolic_blood_pressure == 0 ||
         this.afterdialysis.diastolic_blood_pressure == 0
       ) {
-        const obj13 = "透后血压"
-        checkDate.push(obj13)
-      } if (this.afterdialysis.cruor == "") {
-        const obj14 = "凝血"
-        checkDate.push(obj14)
-      } if (this.afterdialysis.symptom_after_dialysis == "") {
-        const obj15 = "透后症状"
-        checkDate.push(obj15)
-      } if (this.afterdialysis.internal_fistula == "" || this.afterdialysis.catheter == "") {
-        const obj16 = "透后内瘘,导管"
-        checkDate.push(obj16)
-      }  if (this.afterdialysis.complication == 0) {
-        const obj17 = "并发症"
-        checkDate.push(obj17)
-      } if (this.afterdialysis.actual_displacement == 0 && 
-        (this.prescription.mode_id ==2 || this.prescription.mode_id ==12)) {
-        const obj18 = "实际置换量"
-        checkDate.push(obj18)
-      } if (this.afterdialysis.actual_ultrafiltration == 0) {
-        const obj19 = "实际超滤量"
-        checkDate.push(obj19)
-      } if (this.afterdialysis.weight_after == 0) {
-        const obj20 = "透后体重"
-        checkDate.push(obj20)
-      } if (this.afterdialysis.weight_loss == 0) {
-        const obj21 = "体重减少"
-        checkDate.push(obj21)
-      } if (this.prescription.target_ultrafiltration == 0) {
-        const obj22 = "处方脱水量"
-        checkDate.push(obj22)
-      } if (this.afterdialysis.actual_ultrafiltration == 0) {
-        const obj23 = "超滤总量"
-        checkDate.push(obj23)
-      } if (this.prescription.dialysis_duration_hour == 0) {
-        const obj24 = "透析时长"
-        checkDate.push(obj24)
-      } if (this.prescription.mode == '') {
-        const obj25 = "透析方式"
-        checkDate.push(obj25)
-      } if (this.prescription.displace_liqui_part == '' && 
-      (this.prescription.mode_id ==2 ||this.prescription.mode_id ==12)) {
-        const obj26 = "置换方式"
-        checkDate.push(obj26)
-      } if (this.prescription.displace_liqui_value == 0 && 
-      (this.prescription.mode_id ==2 ||this.prescription.mode_id ==12)) {
-        const obj27 = "置换总量"
-        checkDate.push(obj27)
-      } if (this.predialysis.blood_access_part_opera_name == ''){
-        const obj28 = "血管通路"
-        checkDate.push(obj28)
-      } if (this.prescription.blood_flow_volume == 0) {
-        const obj29 = "血流量"
-        checkDate.push(obj29)
-      } if (
+        this.$message.error("透后血压未填完整");
+      } else if (this.afterdialysis.cruor == "") {
+        this.$message.error("凝血未填");
+      } else if (this.afterdialysis.symptom_after_dialysis == "") {
+        this.$message.error("透后症状未填");
+      } else if (this.afterdialysis.internal_fistula == "") {
+        this.$message.error("透后内瘘未填");
+      } else if (this.afterdialysis.catheter == "") {
+        this.$message.error("透后导管未填");
+      } else if (this.afterdialysis.complication == 0) {
+        this.$message.error("并发症未填");
+      } else if (this.afterdialysis.actual_displacement == 0) {
+        this.$message.error("实际置换量未填");
+      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
+        this.$message.error("实际超滤量未填");
+      } else if (this.afterdialysis.weight_after == 0) {
+        this.$message.error("透后体重未填");
+      } else if (this.afterdialysis.weight_loss == 0) {
+        this.$message.error("体重减少未填");
+      } else if (this.afterdialysis.dialysis_intakes == 0) {
+        this.$message.error("透析中入量未填");
+      } else if (this.prescription.target_ultrafiltration == 0) {
+        this.$message.error("处方脱水量未填");
+      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
+        this.$message.error("超滤总量未填");
+      } else if (this.prescription.dialysis_duration_hour == 0) {
+        this.$message.error("透析时长未填");
+      } else if (this.prescription.mode_id == 0) {
+        this.$message.error("透析方式未填");
+      } else if (this.prescription.displace_liqui_part == '') {
+        this.$message.error("置换方式未填");
+      } else if (this.prescription.displace_liqui_value == 0) {
+        this.$message.error("置换总量未填");
+      } else if (this.predialysis.blood_access_part_opera_name == ''){
+        this.$message.error('血管通路未填');
+      } else if (this.prescription.blood_flow_volume == 0) {
+        this.$message.error("血流量未填");
+      } else if (
         this.prescription.dialysis_irrigation == '' &&
         this.prescription.dialysis_dialyszers == ''
       ){
-        const obj30 = "人工肾装置"
-        checkDate.push(obj30)
-      } if (this.predialysis.machine_type == 0) {
-        const obj31 = "透析机型"
-        checkDate.push(obj31)
-      } if (this.dialysisOrder.DeviceNumber.number == 0) {
-        const obj32 = "机号"
-        checkDate.push(obj32)
-      } if (this.prescription.anticoagulant_name == 0) {
-        const obj33 = "抗凝剂"
-        checkDate.push(obj33)
-      } if (this.prescription.anticoagulant_shouji == 0 && 
-        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
-      ) {
-        const obj34 = "首剂"
-        checkDate.push(obj34)
-      } if (this.prescription.anticoagulant_weichi == 0 &&
-        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !=''
-      ) {
-        const obj35 = "维持"
-        checkDate.push(obj35)
-      } if (this.prescription.anticoagulant_zongliang == 0 && 
-        this.prescription.anticoagulant !=1 && this.prescription.anticoagulant !='' && prescription.anticoagulant != 5
-      ) {
-        const obj36 = "总量"
-        checkDate.push(obj36)
-      } if (this.prescription.calcium == 0) {
-        const obj37 = "钙"
-        checkDate.push(obj37)
-      } if (this.prescription.sodium == 0) {
-        const obj38 = "钠"
-        checkDate.push(obj38)
-      } if (this.prescription.kalium == 0) {
-        const obj39 = "钾"
-        checkDate.push(obj39)
-      } if (this.prescription.bicarbonate == 0) {
-        const obj40 = "碳酸氢根"
-        checkDate.push(obj40)
-      } if (this.prescription.dialysate_flow == 0) {
-        const obj41 = "透析液流量"
-        checkDate.push(obj41)
-      } if (
+        this.$message.error('人工肾装置未填');
+      } else if (this.predialysis.machine_type == 0) {
+        this.$message.error("透析机型未填");
+      } else if (this.dialysisOrder.DeviceNumber.number == 0) {
+        this.$message.error("机号未填");
+      } else if (this.prescription.anticoagulant_name == 0) {
+        this.$message.error("抗凝剂未填");
+      } else if (this.prescription.anticoagulant_shouji == 0) {
+        this.$message.error("首剂未填");
+      } else if (this.prescription.anticoagulant_weichi == 0) {
+        this.$message.error("维持未填");
+      } else if (this.prescription.anticoagulant_zongliang == 0) {
+        this.$message.error("总量未填");
+      } else if (this.prescription.calcium == 0) {
+        this.$message.error("钙未填");
+      } else if (this.prescription.sodium == 0) {
+        this.$message.error("钠未填");
+      } else if (this.prescription.kalium == 0) {
+        this.$message.error("钾未填");
+      } else if (this.prescription.bicarbonate == 0) {
+        this.$message.error("碳酸氢根未填");
+      } else if (this.prescription.dialysate_flow == 0) {
+        this.$message.error("透析液流量未填");
+      } else if (
         this.prescription.anticoagulant_gaimingcheng == "" &&
         this.prescription.anticoagulant == 5
       ) {
-        const obj42 = "钙名称"
-        checkDate.push(obj42)
-      } if (
+        this.$message.error("钙名称未填");
+      } else if (
         this.prescription.anticoagulant_gaijiliang == "" &&
         this.prescription.anticoagulant == 5
       ) {
-        const obj43 = "钙剂量"
-        checkDate.push(obj43)
-      } if (
+        this.$message.error("钙剂量未填");
+      } else if (
         this.afterdialysis.actual_treatment_hour == 0 &&
         this.afterdialysis.actual_treatment_minute == 0
       ) {
-        const obj44 = "实际治疗时间"
-        checkDate.push(obj44)
-      } if (this.summary.mission == 0) {
-        const obj45 = "透后宣教"
-        checkDate.push(obj45)
-      } if (this.summary.dialysis_summary == "") {
-        const obj46 = "透析小结"
-        checkDate.push(obj46)
-      } if (
+        this.$message.error("实际治疗时间未填");
+      } else if (this.summary.mission == 0) {
+        this.$message.error("透后宣教未填");
+      } else if (this.summary.dialysis_summary == "") {
+        this.$message.error("透析小结未填");
+      } else if (
         this.dialysisOrder == null ||
         this.dialysisOrder.puncture_nurse == 0
       ) {
-        const obj47 = "穿刺护士"
-        checkDate.push(obj47)
-      } if (
+        this.$message.error("穿刺护士未填");
+      } else if (
         this.dialysisOrder == null ||
         this.dialysisOrder.start_nurse == 0
       ) {
-        const obj48 = "治疗护士"
-        checkDate.push(obj48)
-      } if (this.dialysisOrder == null && this.check.creater == 0) {
-        const obj49 = "核对人员"
-        checkDate.push(obj49)
+        this.$message.error("治疗护士未填");
+      } else if (this.dialysisOrder == null && this.check.creater == 0) {
+        this.$message.error("核对人员未填");
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse == this.check.modifier &&
         this.check.creater == 0
       ) {
-        const obj49 = "核对人员"
-        checkDate.push(obj49)
+        this.$message.error("核对人员未填");
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse == this.check.creater &&
         this.check.modifier == 0
       ) {
-        const obj49 = "核对人员"
-        checkDate.push(obj49)
+        this.$message.error("核对人员未填");
       } else if (
         this.dialysisOrder != null &&
         this.dialysisOrder.start_nurse != this.check.creater &&
         this.dialysisOrder.start_nurse != this.check.modifier &&
         this.check.creater == 0
       ) {
-        const obj49 = "核对人员"
-        checkDate.push(obj49)
-      } if (
+        this.$message.error("核对人员未填");
+      } else if (
         this.dialysisOrder == null ||
         this.dialysisOrder.finish_nurse == 0
       ) {
-        const obj50 = "下机护士"
-        checkDate.push(obj50)
-      } if (this.prescription.creater == 0) {
-        const obj51 = "治疗医生"
-        checkDate.push(obj51)
-      } 
-      if(this.tableAdvice.length > 0){
-        this.tableAdvice.map((item) =>{
-          if(item.id > 0 && (item.created_time || item.start_time)){
-            if(item.execution_staff ==0 || item.checker ==0){
-              const obj52 = '执行人员,核对人员'
-              checkDate.push(obj52)
-            }
+        this.$message.error("下机护士未填");
+      } else if (this.prescription.creater == 0) {
+        this.$message.error("治疗医生未填");
+      } else if (this.tableAdvice.length > 0) {
+        let num = 0;
+        this.tableAdvice.map((item) => {
+          if (item.id > 0 && (item.created_time || item.start_time)) {
+            this.users.map((it) => {
+              if (it.id == item.advice_doctor) {
+                if (it.user_type == 3) {
+                  num++;
+                  this.$message.closeAll();
+                  this.$message.error("存在不是医生保存的医嘱");
+                } else if (
+                  it.id == item.execution_staff &&
+                  item.execution_staff > 0
+                ) {
+                  if (it.user_type == 2) {
+                    num++;
+                    this.$message.closeAll();
+                    this.$message.error("存在不是护士执行的医嘱");
+                  }
+                } else if (it.id == item.checker && item.checker > 0) {
+                  if (it.user_type == 2) {
+                    num++;
+                    this.$message.closeAll();
+                    this.$message.error("存在不是护士核对的医嘱");
+                  }
+                }
+              } else if (
+                it.id == item.execution_staff &&
+                item.execution_staff > 0
+              ) {
+                if (it.user_type == 2) {
+                  num++;
+                  this.$message.closeAll();
+                  this.$message.error("存在不是护士执行的医嘱");
+                }
+              } else if (it.id == item.checker && item.checker > 0) {
+                if (it.user_type == 2) {
+                  num++;
+                  this.$message.closeAll();
+                  this.$message.error("存在不是护士核对的医嘱");
+                }
+              }
+            });
           }
-        })
+        });
+        if (num == 0) {
+          this.$message.success("核对完成");
+        }
+      } else {
+        this.$message.success("核对完成");
       }
-      // if (this.tableAdvice.length > 0) {
-      //   let num = 0;
-      //   this.tableAdvice.map((item) => {
-      //     if (item.id > 0 && (item.created_time || item.start_time)) {
-      //       this.users.map((it) => {
-      //         if (it.id == item.advice_doctor) {
-      //           if (it.user_type == 3) {
-      //             num++;
-      //             this.$message.closeAll();
-      //             this.$message.error("存在不是医生保存的医嘱");
-      //           } else if (
-      //             it.id == item.execution_staff &&
-      //             item.execution_staff > 0
-      //           ) {
-      //             if (it.user_type == 2) {
-      //               num++;
-      //               this.$message.closeAll();
-      //               this.$message.error("存在不是护士执行的医嘱");
-      //             }
-      //           } else if (it.id == item.checker && item.checker > 0) {
-      //             if (it.user_type == 2) {
-      //               num++;
-      //               this.$message.closeAll();
-      //               this.$message.error("存在不是护士核对的医嘱");
-      //             }
-      //           }
-      //         } else if (
-      //           it.id == item.execution_staff &&
-      //           item.execution_staff > 0
-      //         ) {
-      //           if (it.user_type == 2) {
-      //             num++;
-      //             this.$message.closeAll();
-      //             this.$message.error("存在不是护士执行的医嘱");
-      //           }
-      //         } else if (it.id == item.checker && item.checker > 0) {
-      //           if (it.user_type == 2) {
-      //             num++;
-      //             this.$message.closeAll();
-      //             this.$message.error("存在不是护士核对的医嘱");
-      //           }
-      //         }
-      //       });
-      //     }
-      //   });
-      //   if (num == 0) {
-      //     this.$message.success("核对完成");
-      //   }
-      // }
-      this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
@@ -2337,7 +2385,7 @@ export default {
           this.afterdialysis.complications_other.join(",");
 
         this.prescription = response.data.data.dialysisPrescription;
-        console.log("透析处方", this.prescription);
+        // console.log("透析处方", this.prescription);
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);
@@ -2805,14 +2853,7 @@ export default {
         return "0.0";
       }
     },
-    getcheckData(val){
-      if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$message.error(a +" 未填");
-        return a
-      }
-    }
+
   },
   watch: {
     "patientInfo.gender": function () {
@@ -2839,6 +2880,10 @@ export default {
         this.patientInfo_source_1 = false;
       }
     },
+    // "props.childResponse": function () {
+    //   console.log('sdfasdfada',this.props.childResponse);
+    // }
+
   },
   created() {
     console.log('dddddd',this.$parent.childResponse);

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -918,7 +918,7 @@
                         </span>
 
                         <span v-if="org_id ==10510 || org_id == 0">
-                          <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
+                          <span v-if="prescription!=null &&( prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12)">{{
                             afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
@@ -954,17 +954,19 @@
                        </span>
 
                         <span v-if="org_id ==10510 || org_id == 0">
-                          <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
+                          <span v-if="prescription!=null && (prescription.mode_id ==2 || prescription.mode_id ==5 || prescription.mode_id==12)">{{
                             afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
                            }}
                           </span>
-                          <span v-else>/</span>
+                          <span v-else>
+                            
+                          </span>
                         </span>
 
                        
-                        <span v-if="org_id!=10206 && org_id!=10510"> {{
+                        <span v-if="org_id!=10206 && org_id!=10510&&org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -2201,7 +2203,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206"
+                      v-if="org_id == 0 || org_id ==10206 || org_id == 10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2263,7 +2265,7 @@
                           }}</span>
                         </td>
 
-                        <td height="32px">
+                        <td height="32px" v-if="org_id!=0 && org_id!=10644">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>
@@ -5681,7 +5683,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
@@ -5706,7 +5708,7 @@ export default {
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489 && this.org_id!=10644){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){

src/xt_pages/org/orginfo.vue

@@ -441,16 +441,10 @@ import Neditor from '@/components/Neditor'
                     console.log("机构",this.orgtypesMap)
                     this.illnessOptions = res.data.illness?res.data.illness:[];
                     console.log("疾病类型",this.illnessOptions)
-                    this.fileList = [];
-                    var gallery =  res.data.orginfo.org_gallery
-                    console.log("haaaaaaaaaaaaaaaaaa",gallery)
-                    for (const index in gallery) {
-                        var image = {id:gallery[index].id, name:gallery[index].id, url:gallery[index].type==1?gallery[index].url:gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
-                        this.fileList.push(image);
-                    }
-                    console.log("fileList-------------",fileList)
-
-                    var illness = res.data.orginfo.illness.split(',');
+                    var illnessList = "21,22,23,24,25,26,27,28,29,30,31,32"
+                    // var illness = res.data.orginfo.illness.split(',');
+                    var illness = illnessList.split(',')
+                    console.log("illness--------------------",illness)
                     for (const index in illness) {
                         var iid = parseInt(illness[index]);
                         if (isNaN(iid) || iid<=0) {
@@ -458,8 +452,12 @@ import Neditor from '@/components/Neditor'
                         }
                         this.form.illness_list.push(iid);
                     }
+                    console.log("this.form.illness_list---------------------",this.form.illness_list)
                     var business_week = this.form.business_week;
                     var business_week_tem = business_week.split(" — ");
+
+                    console.log("business_week",business_week)
+                    console.log("business_week_tem",business_week_tem)
                     if(business_week_tem.length==2) {
                         var fromIndex = this.weekOptions.indexOf(business_week_tem[0]);
                         var toIndex = this.weekOptions.indexOf(business_week_tem[1]);
@@ -495,6 +493,15 @@ import Neditor from '@/components/Neditor'
                     this.provinces = res.data.provinces;
                     this.citys = res.data.citys?res.data.citys:[];
                     this.districts = res.data.districts?res.data.districts:[];
+                    this.fileList = [];
+                    var gallery =  res.data.orginfo.org_gallery
+                    console.log("haaaaaaaaaaaaaaaaaa",gallery)
+                    for (const index in gallery) {
+                        var image = {id:gallery[index].id, name:gallery[index].id, url:gallery[index].type==1?gallery[index].url:gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
+                        this.fileList.push(image);
+                    }
+                    console.log("fileList-------------",fileList)
+                   
 
                    
                 } else {

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -119,7 +119,7 @@
 
                       </el-tab-pane>
 
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curPrescriptions"></charge-month-prescription-table>
 
                     </el-tabs>
@@ -232,23 +232,18 @@
                       <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
                       <!--<month-prescription-table ref="prescription_tables"-->
                       <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curMonthPrescriptions"></charge-month-prescription-table>
 
-                      <settle-prescription-table v-if="this.radio == 2"
+                      <settle-prescription-table v-loading="loading_two"  v-if="this.radio == 2"
                                                  :prescription="curMonthPrescriptions"></settle-prescription-table>
-
                     </el-tabs>
-
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
                     <span>处方总价：<span style="color:red;">{{ all_month_total }}元</span></span>
-
-
                   </div>
                 </div>
-
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -306,6 +301,7 @@ export default {
       dialogVisible:false,
       charge_type:1,
       isloading: false,
+      loading_two:false,
       isdisabled: false,
       register: [
         { value: 1, label: '门诊' },
@@ -822,7 +818,7 @@ export default {
           .catch(function(error) {
           })
       }
-    }, 
+    },
 
     changePatientInfo() {
       let params = {
@@ -894,6 +890,7 @@ export default {
       }
       getZuoBiaoPatientList(params).then(response => {
         if (response.data.state == 0) {
+
           this.$message.error(response.data.msg)
           return false
         } else {
@@ -1281,18 +1278,23 @@ export default {
         'is_upload': this.radio
       }
       this.loading = true
+      this.loading_two = true
       getZuoBiaoPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.loading = false
+          this.loading_two = false
+
           this.$message.error(response.data.msg)
           return false
         } else {
+          this.loading_two = false
+
+          this.loading = false
 
           this.prescriptions = []
           this.month_prescriptions = []
           this.curPrescriptions = {}
           this.curMonthPrescriptions = {}
-          this.loading = false
           this.hisPatientInfo = response.data.data.patient
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -334,7 +334,9 @@
       },getfapiaonumber(){
         getfapiaonumber().then((res) => {
           if (res.data.state == 1) {
-            this.form.fapiao_number = res.data.data.fapiao_number;
+            if(this.$store.getters.xt_user.org.id != 10644) {
+              this.form.fapiao_number = res.data.data.fapiao_number;
+            }
           }
         })
       },

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -689,122 +689,6 @@
           'certificates':this.form.certificates,
         }
 
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)) {
-          try {
-            //检测当前浏览器是否支持websocket模式
-            window.WebSocket = window.WebSocket || window.MozWebSocket;
-            if (!window.WebSocket){
-              alert("WebSocket not supported by this browser");
-              return;
-            }
-            this.ws = new WebSocket("ws://127.0.0.1:8899");//连接服务器
-            var that = this
-            this.ws.onopen = function(event){
-              if (that.$store.getters.xt_user.org_id == 10387){
-                that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 10318){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 4){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01101\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }
-            };
-
-            this.ws.onmessage = function(event){
-              // alert("接收到服务器发送的数据：\r\n"+event.data);
-              var newParams =  JSON.parse(event.data)
-              console.log(newParams)
-              console.log(newParams.data)
-              console.log(newParams.data)
-              console.log(newParams.data.ecToken)
-              console.log(newParams.data.idNo)
-              console.log(newParams.data.userName)
-              console.log(newParams.data.insuOrg)
-
-              newParams['ecToken'] = newParams.data.ecToken
-              newParams['idNo'] = newParams.data.idNo
-              newParams['userName'] = newParams.data.userName
-              newParams['insuOrg'] = newParams.data.insuOrg
-
-              newParams['id_card_type'] =  that.form.id_card_type
-              newParams['admin_user_id'] = that.$store.getters.xt_user.user.id
-              newParams['certificates'] = that.form.certificates
-              axios.get('http://127.0.0.1:9532/api/readcard', {
-                params: newParams
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-
-                    if (response.data.data.failed_code == -10) {
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    } else {
-
-                      var patient = response.data.data.patient
-
-                      if (that.form.id_card_type == 1) {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.medical_insurance_card = response.data.data.number
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-
-
-                      } else if (that.form.id_card_type == 2) {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-                      } else {
-                        that.form.id = patient.id
-                        that.form.name = patient.name
-                        that.form.gender = patient.gender
-                        that.form.age = patient.age
-                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                        that.form.phone = patient.phone
-                        that.form.id_card = patient.id_card_no
-                        that.form.social_type = parseInt(response.data.data.insutype)
-
-                      }
-                      that.$message({ message: '读卡成功', type: 'success' })
-                    }
-                  }
-                })
-                .catch(function(error) {
-
-                })
-
-
-            };
-            this.ws.onclose = function(event){
-              // alert("已经与服务器断开连接\r\n当前连接状态："+this.readyState);
-            };
-            this.ws.onerror = function(event){
-              // if (this.flag!=1)
-              // alert("WebSocket接收异常！");
-            };
-          } catch (ex) {
-            alert(ex.message);
-          }
-
-        }else{
           axios.get('http://127.0.0.1:9532/api/readcard', {
             params: params
           })
@@ -869,8 +753,7 @@
             .catch(function(error) {
 
             })
-        }
-      },
+        },
       // reading() {
       //   var that = this
       //   if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
@@ -1045,6 +928,7 @@
       }
     }
 
+
   }
 </script>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3850,80 +3850,7 @@ export default {
           "admin_user_id":this.$store.getters.xt_user.user.id,
           'his_patient_id': this.hisPatientInfo.id,
         }
-        if ((this.$store.getters.xt_user.org_id == 10387)){
-          try {
-            //检测当前浏览器是否支持websocket模式
-            window.WebSocket = window.WebSocket || window.MozWebSocket;
-            if (!window.WebSocket){
-              alert("WebSocket not supported by this browser");
-              return;
-            }
-            this.ws = new WebSocket("ws://127.0.0.1:8899");//连接服务器
-            var that = this
-            this.ws.onopen = function(event){
-              if (that.$store.getters.xt_user.org_id == 10387){
-                that.ws.send("{\"url\":\"https://dvs.hun.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
-              }
-                // else if(that.$store.getters.xt_user.org_id == 10318){
-                //   that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              // }
-              else if(that.$store.getters.xt_user.org_id == 4){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }
-            };
-
-            this.ws.onmessage = function(event){
-              // alert("接收到服务器发送的数据：\r\n"+event.data);
-              var newParams =  JSON.parse(event.data)
-              newParams['ecToken'] = newParams.data.ecToken
-              newParams['idNo'] = newParams.data.idNo
-              newParams['userName'] = newParams.data.userName
-              newParams['insuOrg'] = newParams.data.insuOrg
-              newParams['id_card_type'] =  that.form.id_card_type
-              newParams['admin_user_id'] = that.$store.getters.xt_user.user.id
-              newParams['certificates'] = that.form.certificates
-              axios.get('http://127.0.0.1:9532/api/readele', {
-                params: newParams
-              })
-                .then(function(response) {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-                    if (response.data.data.failed_code == -10) {
-                      // that.$message.error(response.data.data.msg)
-                      that.$confirm(response.data.data.msg, '医保错误信息', {
-                        confirmButtonText: '确 定',
-                        type: 'warning'
-                      }).then(() => {
-
-                      }).catch(() => {
-                      })
-                    }else{
-                      that.$message({ message: response.data.data.msg, type: 'success', duration: 5000 })
-                    }
-                  }
-                })
-                .catch(function(error) {
-
-                })
-
-
-            };
-            this.ws.onclose = function(event){
-              alert("已经与服务器断开连接\r\n当前连接状态："+this.readyState);
-            };
-            this.ws.onerror = function(event){
-              if (this.flag!=1)
-                alert("WebSocket接收异常！");
-            };
-          } catch (ex) {
-            alert(ex.message);
-          }
-
-        }else{
-
-          axios.get('http://127.0.0.1:9532/api/readele', {
+        axios.get('http://127.0.0.1:9532/api/readele', {
             params: params
           })
             .then(function(response) {
@@ -3947,7 +3874,6 @@ export default {
             })
             .catch(function(error) {
             })
-        }
       }else if(index == 55){
         var that = this
         let params = {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -582,7 +582,7 @@ export default {
             caseHistory.confirm_failure_date
           );
           this.drug_allergy_history = caseHistory.drug_allergy_history;
-          this.physical_examination = caseHistory.physical_examination;
+          this.physical_examination = caseHistory.physical_examination
           this.special_inspection = caseHistory.special_inspection;
           this.lab_apparatus = caseHistory.lab_apparatus;
           this.form.id = historyInfo.id;
@@ -827,7 +827,7 @@ export default {
         this.primary_disease = this.LastCaseHistory.primary_disease
         this.confirm_failure_date = this.LastCaseHistory.confirm_failure_date
         this.drug_allergy_history = this.LastCaseHistory.drug_allergy_history
-        this.physical_examination = this.LastCaseHistory.physical_examination
+        this.physical_examination = this.LastCaseHistory.physical_examination?this.patientInfo.remark:""
         this.special_inspection = this.LastCaseHistory.special_inspection
         this.lab_apparatus = this.LastCaseHistory.lab_apparatus
         this.case_history.sick = this.LastCaseHistory.sick
@@ -848,7 +848,7 @@ export default {
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date
         this.drug_allergy_history = this.case_history.drug_allergy_history
-        this.physical_examination = this.case_history.physical_examination
+        this.physical_examination = this.case_history.physical_examination?this.patientInfo.remark:""
         this.special_inspection = this.case_history.special_inspection
         this.lab_apparatus = this.case_history.lab_apparatus
       }
@@ -882,19 +882,6 @@ export default {
     patientInfo: {
       handler(newval, oldval) {
 
-        this.primary_disease = this.patientInfo.primary_disease;
-        this.confirm_failure_date = this.patientInfo.confirm_failure_date;
-        this.drug_allergy_history = this.patientInfo.drug_allergy_history;
-        this.physical_examination = this.patientInfo.physical_examination;
-        this.special_inspection = this.patientInfo.special_inspection;
-        this.lab_apparatus = this.patientInfo.lab_apparatus;
-        console.log("WOWOWOWOOWOWOWWO",this.patientInfo)
-        console.log("透气那数据阿道夫阿道夫阿道夫低分安抚",this.LastCaseHistory)
-        console.log("befor------------------------",this.befor)
-        console.log("patient------------------------",this.patientInfo)
-        console.log("prescriptionInfo--------------------",this.prescriptionInfo)
-        console.log("this.diagnoses",this.diagnoses)
-        console.log("this.case_history",this.case_history)
         if(this.case_history!=null && this.case_history.id == 0){
           console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
           if(this.befor!=undefined){
@@ -919,19 +906,25 @@ export default {
           }   
         }
         if(this.patientInfo!=null){
+           console.log("owowowowowoo222222222222222",this.patientInfo)
            this.case_history.chief_conplaint = this.patientInfo.patient_complains
            this.case_history.history_of_present_illness = this.patientInfo.present_history
            this.case_history.past_history = this.patientInfo.past_history
            this.allergic_history = this.patientInfo.allergic_history
            this.case_history.diagnostic = this.patientInfo.diagnose
-         
+           this.physical_examination = this.patientInfo.remark
+           this.primary_disease = this.patientInfo.primary_disease;
+            this.confirm_failure_date = this.patientInfo.confirm_failure_date;
+            this.drug_allergy_history = this.patientInfo.drug_allergy_history;
+            this.special_inspection = this.patientInfo.special_inspection;
+            this.lab_apparatus = this.patientInfo.lab_apparatus;
            if(this.prescriptionInfo!=null){
                console.log("诊断---------------------",this.diagnoses)
               this.case_history.diagnose = this.getDiagnosis(this.prescriptionInfo.diagnosis) 
            }
          }
         }
-      
+        console.log("体格检查444444444444444444444",this.physical_examination)
       },
       deep: true,
     },
@@ -953,7 +946,11 @@ export default {
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date
         this.drug_allergy_history = this.case_history.drug_allergy_history
-        this.physical_examination = this.case_history.physical_examination
+        if(this.case_history.physical_examination!=''){
+          this.physical_examination = this.case_history.physical_examination
+        }
+      
+        console.log("体格检查555555555555555555",this.physical_examination)
         this.special_inspection = this.case_history.special_inspection
         this.lab_apparatus = this.case_history.lab_apparatus
         this.watchSign++;

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -62,7 +62,7 @@
       <!-- || org_id == 0-->
       </printThree>
       <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342"
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientTool/components/allgather.vue

@@ -0,0 +1,400 @@
+<template>
+  <div>
+    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+      <div>
+
+
+        <el-select size="small" v-model="item_time_type" placeholder="请选择"
+                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
+
+          <el-option
+            label="处方时间"
+            value="0">
+          </el-option>
+
+          <el-option
+            label="结算时间"
+            value="1">
+          </el-option>
+
+        </el-select>
+        <el-date-picker
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
+      <div>
+
+        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+      </div>
+    </div>
+    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="tables"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+              v-loading="gather_loading"
+              max-height="600"
+              :span-method="merge"
+              highlight-current-row>
+
+      <el-table-column align="center" prop="item_name" label="项目类别">
+        <template slot-scope="scope">{{ scope.row.item_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="price" label="费用">
+        <template slot-scope="scope">{{ scope.row.price.toFixed(2) }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="sum" label="费用总额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.sum.toFixed(2) }}</div>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+</template>
+
+
+<script>
+import { getDictionaryDataConfig } from '@/utils/data'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetSummaryDetail } from '@/api/his/his'
+// import NewStatementPrint from './newStatementPrint'
+const moment = require('moment')
+export default {
+  components: {
+    BreadCrumb
+
+  },
+  data() {
+    return {
+      gather_loading: false,
+      crumbs: [],
+      tempArr: [],
+      sameRowArr: [],
+      keywords: '',
+      pos: 0,
+      all_table_data: [],
+      costClassify: getDictionaryDataConfig('system', 'cost_classify'),
+      tableData: [],
+      chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
+      item_type: '0',
+      new_item_type: 0,
+      item_time_type: '1',
+      items: [
+        { id: 1, name: '药品' },
+        { id: 4, name: '检验费' },
+        { id: 5, name: '治疗费' },
+        { id: 6, name: '护理费' },
+        { id: 7, name: '其他' },
+        { id: 3, name: '耗材' }
+
+      ]
+
+    }
+  },
+  methods: {
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    unique(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+    },
+    changeDate() {
+      // console.log(this.chargeDate)
+      this.getSummaryDetailList()
+    }, changeTimeItem() {
+      this.getSummaryDetailList()
+    },
+    changeItem() {
+      this.new_item_type = this.item_type
+      if (this.item_type == 1) {
+        this.new_item_type = -100
+      } else if (this.item_type == 5) {
+        this.new_item_type = -200
+      }
+      this.getSummaryDetailList()
+    }, uniquepid(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
+    },
+    searchAction() {
+      this.item_type = '0'
+      this.getSummaryDetailList()
+    },
+    getSummaryDetailList() {
+      this.gather_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: 0,
+        keyword: this.keywords,
+        time_type: this.item_time_type
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.gather_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.gather_loading = false
+
+          let tempPatients = []
+          let tempPatientsTwo = []
+          this.tableData = []
+          this.all_table_data = []
+
+          let tempData = response.data
+          tempPatientsTwo = tempData
+
+          let infos = this.unique2(tempPatientsTwo)
+          let sum = 0
+          for (let e = 0; e < infos.length; e++) {
+            let obj = {
+              'sum': 0,
+              'price': 0,
+              'cost_classify': infos[e].cost_classify,
+              'item_name': this.getName(infos[e].cost_classify)
+            }
+            let price = 0
+            for (let d = 0; d < tempPatientsTwo.length; d++) {
+              if (tempPatientsTwo[d].cost_classify == infos[e].cost_classify) {
+                price = parseFloat(price.toString()) + parseFloat((parseFloat(tempPatientsTwo[d].cnt.toString()) * parseFloat(tempPatientsTwo[d].pric.toString()).toFixed(2)).toString())
+              }
+              obj.price = price
+            }
+            sum = sum + price
+
+            this.tableData.push(obj)
+          }
+          for(let i = 0; i < this.tableData.length;i++){
+            this.tableData[i].sum = sum
+          }
+
+          // for (let i = 0; i < tempPatientsThree.length; i++) {
+          //   let sum = 0
+          //   for (let b = 0; b < tempPatientsThree[i].length; b++) {
+          //     let obj = {
+          //       cost_classify: tempPatientsThree[i].items[b].cost_classify,
+          //       price: tempPatientsThree[i].items[b].price,
+          //       item_name: tempPatientsThree[i].items[b].item_name,
+          //       sum: 0
+          //     }
+          //     sum = sum + tempPatientsThree[i].items[b].price
+          //     this.tableData.push(obj)
+          //     this.all_table_data.push(obj)
+          //   }
+          //   for (let c = 0; c < this.tableData.length; c++) {
+          //     this.tableData[c].sum = sum
+          //   }
+          // }
+
+          console.log(this.tableData)
+
+          this.handleSpanTempArr()
+        }
+      })
+    }, getName(cost_classify) {
+      if (cost_classify == -1000) {
+        return '药品费'
+      } else if (cost_classify == -100) {
+        return '耗材费'
+      } else {
+        var costClassify = getDictionaryDataConfig('system', 'cost_classify')
+        var name = ''
+        for (let i = 0; i < costClassify.length; i++) {
+          if (cost_classify == costClassify[i].id) {
+            name = costClassify[i].name
+          }
+        }
+        return name
+      }
+    }, uniqueProjectAndAdvice(array) {
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].item_id === res[j].item_id && array[i].price === res[j].price) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, unique2(array) {
+
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].cost_classify === res[j].cost_classify) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, unique3(array) {
+      console.log('-----11122222')
+
+      console.log(array)
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].patient_id === res[j].patient_id) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    }, sort(arr) {
+      for (var i = 0; i < arr.length - 1; i++) {
+        for (var j = 0; j < arr.length - i - 1; j++) {
+          if (arr[j].patient_id > arr[j + 1].patient_id) {// 相邻元素两两对比
+            var hand = arr[j]
+            arr[j] = arr[j + 1]
+            arr[j + 1] = hand
+
+          }
+        }
+      }
+      return arr
+    }, handleSpanTempArr() {
+      this.tempArr = []
+
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tempArr.push(1)
+          this.pos = 0
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (this.tableData[i].patient_id === this.tableData[i - 1].patient_id) {
+            this.tempArr[this.pos] += 1
+            this.tempArr.push(0)
+          } else {
+            this.tempArr.push(1)
+            this.pos = i
+          }
+        }
+      }
+
+      let sameRowArr = [], sIdx = 0
+      this.tableData.forEach((item, index) => {
+        item.index = index
+        if (index === 0) {
+          sameRowArr.push([index])
+        } else {
+          if (item.patient_id === this.tableData[index - 1].patient_id) {
+            sameRowArr[sIdx].push(index)
+          } else {
+            sIdx = sIdx + 1
+            sameRowArr.push([index])
+          }
+        }
+      })
+      this.sameRowArr = sameRowArr
+    }, merge({ row, column, rowIndex, columnIndex }) {
+      if ( columnIndex === 2) {
+        const _row = this.tempArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    }, getTotal(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        console.log(data)
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'sum') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] = sums[index].toFixed(2)
+        } else {
+          sums[index] = ''
+        }
+      })
+
+      return sums
+    }, export_detail() {
+
+      let list = []
+      for (let i = 0; i < this.tableData.length; i++) {
+        let order = this.tableData[i]
+        let name = order.name
+        let item_name = order.item_name
+        let pay_sumamt = order.price.toFixed(2)
+        let total = order.sum.toFixed(2)
+
+        let obj = {
+          '患者姓名': name,
+          '项目类别': item_name,
+          '费用': pay_sumamt,
+          '费用总额': total
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['患者姓名', '项目名称', '费用', '费用总额']
+        const filterVal = ['患者姓名', '项目名称', '费用', '费用总额']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '汇总',
+          ref: this.$refs['tables'].$el
+        })
+      })
+
+    }, formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }
+  },
+  created() {
+    this.getSummaryDetailList()
+
+  }
+}
+</script>

src/xt_pages/outpatientTool/components/gather.vue

@@ -18,7 +18,7 @@
             value="0">
           </el-option>
           <el-option
-            v-for="item,index in items"
+            v-for="item,index in costClassify"
             :key="index"
             :label="item.name"
             :value="item.id">
@@ -97,6 +97,7 @@
 
 
 <script>
+import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetSummaryDetail } from '@/api/his/his'
 import { uParseTime } from '@/utils/tools'
@@ -115,19 +116,19 @@ export default {
       sameRowArr: [],
       keywords: '',
       pos:0,
-
+      all_table_data:[],
+       costClassify:getDictionaryDataConfig('system','cost_classify'),
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
+      new_item_type:0,
       item_time_type:'1',
       items: [
         { id: 1, name: '药品' },
-        { id: 2, name: '所有项目' },
         { id: 4, name: '检验费' },
         { id: 5, name: '治疗费' },
         { id: 6, name: '护理费' },
         { id: 7, name: '其他' },
-
         { id: 3, name: '耗材' },
 
       ]
@@ -162,6 +163,12 @@ export default {
       this.getSummaryDetailList()
     },
     changeItem() {
+      this.new_item_type = this.item_type
+      if(this.item_type == 1){
+        this.new_item_type = -100
+      }else if(this.item_type == 5){
+        this.new_item_type = -200
+      }
       this.getSummaryDetailList()
     }, uniquepid(arr) {
       const res = new Map()
@@ -178,7 +185,7 @@ export default {
       let params = {
         start_time: start_time,
         end_time: end_time,
-        type: this.item_type,
+        type: 0,
         keyword: this.keywords,
         time_type:this.item_time_type,
       }
@@ -194,6 +201,8 @@ export default {
           let tempPatients = []
           let tempPatientsTwo = []
           this.tableData = []
+          this.all_table_data = []
+
           let tempData = response.data
           let data = response.data
           let orders = this.uniquepid(tempData)
@@ -212,7 +221,6 @@ export default {
             }
             tempPatients.push(obj)
           }
-          console.log(tempPatients)
 
           for (let i = 0; i < tempPatients.length; i++) {
             let obj = {
@@ -230,216 +238,118 @@ export default {
                   newObj['type'] = 1
                   newObj['item_name'] = orders[c].item_name
                   newObj['item_id'] = orders[c].item_id
-
+                  newObj['cost_classify'] = -100 //药品
                 }
                 if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
                   newObj['item_id'] = orders[c].item_id
                   if (orders[c].p_type == 2) {
                     newObj['type'] = 2
                     newObj['item_name'] = orders[c].item_name
+                    newObj['cost_classify'] = orders[c].cost_classify //项目
+
                   } else if (orders[c].p_type == 3) {
                     newObj['type'] = 3
                     newObj['item_name'] = orders[c].item_name
+                    newObj['cost_classify'] = -200 //耗材
+
                   }
                 }
                 obj.order_info.push(newObj)
               }
             tempPatientsTwo.push(obj)
           }
-          console.log(tempPatientsTwo)
 
+
+
+          var tempPatientsThree = []
           for (let d = 0; d < tempPatientsTwo.length; d++) {
-            tempPatientsTwo[d]['new_order_info'] = []
-            let project = []
-            let advice = []
-            for (let b = 0; b < tempPatientsTwo[d].order_info.length; b++) {
-              if (tempPatientsTwo[d].order_info[b].type == 1) {
-                advice.push(tempPatientsTwo[d].order_info[b])
-              } else {
-                project.push(tempPatientsTwo[d].order_info[b])
+            let new_obj={
+              patient_id:tempPatientsTwo[d].patient_id,
+              items:[],
+            }
+
+            let  infos = this.unique2(tempPatientsTwo[d].order_info)
+            for(let e = 0; e < infos.length; e++){
+              let price = 0
+              for(let f = 0; f < tempPatientsTwo[d].order_info.length; f++){
+                if (tempPatientsTwo[d].order_info[f].cost_classify == infos[e].cost_classify){
+                  price = parseFloat(price.toString()) + parseFloat((parseFloat(tempPatientsTwo[d].order_info[f].count.toString()) * parseFloat(tempPatientsTwo[d].order_info[f].price.toString()).toFixed(2)).toString())
+                }
               }
+              let obj = {
+                "sum":0,
+                "price": price,
+                "cost_classify":infos[e].cost_classify,
+                "item_name":this.getName(infos[e].cost_classify),
+                "patient_id":tempPatientsTwo[d].patient_id,
+                "name":tempPatientsTwo[d].name,
+              }
+              new_obj.items.push(obj)
             }
-            // project = this.uniqueProjectAndAdvice(project)
-            // advice = this.uniqueProjectAndAdvice(advice)
 
-            let obj = {}
-            let price = 0
+            tempPatientsThree.push(new_obj)
+          }
 
-            let obj2 = {}
-            let price2 = 0
+          console.log("tempPatientsThree")
 
-            let obj3 = {}
-            let price3 = 0
+          console.log(tempPatientsThree)
 
-            for (let i = 0; i < project.length; i++) {
-              if (project[i].type == 2) {
-                price = parseFloat(price.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
-              } else if (project[i].type == 3) {
-                price3 = parseFloat(price3.toString()) + parseFloat((parseFloat(project[i].count.toString()) * parseFloat(project[i].price.toString()).toFixed(2)).toString())
+          for(let i = 0; i < tempPatientsThree.length;i++){
+            let sum = 0
+            for(let b = 0; b < tempPatientsThree[i].items.length;b++){
+              let obj = {
+                name:tempPatientsThree[i].items[b].name,
+                cost_classify:tempPatientsThree[i].items[b].cost_classify,
+                price:tempPatientsThree[i].items[b].price,
+                patient_id:tempPatientsThree[i].items[b].patient_id,
+                item_name:tempPatientsThree[i].items[b].item_name,
+                sum:0,
               }
+              sum = sum + tempPatientsThree[i].items[b].price
+              this.tableData.push(obj)
+              this.all_table_data.push(obj)
             }
-
-
-            for (let i = 0; i < advice.length; i++) {
-              price2 = parseFloat(price2.toString()) + parseFloat((parseFloat(advice[i].count.toString()) * parseFloat(advice[i].price.toString()).toFixed(2)).toString())
+            for(let c = 0; c < this.tableData.length;c++){
+              if(tempPatientsThree[i].patient_id == this.tableData[c].patient_id){
+                this.tableData[c].sum = sum
+              }
             }
-
-
-            switch (parseInt(this.item_type)) {
-              case 0:
-
-                obj['sum'] = price + price2 + price3
-                obj['price'] = price
-                obj['item_name'] = '项目'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-
-                obj2['sum'] = 0
-                obj2['price'] = price2
-                obj2['item_name'] = '药品'
-                obj2['name'] = tempPatientsTwo[d].name
-                obj2['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj2)
-
-                obj3['sum'] = 0
-                obj3['price'] = price3
-                obj3['item_name'] = '耗材'
-                obj3['name'] = tempPatientsTwo[d].name
-                obj3['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj3)
-                break
-              case 1:
-                obj2['sum'] = price2
-                obj2['price'] = price2
-                obj2['item_name'] = '药品'
-                obj2['name'] = tempPatientsTwo[d].name
-                obj2['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj2)
-                break
-              case 2:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '项目'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 3:
-                obj3['sum'] = price3
-                obj3['price'] = price3
-                obj3['item_name'] = '耗材'
-                obj3['name'] = tempPatientsTwo[d].name
-                obj3['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj3)
-                break
-              case 4:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '检验'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 5:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '治疗'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 6:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '护理'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-              case 7:
-
-                obj['sum'] = price
-                obj['price'] = price
-                obj['item_name'] = '其他'
-                obj['name'] = tempPatientsTwo[d].name
-                obj['patient_id'] = tempPatientsTwo[d].patient_id
-                this.tableData.push(obj)
-                break
-
+            for(let c = 0; c < this.all_table_data.length;c++){
+              if(tempPatientsThree[i].patient_id == this.all_table_data[c].patient_id){
+                this.all_table_data[c].sum = sum
+              }
             }
-
-
-
           }
 
+          if(this.new_item_type == 0){
+            this.tableData = this.all_table_data
+          }else{
+            let new_table_data = []
+            for(let aa = 0; aa < this.all_table_data.length; aa++){
+              if(this.new_item_type == this.all_table_data[aa].cost_classify){
+                new_table_data.push(this.all_table_data[aa])
+              }
+            }
+            this.tableData = new_table_data
+          }
           this.handleSpanTempArr()
-          // this.tableData = tempPatientsTwo
-
-          // console.log(tempPatientsTwo.length)
-          //
-
         }
-        //
-        // console.log('去重前')
-        // console.log(advice)
-        // console.log(project)
-        // //
-        // //
-
-        // //
-        // console.log('去重后')
-        //
-        // console.log(advice.length)
-        // console.log(project.length)
-        //
-        // for (let i = 0; i < project.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = project[i].price
-        //     obj['type'] = project[i].type
-        //     obj['item_name'] = project[i].item_name
-        //     obj['item_id'] = project[i].item_id
-        //     obj['name'] = project[i].name
-        //     obj['patient_id'] = project[i].patient_id
-        //     obj['count'] = count
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        //
-        //
-        // for (let i = 0; i < advice.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = advice[i].price
-        //     obj['type'] = advice[i].type
-        //     obj['item_name'] = advice[i].item_name
-        //     obj['item_id'] = advice[i].item_id
-        //     obj['name'] = advice[i].name
-        //     obj['patient_id'] = advice[i].patient_id
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        // console.log(this.tableData.length)
-        // this.tableData = this.sort(this.tableData)
-
       })
+    },getName(cost_classify){
+      if (cost_classify == -100){
+        return  "药品费"
+      }else if(cost_classify == -200){
+        return  "耗材费"
+      }else{
+        var costClassify = getDictionaryDataConfig('system','cost_classify');
+        var name = "";
+        for(let i=0;i<costClassify.length;i++){
+          if(cost_classify == costClassify[i].id){
+            name = costClassify[i].name
+          }
+        }
+        return name
+      }
     }, uniqueProjectAndAdvice(array) {
       // res用来存储结果
       var res = []
@@ -455,6 +365,40 @@ export default {
         }
       }
       return res
+    },unique2(array) {
+
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].cost_classify === res[j].cost_classify) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
+    },unique3(array) {
+      console.log("-----11122222")
+
+      console.log(array)
+      // res用来存储结果
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].patient_id === res[j].patient_id) {
+            break
+          }
+        }
+        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
     }, sort(arr) {
       for (var i = 0; i < arr.length - 1; i++) {
         for (var j = 0; j < arr.length - i - 1; j++) {

src/xt_pages/outpatientTool/summary.vue

@@ -10,10 +10,15 @@
                     <el-tab-pane label="明细" name="明细"></el-tab-pane>
                     <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
                     <el-tab-pane label="结算" name="结算"></el-tab-pane>
+                  <el-tab-pane label="全部汇总" name="全部汇总"></el-tab-pane>
+
                 </el-tabs>
                 <detail v-if="titleType == '明细'"></detail>
                 <gather v-if="titleType == '汇总'"></gather>
                 <settle v-if="titleType == '结算'"></settle>
+<!--              <allgather v-if="titleType == '全部汇总'"></allgather>-->
+              <allgather v-if="titleType == '全部汇总'"></allgather>
+
             </div>
         </div>
     </div>
@@ -28,12 +33,14 @@
   import Settle from './components/settle'
   import Gather from './components/gather'
   import Detail from './components/detail'
+  import Allgather from './components/allgather.vue'
 
 
   const moment = require('moment')
 
   export default {
     components: {
+      Allgather,
       Gather,
       Settle,
       Detail,

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -441,7 +441,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215){
+              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215 || this.org_id == 0 || this.org_id ==10191){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)