Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue

@@ -112,24 +112,31 @@
               </div>
             </div>
           </div>
-          <div class="row">
-            血管通路
-            <div class="inline_block under_line" style="width:230px;text-align: center;">
-              {{ record.assessment_before_dislysis.blood_access_part_id ? 
-                record.assessment_before_dislysis.blood_access_part_id :'/'  
-              }}
-              {{ bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id)}}
+          <div class="row" style="display: flex;">
+            <div style="flex: 1;">
+              血管通路
+              <div class="inline_block under_line" style="width:230px;text-align: center;">
+                {{ record.assessment_before_dislysis.blood_access_part_id ? 
+                  record.assessment_before_dislysis.blood_access_part_id :'/'  
+                }}
+                {{ bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id)}}
+              </div>
             </div>
-            导管
-            <div class="inline_block under_line" style="width:200px;text-align: center;">
-              {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : "/" }}
+            <div style="flex: 1;">
+              导管
+              <div class="inline_block under_line" style="width:200px;text-align: center;">
+                {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : "/" }}
+              </div>
             </div>
-            内瘘
-            <div class="inline_block under_line" style="width:200px;text-align: center;">
-              {{ record.assessment_before_dislysis.internal_fistula ? 
-                record.assessment_before_dislysis.internal_fistula : "/" 
-              }}
+            <div style="flex: 1;">
+              内瘘
+              <div class="inline_block under_line" style="width:200px;text-align: center;">
+                {{ record.assessment_before_dislysis.internal_fistula ? 
+                  record.assessment_before_dislysis.internal_fistula : "/" 
+                }}
+              </div>
             </div>
+            
           </div>
           <div class="row">
             抗凝药物&nbsp;&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -92,20 +92,28 @@
               </div>
             </div>
         </div>
-        <div class="row">
-          血管通路
-          <div class="inline_block under_line" style="width:200px;text-align: center;">
-            {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/'  }}
-            {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
+        <div class="row" style="display: flex;">
+          <div style="flex: 1;">
+            血管通路
+            <div class="inline_block under_line" style="width:200px;text-align: center;">
+              {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/'  }}
+              {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
+            </div>
           </div>
-          导管
-          <div class="inline_block under_line" style="width:200px;text-align: center;">
-            {{ predialysis.catheter ? predialysis.catheter : "/" }}
+          <div style="flex: 1;">
+            导管
+            <div class="inline_block under_line" style="width:200px;text-align: center;">
+              {{ predialysis.catheter ? predialysis.catheter : "/" }}
+            </div>
           </div>
-          内瘘
-          <div class="inline_block under_line" style="width:200px;text-align: center;">
-            {{ predialysis.internal_fistula ? predialysis.internal_fistula : "/" }}
+          <div style="flex: 1;">
+            内瘘
+            <div class="inline_block under_line" style="width:200px;text-align: center;">
+              {{ predialysis.internal_fistula ? predialysis.internal_fistula : "/" }}
+            </div>
           </div>
+          
+          
         </div>
 
         <div class="row">
@@ -114,7 +122,7 @@
         <div class="row">
           抗凝药物&nbsp;&nbsp;
           <div class="inline_block under_line" style="width:90%;text-align: left;">
-            {{ prescription.anticoagulant ? prescription.anticoagulant : '/' }}
+            {{ getanticoag(prescription.anticoagulant) ? getanticoag(prescription.anticoagulant) : '/' }}
             <div class="inline_block">&nbsp;&nbsp;&nbsp;
               剂量：首剂
               <div class="inline_block" style="width:50px;text-align:center">
@@ -1313,51 +1321,6 @@ export default {
           this.doctorForm.url = doctorname.url
           var prescription = response.data.data.dialysisPrescription
           console.log('透析处方', prescription)
-          if (prescription.anticoagulant === 1) {
-            prescription.anticoagulant = '无肝素'
-          }
-          if (prescription.anticoagulant === 2) {
-            prescription.anticoagulant = '普通肝素'
-          }
-          if (prescription.anticoagulant === 3) {
-            prescription.anticoagulant = '低分子肝素'
-          }
-          if (prescription.anticoagulant === 4) {
-            prescription.anticoagulant = '阿加曲班'
-          }
-          if (prescription.anticoagulant === 5) {
-            prescription.anticoagulant = '枸橼酸钠'
-          }
-          if (prescription.anticoagulant == 6) {
-            prescription.anticoagulant = '低分子肝素钙'
-          }
-          if (prescription.anticoagulant == 7) {
-            prescription.anticoagulant = '低分子肝素钠'
-          }
-          if (prescription.anticoagulant == 8) {
-            prescription.anticoagulant = '依诺肝素'
-          }
-          if (prescription.anticoagulant == 9) {
-            prescription.anticoagulant = '达肝素'
-          }
-          if (prescription.anticoagulant == 10) {
-            prescription.anticoagulant = '体外抗凝'
-          }
-          if (prescription.anticoagulant == 11) {
-            prescription.anticoagulant = '那屈肝素'
-          }
-          if (prescription.anticoagulant == 12) {
-            prescription.anticoagulant = '无抗凝剂'
-          }
-          if (prescription.anticoagulant == 13) {
-            prescription.anticoagulant = '那屈肝素钙'
-          }
-          if (prescription.anticoagulant == 14) {
-            prescription.anticoagulant = '肝素钙注射液'
-          }
-          if (prescription.anticoagulant == 15) {
-            prescription.anticoagulant = '甲磺酸萘莫司他'
-          }
           if (prescription.blood_access === 1) {
             prescription.blood_access = '正常'
           }
@@ -1763,7 +1726,7 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].name){
+          if(val == options[i].id){
             return options[i].shouji_unit
           }
         }
@@ -1776,7 +1739,7 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].name){
+          if(val == options[i].id){
             return options[i].weichi_unit
           }
         }
@@ -1788,7 +1751,7 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].name){
+          if(val == options[i].id){
             return options[i].zongliang_unit
           }
         }
@@ -1796,6 +1759,15 @@ export default {
         return ''
       }
     },
+    getanticoag(id){
+     const option = this.anticoagulantsConfit
+      for(let i in option){
+        if(option[i].id==id){
+          return option[i].name
+        }
+      }
+    },
+    
   },
   watch: {
     'patientInfo.gender': function() {

src/xt_pages/user/courseOfDisease_new.vue

@@ -5,7 +5,6 @@
       </div> -->
   <div class="patient-container">
     <PatientSidebar :id="patient_id" defaultActive="3-5"></PatientSidebar>
-
     <div v-loading="loading">
       <div class="patient-app-container advice-container app-container" style="">
         <div style="display: flex;">
@@ -85,6 +84,46 @@
               <span style="display: inline-block;border-left: 5px solid #3891f1f5;padding-left: 5px;margin-bottom: 5px;">
                 病程内容
               </span>
+              <div style="display:flex;">
+                <div>
+                  取值时间:
+                  <el-select v-model="quzhi_date" @change="datachange" placeholder="请选择" style="width: 120px;">
+                    <el-option
+                      v-for="item in quzhi_options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="margin:0 10px">
+                  <el-date-picker
+                  @change="changStartDate"
+                    v-model="start_date"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 150px;">
+                  </el-date-picker>
+                  <span>-</span>
+                  <el-date-picker
+                  @change="changEndDate"
+                    v-model="end_date"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    style="width: 150px;">
+                  </el-date-picker>
+                </div>
+                <!-- <div>
+                  <el-button type="primary" size="small" @click="autotext_click">
+                    生成
+                  </el-button>
+                  <el-button type="primary" size="small" @click="auto_dialog=false">
+                    取消
+                  </el-button>
+                </div> -->
+              </div>
               <div style="margin: 10px 0;">
                 <el-button type="primary" size="small" @click="template_click">
                   {{ add_index ==0 ? '设置模板' : '模板库' }}
@@ -165,7 +204,53 @@
         width="70%"
         top="0"
         >
-     
+        <div>
+          <!-- <div style="display:flex;"> -->
+            <!-- <div>
+              取值时间:
+              <el-select v-model="quzhi_date" @change="datachange" placeholder="请选择" style="width: 120px;">
+                <el-option
+                  v-for="item in quzhi_options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div style="margin:0 10px">
+              <el-date-picker
+               @change="changStartDate"
+                v-model="start_date"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 150px;">
+              </el-date-picker>
+              <span>-</span>
+              <el-date-picker
+               @change="changEndDate"
+                v-model="end_date"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 150px;">
+              </el-date-picker>
+            </div> -->
+            <div style="text-align: right;margin-bottom: 10px;">
+              <el-button type="primary" size="small" @click="autotext_click">
+                生成
+              </el-button>
+              <el-button type="primary" size="small" @click="auto_dialog=false">
+                取消
+              </el-button>
+            </div>
+          <!-- </div> -->
+          <div v-show="AuToShow">
+            <text_content @new_content="newcontent" :patient="patient" :prescriptionList="prescriptionList" :berforList="berforList" 
+            :monitorList="monitorList" :dryweightList="dryweightList" :inpectionList="inpectionList" :dialysisOrderList="dialysisOrderList" 
+            :start_date="start_date" :end_date="end_date" :patient_id="patient_id" :num="num"></text_content>
+          </div>
+        </div>
 
       </el-dialog>
 
@@ -267,12 +352,12 @@
         patient:{},
         AuToShow:false,
 
-        num:22222222,
+        num:22222222
       //   name:"",
       //  gander:"",
       //  age:0,
       //  dialysis_no:"",
-       patient_new:{},
+      //  patient_new:{},
       //  prescriptionList:[],
       //  berforList:[],
       //  monitorList:[],
@@ -531,10 +616,9 @@
         //     }
         //   }
         // })
-         this.getAutoPatientContent()
          this.AuToShow = true
 
-      
+      //  this.getAutoPatientContent()
       },
       // 本周
       getFirstDayOfWeek(date){
@@ -713,8 +797,6 @@
           if(response.data.state == 1){
           
             var prescription =  response.data.data.prescription
-
-            this.patient_new = response.data.data.patient
             var hd_total =0
             var hdArr =[]
             var hdf_total =0