518合并代码

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -703,7 +703,6 @@ export default {
             id:this.groupForm.id,
          
           };
-          console.log("hhhhh",this.drug_id,this.nameForm.way)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
@@ -714,8 +713,6 @@ export default {
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
-          console.log("88888888",submitForm)
-          console.log("99999",this.medicals)
           if(this.private_drug_config != null&& this.private_drug_config.drug_start == 1){
                
              for(let index=0;index<submitForm.adviceNames.length;index++){
@@ -730,7 +727,6 @@ export default {
                    }
                    if(submitForm.adviceNames[index].children.length == 0){
                      if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
-                       console.log("进来了没有")
                         submitForm.adviceNames[index].way = 2
                         submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
                     }
@@ -739,7 +735,6 @@ export default {
                 }
              }
           }
-          console.log("2222",submitForm)
          
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
@@ -995,6 +990,7 @@ export default {
       this.nameFormTitle = "添加子药内容";
     },
     openGroupAdvice(isEdit) {
+      console.log("hhhahhdhahdhahddhhdhdhh",this.groupSelectRow)
       this.isChild = false;
       if (isEdit) {
         if (this.groupSelectRow === null) {
@@ -1069,11 +1065,7 @@ export default {
     },
     selectAdvice(selection, row) {
      
-     console.log("row",row)
-
-      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id]
-        .DoctorAdviceTemplate;
-      console.log(adviceArray);
+      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id].DoctorAdviceTemplate;
       for (let y = 0; y < adviceArray.length; y++) {
         adviceArray[y].selection = false;
       }
@@ -1157,7 +1149,7 @@ export default {
       }
     },
     templateTableChange(currentRow, oldCurrentRow) {
-      console.log("params -----",currentRow)
+     
       this.selectedTemp = { id: 0, name: "", org_id: 0, list: [], rows: [] };
       if (currentRow == null) {
         return false;
@@ -1577,6 +1569,7 @@ export default {
             var medicalList = response.data.data.private_drug_list
             console.log("medicallist",medicalList)
             var base_drug_list = response.data.data.base_drug_list
+            console.log("base_drug_list23233232322323",base_drug_list)
             var base_drug_cofig = response.data.data.base_drug_config
             var private_drug_cofig = response.data.data.private_drug_config
        
@@ -1674,7 +1667,7 @@ export default {
      
     },
     changeDrugDesc(name) {
-        console.log("hhhhhhhhhh",this.drugSpec)
+       
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1702,7 +1695,7 @@ export default {
       },
 
      querySearch(queryString, cb) {
-        console.log('queryString',queryString)
+        
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -33,7 +33,7 @@
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
-          <th v-if="isShow('血容量')" width="92px">血容量(ml)</th>
+          <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -53,7 +53,7 @@
       <el-form-item label="药物过敏史: " prop="name">
         <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
-<!-- 
+
   <el-form-item label="初始透析日期: " prop="name">
          <el-date-picker
           :disabled="true"
@@ -97,7 +97,7 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
-      </el-form-item> -->
+      </el-form-item>
 
     </el-form>
     <div class="mainTitle">体格信息：</div>

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -62,6 +62,7 @@
           :lastAssessment="lastAssessment"
           :stockType="stockType"
           :mode_id="mode_id"
+          :is_advice_open="is_advice_open"
         >
         </nav-igation>
 
@@ -256,7 +257,7 @@ export default {
       config: {},
 
       his_is_open:0,
-
+      is_advice_open:0,
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
@@ -584,7 +585,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
 
           var prescription = resp.data.prescription // 透析处方
-          console.log("投产出大发大发233232323232233232",prescription)
+         
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -732,18 +733,18 @@ export default {
           var his_doctor_advices = resp.data.his_advices
 
           this.his_is_open = resp.data.is_open_config.is_open
-          console.log(this.his_is_open)
-
+          
+          this.is_advice_open = resp.data.is_advice_open.is_advice_open
+          console.log("is_advice_open23223323232322323",this.is_advice_open)
 
 
           var stockType =  resp.data.stockType
           this.stockType = stockType
-          console.log("stockTYPW",stockType)
+          
 
           var prepare = resp.data.prepare
           this.preparestock = prepare
-          console.log("prepare222222",prepare)
-
+        
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -54,7 +54,7 @@
         <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
      
-      <!-- <el-form-item label="初始透析日期: " prop="name">
+      <el-form-item label="初始透析日期: " prop="name">
          <el-date-picker
           :disabled="true"
           style="width:100%;"
@@ -73,7 +73,6 @@
       </el-form-item>
       
   
-
       <el-form-item label="确诊肾衰日期: " prop="name">
          <el-date-picker
           style="width:100%;"
@@ -95,27 +94,27 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input v-model="lab_apparatus" placeholder="实验室及器械检查"></el-input>
-      </el-form-item> -->
+      </el-form-item>
 
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="体温:" prop="temperature">
-        <el-input v-model="case_history.temperature" placeholder=""></el-input>
+        <el-input v-model="case_history.temperature" placeholder="体温"></el-input>
         <span>℃</span>
       </el-form-item>
       <el-form-item label="脉搏: " prop="pulse">
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        <el-input v-model="case_history.pulse" placeholder="脉搏"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="呼吸: " prop="breathing">
-        <el-input v-model="case_history.breathing" placeholder=""></el-input>
+        <el-input v-model="case_history.breathing" placeholder="呼吸"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="血压:" prop="name">
-        <el-input v-model="case_history.sbp" placeholder=""></el-input>
+        <el-input v-model="case_history.sbp" placeholder="血压" style="width:50px"></el-input>
         /
-        <el-input v-model="case_history.dbp" placeholder=""></el-input>
+        <el-input v-model="case_history.dbp" placeholder="血压" style="width:50px"></el-input>
         mmHg
       </el-form-item>
     </el-form>

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -59,6 +59,7 @@
           @assessmentAfterDislysis="assessmentAfterDislysisFunc"
           :system_prescribe="system_prescribe"
           :his_is_open="his_is_open"
+          :is_advice_open="is_advice_open"
           :lastAssessment="lastAssessment"
           :stockType="stockType"
           :mode_id="mode_id"
@@ -256,7 +257,7 @@ export default {
       config: {},
 
       his_is_open:0,
-
+      is_advice_open:0,
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
@@ -550,6 +551,9 @@ export default {
               if(this.his_is_open == 1){
                 this.is_open = 0
               }
+              if(this.is_advice_open == 1){
+               this.is_open =1
+              }
               this.longAdvices = totalAdvice
               this.waitUploadAdvices = waitUploadAdvices
               break
@@ -740,7 +744,8 @@ export default {
 
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-
+           
+          this.is_advice_open = resp.data.is_advice_open.is_advice_open
 
 
           var stockType =  resp.data.stockType