提交代码

src/store/modules/globalConfig.js

@@ -1976,7 +1976,8 @@ const global_config = {
     }
     ],
 
-    good_unit: [{
+    good_unit: [
+      {
       id: 1,
       name: '支'
     },

src/xt_pages/data/components/drugs.vue

@@ -530,7 +530,7 @@
 
           val.min_number =  parseInt(val.min_number)
           console.log("Val323323232",val)
-          
+
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -721,7 +721,7 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-             
+
 
 
               this.$refs.addDrugs.show(id, this.formValue)
@@ -1451,18 +1451,19 @@
         };
         console.log("params222222222",params)
 
-        postDrugInformation(params).then(response=>{
-           if(response.data.state == 1){
-             var msg =  response.data.data.msg;
-             this.getList();
-             this.getAllManufacturer();
-             this.GetAllConfig();
-             this.$message.success("导入成功!")
 
-           }else{
-             this.$message.error("导入失败,请下载日志查看")
-           }
-        })
+        // postDrugInformation(params).then(response=>{
+        //    if(response.data.state == 1){
+        //      var msg =  response.data.data.msg;
+        //      this.getList();
+        //      this.getAllManufacturer();
+        //      this.GetAllConfig();
+        //      this.$message.success("导入成功!")
+        //
+        //    }else{
+        //      this.$message.error("导入失败,请下载日志查看")
+        //    }
+        // })
       },
       generateTxt: function(log) {
         var content = '';

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

@@ -822,7 +822,7 @@
                     <el-col :span="8">
                         <el-form-item
                                 label="置换液："
-                                v-if="isShows('置换液')"
+                                v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"
                                 :rules="isCheckmust('置换液')"
@@ -840,6 +840,27 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
+                      <el-form-item
+                        label="置换液："
+                        v-if="isShows('置换方式')&&this.$store.getters.xt_user.org.id == 10206"
+                        v-show="huShow"
+                        prop="displace_liqui_part"
+                        :rules="isCheckmust('置换方式')"
+                      >
+                        <el-select
+                          v-model="dialysisPrescription.displace_liqui_part"
+                          placeholder="请选择"
+                        >
+                          <el-option :key="0" label="请选择" :value="0"></el-option>
+                          <el-option
+                            v-for="(option, index) in displace_liqui_part_option"
+                            :key="index + 'u'"
+                            :label="option.name"
+                            :value="option.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+
                     </el-col>
 
                     <el-col :span="8"
@@ -2772,7 +2793,7 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-       
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
@@ -3449,7 +3470,7 @@ mu
                   ParamsQuery['patient'] = this.patient.id
                   ParamsQuery['record_date'] = this.record_date
                   ParamsQuery['mode'] = '1'
-               
+
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2,7 +2,7 @@
   <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
         id="dialysis-print-box-1-1"
@@ -753,7 +753,7 @@
                       </div>
                     </div>
                     <div
-                     
+
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -993,7 +993,7 @@
                       kg
                     </div>
                     <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
-                      计划超滤量： 
+                      计划超滤量：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -1004,13 +1004,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span> 
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
                     </div>
 
 
                     <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 0">
-                      处方脱水量： 
+                      处方脱水量：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -1127,7 +1127,7 @@
                             : "/"
                         }}
                       </div>
-                     
+
                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
@@ -1147,7 +1147,7 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                    
+
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
@@ -1303,8 +1303,8 @@
                         }}
                       </div>
                       <span>ml/h</span>
-                   
-                  
+
+
                     </div>
                     <div
                       class="inline_block"
@@ -1323,8 +1323,8 @@
                         }}
                       </div>
                       <span>ml/h</span>
-                   
-                  
+
+
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       碳酸氢钠流速：
@@ -1338,13 +1338,13 @@
                             : ""
                         }}
                       </div>
-                     
-                     
+
+
                     </div>
                     <span>ml/h</span>
-                   
-              
-                  
+
+
+
                   </div>
 
                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==10469 || org_id == 9671">
@@ -1359,7 +1359,7 @@
                       >
                        {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
-                    
+
                     </div>
                     <div
                       class="inline_block"
@@ -1458,15 +1458,15 @@
                               : "mmHg"
                           }})
                         </td>
-                        
+
                         <td width="60" v-if="org_id == 9836">体温(°C)</td>
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">
-                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span> 
-                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
-                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
+                          <span v-if="org_id != 0 && org_id !=10469 && org_id!=10490"> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
@@ -1477,8 +1477,8 @@
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
-                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
-                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
+                        <td width="50" v-if="org_id == 9919">在线尿素监测</td>
+                        <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
                         <td width="200">病情变化及处理</td>
@@ -1513,7 +1513,7 @@
                               : ""
                             }}
                           </span>
-                          
+
                         </td>
                         <td>
                           <span
@@ -1577,7 +1577,7 @@
                           <span v-if="org_id==0||org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
-                      
+
                         <td v-if="org_id == 10375 || org_id == 0"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
@@ -1648,7 +1648,7 @@
                                 "
                                 >【开始透析】
                                 </template>
-                              
+
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}
@@ -1888,7 +1888,7 @@
               <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
               <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
              </span>
-            
+
             </div>
           </div>
           <div class="row">
@@ -2410,7 +2410,7 @@
                             : "未称重"
                         }}
                       </span>
-                       
+
                       </div>
                       kg
                     </div>
@@ -2723,7 +2723,7 @@
                       >
                         {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
                       </div>ml
-                      
+
                     </div>
                   </div>
                 </td>
@@ -2735,8 +2735,8 @@
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                    <div v-if="org_id == 0 || org_id == 10440">
-                    
-                  
+
+
 
                     <div class="inline_block" style="flex: 1">
                       上机护士：
@@ -2777,8 +2777,8 @@
                         />
                       </div>
                     </div>
-                  
-                  
+
+
                   </div>
                   <div v-if="org_id!=0 && org_id!=10440">
                     <div class="inline_block" style="flex: 1">
@@ -2821,18 +2821,18 @@
                       </div>
                     </div>
                   </div>
-                   
+
                   <div v-if="org_id==0||org_id==10440">
-                    
-                    <div class="inline_block" style="flex: 1">                 
+
+                    <div class="inline_block" style="flex: 1">
                      <div>
-                      <span>责任护士：</span> 
+                      <span>责任护士：</span>
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
-                       
+
                       >
-                    
+
                         <span
                           style="height: 35px; display: inline-block"
                           v-if="
@@ -2873,9 +2873,9 @@
 
                   <div v-if="org_id!=0&&org_id!=10440">
                     <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10414">责任护士：</span> 
-                      <span v-else>治疗护士：</span> 
-                      
+                      <span v-if="org_id==10414">责任护士：</span>
+                      <span v-else>治疗护士：</span>
+
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -2914,12 +2914,12 @@
                       </div>
                     </div>
                   </div>
-                  
+
 
 
                     <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10387" >核对护士：</span> 
-                      <span v-else >核对人员：</span> 
+                      <span v-if="org_id==10387" >核对护士：</span>
+                      <span v-else >核对人员：</span>
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -3198,7 +3198,7 @@
                           核对护士
                         </td>
                       </tr>
-                     
+
 
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
@@ -3208,7 +3208,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          
+
                         </td>
                         <td
                           height="32px"
@@ -3243,7 +3243,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                    
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -3257,7 +3257,7 @@
                             v-else
                           />
                         </td>
-                      
+
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -3289,15 +3289,15 @@
                           />
                         </td>
                       </tr>
-                     
+
                     </tbody>
      </table>
 
 
-    
-     
 
-     
+
+
+
     </div>
   </div>
 </template>
@@ -3444,7 +3444,7 @@ export default {
   },
   methods: {
     toUpload() {
-         
+
          let dom = document.getElementById("dialysis-print-box-1")
          //调用方法下载
          html2canvas(dom, {
@@ -3458,14 +3458,14 @@ export default {
          }).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]
@@ -3473,7 +3473,7 @@ export default {
            const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
            console.log("blobwoowowowwo",blob)
            this.openPdf(blob);
-           
+
            // var data = {
            //   name:newBase64Data,
            // }
@@ -3488,14 +3488,14 @@ export default {
            //     this.openPdf(blob);
            //   }
            // })
-           
+
            // this.viewPdf(newBase64Data)
            //保存到pdf，名字是stone
            // pdf.save('stone.pdf');
-          
+
          });
        },
-    
+
      viewPdf(content) {
        console.log("content",content);
        const blob = this.base64ToBlob(content);
@@ -3514,7 +3514,7 @@ export default {
            return value1 - value2
        }
      },
- 
+
      openPdf(blob) {
        const objectUrl = URL.createObjectURL(blob);
        const a = document.createElement('a');
@@ -3530,23 +3530,23 @@ export default {
        const bytesLength = byteCharacters.length;
        const slicesCount = Math.ceil(bytesLength / sliceSize);
        const byteArrays = new Array(slicesCount);
- 
+
        for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
          const begin = sliceIndex * sliceSize;
          const end = Math.min(begin + sliceSize, bytesLength);
- 
+
          const bytes = new Array(end - begin);
          for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
            bytes[i] = byteCharacters[offset].charCodeAt(0);
          }
          byteArrays[sliceIndex] = new Uint8Array(bytes);
        }
- 
+
        return new Blob(byteArrays, {
          type: contentType
        });
      },
-    
+
      UploadPdf(res) {
        let pdfBase64Str = res;
        let title = "上传给后端的个人报告";
@@ -4184,7 +4184,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-   
+
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -4265,7 +4265,7 @@ export default {
         // }
 
 
-        
+
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
         if(this.org_id ==10515 || this.org_id == 0){
@@ -4285,15 +4285,15 @@ export default {
         });
         this.projects = projects;
 
-      
+
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-      
+
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-            
+
               this.projects[i].project_team_name = ""
               this.projects[i].project_team_id = 0
               console.log("this.projects[i].project.team",this.projects[i].project.team)
@@ -4304,11 +4304,11 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.projects[i].advice_name =  this.projects[i].team.project_team
                 this.projects[i].advice_doctor = this.projects[i].doctor
-              
-               
+
+
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.project[i])
               }else{
@@ -4318,19 +4318,19 @@ export default {
                 this.projects[i].single_dose = this.projects[i].single_dose
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].execution_staff= this.projects[i].execution_staff
                 this.projects[i].advice_doctor = this.projects[i].doctor
                 this.doctor_advices.push(this.projects[i])
                 // this.doctor_advices_2.push(this.projects[i])
               }
-             
+
              }
-             
+
            }
         }
-         
+
         }
-      
+
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
@@ -4367,7 +4367,7 @@ export default {
         }
         // console.log(this.advice_groups);
 
-       
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -4403,7 +4403,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
@@ -4513,7 +4513,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-   
+
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2948,6 +2948,17 @@ export default {
             org_id: this.$store.getters.xt_user.org_id
 
           }
+          if (this.activeName == 'first') {
+            obj['settle_accounts_type'] = 1
+          } else if (this.activeName == 'second') {
+            obj['start_time'] = this.other_start_time
+            obj['end_time'] = this.other_end_time
+            obj['settle_accounts_type'] = 2
+          } else {
+            obj['start_time'] = this.other_start_time_two
+            obj['end_time'] = this.other_end_time_two
+            obj['settle_accounts_type'] = 2
+          }
           axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
             params: obj
           })