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

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -754,10 +754,12 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
+                        <span v-if="!prescription.dialysis_dialyszers&&!prescription.dialyzer_perfusion_apparatus">/</span>
+                        <span v-if="prescription.dialysis_dialyszers">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
-                            : "/"
+                            : ""
                         }}
                       </div>
                     </div>

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -132,6 +132,7 @@
 
       <el-form-item label="体格检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="physical_examination"
           placeholder="体格检查"
         ></el-input>
@@ -139,6 +140,7 @@
 
       <el-form-item label="专科检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="special_inspection"
           placeholder="专科检查"
         ></el-input>
@@ -146,6 +148,7 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input
+          type="textarea"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
@@ -180,13 +183,13 @@
         <el-input
           v-model="case_history.sbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         /
         <el-input
           v-model="case_history.dbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         mmHg
       </el-form-item>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -3878,27 +3878,29 @@
 
       },
 
-      opentwo(index) {
-        
-        if (index == 1) {
-          if (this.patientInfo.id == undefined) {
-            this.$message.error('请先选择病人')
-            return
-          }
-          this.$refs.child.createCaseHistory()
-        } else if (index == 2) {
-          this.recordVisible = true
-          this.$refs.recordPrint.show(this.patientid)
-
-          // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
-        } else if (index == 3) {
-          var mode_status = this.$refs.saveRecordTemplate.mode_status
-          this.$refs.medicalRecord.show(mode_status)
-        } else if (index == 4) {
-          this.$refs.saveRecordTemplate.show(this.case_history)
+    // 电子病历打印
+    opentwo(index) {
+      if (index == 1) {
+        if (this.patientInfo.id == undefined) {
+          this.$message.error('请先选择病人')
+          return
         }
+        this.$refs.child.createCaseHistory()
+      } else if (index == 2) {
+        this.recordVisible = true
+        this.$nextTick(() => {
+          this.$refs.recordPrint.show(this.patientid,this.org_id)
+        })
+        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+      } else if (index == 3) {
+        var mode_status = this.$refs.saveRecordTemplate.mode_status
+        this.$refs.medicalRecord.show(mode_status)
+      } else if (index == 4) {
+        this.$refs.saveRecordTemplate.show(this.case_history)
+      }
+
+    },
 
-      },
       // changePatient(val){
       //   console.log("患者val",val)
       //   this.hisPatientInfo = val.hisPatientInfo

src/xt_pages/hospitalStation/recordPrint.vue

@@ -70,10 +70,20 @@ export default {
       educationOptions:[],
       history:{},
       keyword:"",
-      org_id,
+      org_id:0,
     };
   },
   methods: {
+
+    show(val, id) {
+      this.org_id = id;
+      if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
+        this.$refs.printTwo.show(val);
+      } else {
+        this.$refs.printOne.show(val);
+      }
+    },
+
     getAdminUser(id) {
       if (id == 0) {
         return "";
@@ -106,14 +116,14 @@ export default {
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
       
       
-      if (this.org_id != 10217 && this.org_id != 0) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_id == 10217 || this.org_id == 0) {
+      } else if (this.org_id == 10217 || this.org_id == 0|| this.org_id == 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -173,11 +183,11 @@ export default {
 
   },
   created() {
-    // this.getPatientList()
-     this.org_id = this.$store.getters.xt_user.org.id;
-    console.log("=====", this.org_id);
-    this.$refs.printOne.show(this.patientid);
-    this.$refs.printTwo.show(this.patientid);
+    // // this.getPatientList()
+    //  this.org_id = this.$store.getters.xt_user.org.id;
+    // console.log("=====", this.org_id);
+    // this.$refs.printOne.show(this.patientid);
+    // this.$refs.printTwo.show(this.patientid);
 
   },
   // computed:{

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -14,7 +14,7 @@
       <div class="infoTitle" style="margin-top:20px;">
         <div class="name_slot">姓名：{{ patient.name ? patient.name : "" }}</div>
         <div class="address_slot">
-          家庭住址：{{ patient.home_address ? patient.home_address : "" }}深圳市南山区桃园街道新屋村东区三号楼303
+          家庭住址：{{ patient.home_address ? patient.home_address : "" }}
         </div>
       </div>
       <div class="infoTitle">
@@ -119,7 +119,7 @@
         <div>实验室及器械检查</div>
         <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
       </div>
-      <div style="display: flex; justify-content: end">
+      <div style="display: flex; justify-content:flex-end">
         <div class="endInfo">
           <div style="height: 100px">
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
@@ -270,9 +270,9 @@ export default {
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
-    this.getAllDoctorList();
-    this.getPatientCaseHistory();
-    this.getAccessList()
+    // this.getAllDoctorList();
+    // this.getPatientCaseHistory();
+    // this.getAccessList()
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -132,6 +132,7 @@
 
       <el-form-item label="体格检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="physical_examination"
           placeholder="体格检查"
         ></el-input>
@@ -139,6 +140,7 @@
 
       <el-form-item label="专科检查: " prop="name">
         <el-input
+          type="textarea"
           v-model="special_inspection"
           placeholder="专科检查"
         ></el-input>
@@ -146,6 +148,7 @@
 
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input
+          type="textarea"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
@@ -180,13 +183,13 @@
         <el-input
           v-model="case_history.sbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         /
         <el-input
           v-model="case_history.dbp"
           placeholder="血压"
-          style="width: 50px"
+          style="width: 60px"
         ></el-input>
         mmHg
       </el-form-item>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -305,7 +305,6 @@
         class="centerDialog"
         width="600px"
         title="打印"
-        destroy-on-close
         :visible.sync="recordVisible">
       <recordPrint :patientid="patientid" ref="recordPrint">
     </recordPrint>
@@ -433,10 +432,35 @@ export default {
     changeTimeTwo() {
       this.getList()
     },
+    // 电子处方打印
     openPrint() {
       // this.centerDialogVisible = true
       this.getPrescriptionList(this.patientInfo.id, this.record_date)
     },
+
+    // 电子病历打印
+    opentwo(index) {
+      if (index == 1) {
+        if (this.patientInfo.id == undefined) {
+          this.$message.error('请先选择病人')
+          return
+        }
+        this.$refs.child.createCaseHistory()
+      } else if (index == 2) {
+        this.recordVisible = true
+        this.$nextTick(() => {
+          this.$refs.recordPrint.show(this.patientid,this.org_id)
+        })
+        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
+      } else if (index == 3) {
+        var mode_status = this.$refs.saveRecordTemplate.mode_status
+        this.$refs.medicalRecord.show(mode_status)
+      } else if (index == 4) {
+        this.$refs.saveRecordTemplate.show(this.case_history)
+      }
+
+    },
+
     allCheck() {
       this.$refs.multipleTable1.toggleAllSelection()
       this.$refs.multipleTable2.toggleAllSelection()
@@ -4590,27 +4614,6 @@ export default {
 
     },
 
-    opentwo(index) {
-      if (index == 1) {
-        if (this.patientInfo.id == undefined) {
-          this.$message.error('请先选择病人')
-          return
-        }
-        this.$refs.child.createCaseHistory()
-      } else if (index == 2) {
-
-          this.recordVisible = true
-        this.$refs.recordPrint.show(this.patientid)
-        
-        // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
-      } else if (index == 3) {
-        var mode_status = this.$refs.saveRecordTemplate.mode_status
-        this.$refs.medicalRecord.show(mode_status)
-      } else if (index == 4) {
-        this.$refs.saveRecordTemplate.show(this.case_history)
-      }
-
-    },
     // changePatient(val){
     //   console.log("患者val",val)
     //   this.hisPatientInfo = val.hisPatientInfo

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 9675 && org_id != 9671 && org_id != 0"
+        v-if="org_id && org_id != 9675 && org_id != 9671 && org_id != 0"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -70,16 +70,18 @@ export default {
       educationOptions: [],
       history: {},
       keyword: "",
-      org_id,
+      org_id: 0,
     };
   },
 
-
   methods: {
-    show(val) {
-      console.log(val,'ooooooo')
-      this.$refs.printOne.show(val);
-      this.$refs.printTwo.show(val);
+    show(val, id) {
+      this.org_id = id;
+      if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
+        this.$refs.printTwo.show(val);
+      } else {
+        this.$refs.printOne.show(val);
+      }
     },
     getAdminUser(id) {
       if (id == 0) {
@@ -112,14 +114,18 @@ export default {
       const style1 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
-      if (this.org_id != 10217 && this.org_id != 0) {
+      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({
           printable: "prescription-print",
           type: "html",
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_id == 10217 || this.org_id == 0) {
+      } else if (
+        this.org_id == 10217 ||
+        this.org_id == 0 ||
+        this.org_id == 9675
+      ) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -177,7 +183,7 @@ export default {
   },
   created() {
     // this.getPatientList()
-    this.org_id = this.$store.getters.xt_user.org.id;
+    // this.org_id = this.$store.getters.xt_user.org.id;
     // console.log("=====", this.org_id);
     // this.$refs.printOne.show(this.patientid);
     // this.$refs.printTwo.show(this.patientid);

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -128,8 +128,11 @@
             >
             <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
           </div>
+           <div style="text-align:left;">
+          {{history.physical_examination}}
         </div>
-        <div></div>
+        </div>
+
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
@@ -141,7 +144,7 @@
           {{ history.lab_apparatus }}
         </div>
       </div>
-      <div style="display: flex; justify-content: end">
+      <div style="display: flex; justify-content: flex-end">
         <div class="endInfo">
           <div style="height: 100px">
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
@@ -298,9 +301,9 @@ export default {
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
-    this.getAllDoctorList();
-    this.getPatientCaseHistory();
-    this.getAccessList();
+    // this.getAllDoctorList();
+    // this.getPatientCaseHistory();
+    // this.getAccessList();
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();