518合并代码

src/xt_pages/hospitalStation/components/deskRecord.vue

         <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%;"
 
       <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/recordPrint.vue

 
      <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 10217 && org_id != 0"
+        v-if="org_id != 9671 && org_id!=9675"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
+        v-if="org_id == 9671 || org_id == 9675"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

         <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%;"
 
       <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>
       
       this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
       
-      // 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.special_inspection = this.case_history.special_inspection
-      // this.lab_apparatus = this.case_history.lab_apparatus
+      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.special_inspection = this.case_history.special_inspection
+      this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){

src/xt_pages/outpatientDoctorStation/recordPrint.vue

 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 10217 && org_id != 0"
+        v-if="org_id != 9675 && org_id != 9671"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
+        v-if="org_id == 9671 || org_id == 9675"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"