新分支

src/api/advice.js

@@ -164,6 +164,7 @@ export function DeleteDrugWay(id) {
 }
 
 export function CreateExecutionFrequency(data) {
+  console.log("data",data)
   return request({
     url: '/api/executionfrequency/create',
     method: 'post',

src/xt_pages/data/druguseTemplate.vue

@@ -1270,6 +1270,10 @@
                   <el-input v-model="efForm.code" placeholder="编码"></el-input>
                 </el-form-item>
 
+                <el-form-item label="换算数量 :" >
+                  <el-input v-model="efForm.count" placeholder="数量" type="number"></el-input>
+                </el-form-item>
+
 
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -1461,6 +1465,7 @@
           name: '',
           id: 0,
           code: "",
+          count:0,
         },
 
         drugforms: [
@@ -2002,6 +2007,7 @@
       },
 
       handleUpdateDrugWay(row, index) {
+        console.log("rwo-----",row)
         console.log(row.code)
         this.currentIndex = index
         this.drugwayForm = {
@@ -2090,11 +2096,13 @@
         this.isEdit = false
       },
       handleUpdateEF(row, index) {
+        console.log("row=======",row)
         this.currentIndex = index
         this.efForm = {
           name: row.name,
           id: row.id,
-          code: row.code
+          code: row.code,
+          count:row.count,
         }
 
         this.efFormVisible = true
@@ -2105,6 +2113,11 @@
         this.$refs[formName].validate(valid => {
           if (valid) {
             if (this.isEdit) {
+              if(this.efForm.count >0){
+                this.efForm.count = parseInt(this.efForm.count)
+              }else{
+                this.efForm.count =1
+              }
               UpdateExecutionFrequency(this.efForm.id, this.efForm).then(
                 response => {
                   if (response.data.state == 0) {
@@ -2127,6 +2140,11 @@
                 }
               )
             } else {
+              if(this.efForm.count >0){
+                this.efForm.count = parseInt(this.efForm.count)
+              }else{
+                this.efForm.count =1
+              }
               CreateExecutionFrequency(this.efForm).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2709,7 +2727,7 @@
         this.sameRowArr = sameRowArr
       },
        handleUpdateAdviceTemplate(row, index) {
-
+        console.log("row---------",row)
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name

src/xt_pages/dialysis/longSignPrint.vue

@@ -32,11 +32,11 @@
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              
@@ -53,11 +53,11 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                         </div>

src/xt_pages/dialysis/signPrint.vue

@@ -31,11 +31,11 @@
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              
@@ -52,11 +52,11 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1695,7 +1695,7 @@
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
                               <span v-if="org_id ==10617 && monindex == monitors.length-1">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
-                              <span v-if="org_id ==10617 && (monindex != monitors.length-1 || monindex != 0)">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>    
+                              <span v-if="org_id ==10617 && (monindex != monitors.length-1 && monindex != 0)">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>    
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
                            </span>
                         </td>

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -197,6 +197,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 v-if="prescription.anticoagulant == 17">mg</span>
                   </span>
                   维持:{{prescription.anticoagulant_weichi? prescription.anticoagulant_weichi : ""}}
                   <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -210,6 +211,7 @@
                   <span v-if="prescription.anticoagulant == 10">iu/h</span>
                   <span v-if="prescription.anticoagulant == 11">iu/h</span>
                   <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 17">mg/h</span>
                   总量:{{prescription.anticoagulant_zongliang? prescription.anticoagulant_zongliang: ""}}
                   <span v-if="prescription.anticoagulant == 2">mg</span>
                   <span v-if="prescription.anticoagulant == 3">iu</span>
@@ -220,8 +222,9 @@
                   <span v-if="prescription.anticoagulant == 8">iu</span>
                   <span v-if="prescription.anticoagulant == 9">iu</span>
                   <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 v-if="prescription.anticoagulant == 11">iu</span>
+                  <span v-if="prescription.anticoagulant == 13">iu</span>
+                  <span v-if="prescription.anticoagulant == 17">mg</span>
                 </td>
               </tr>
               <tr>
@@ -522,7 +525,9 @@
                 </td>
                 <td width="5%">医生：</td>
                 <td width="10%">
-                  <span>{{getAdminUser(prescription.creater)}}</span>
+                  <!-- <span>{{getAdminUser(prescription.creater)}}</span> -->
+                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span> 
+                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor==0">{{getAdminUser(prescription.creater)}}</span>
                   <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
               </tr>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -514,6 +514,7 @@
 
       },
       getAllChangeTwo(scope) {
+        console.log("战国阿道夫阿道夫阿道夫",scope)
         if (this.prescription.is_medicine_status){
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
@@ -681,6 +682,7 @@
 
       },
       getNum(execution_frequency) {
+       
         let arr = [
           { name: '立即执行', count: 1 },
           { name: '透析时', count: 1 },
@@ -705,6 +707,12 @@
           { name: '每六小时一次', count: 4 },
           { name: '每八小时一次', count: 3 }
         ]
+       if(this.efs!=null && this.efs.length >0){
+          for(let i=0;i<this.efs.length;i++){
+             arr.push(this.efs[i])
+          }
+       }
+      
         let num = ''
         arr.map(item => {
           if (item.name == execution_frequency) {
@@ -714,6 +722,7 @@
         if (num == '') {
           num = 1
         }
+        console.log("numerreerr",num)
         return num
       },
       getAllIndex(val){
@@ -737,7 +746,8 @@
 
         if(this.prescription.advices!=null && this.prescription.advices.length>0){
            for(let i=0;i<this.prescription.advices.length;i++){
-            if(obj.id == parseInt(val.id)){
+            if(this.prescription.advices[i].id == parseInt(val.id)){
+              console.log("进啦")
               this.prescription.advices[i].delivery_way = obj.delivery_way
               this.prescription.advices[i].execution_frequency =obj.execution_frequency
               this.prescription.advices[i].day = obj.day

src/xt_pages/user/Informed/components/Falloutbedprint.vue

@@ -15,6 +15,7 @@
         <div id="print_content">
           <div class="print_page_main_content">
             <div class="content">
+                
                 <h2 style="text-align: center;">人脸识别知情同意书</h2>
                 <!-- <div style="display: inline-block;border: 1px solid black;width: 20px;height: 20px;"></div> -->
                 <div style="text-align: right;">