3月5

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -381,7 +381,7 @@
                         style="width: 100px; text-align: center"
                       >
                       <span v-if="org_id==10580 || org_id==0">
-                        {{ dialysisOrder.puncture_needle}}
+                        <!-- {{ dialysisOrder.puncture_needle}} -->
                       </span>
                       <span v-if="org_id != 10580 && org_id!=0">
                         {{
@@ -404,7 +404,7 @@
                         style="width: 100px; text-align: center"
                       >
                       <span v-if="org_id==10580 || org_id==0">
-                        {{ dialysisOrder.puncture_needle}}
+                        <!-- {{ dialysisOrder.puncture_needle}} -->
                       </span>
                       <span v-if="org_id != 10580 && org_id!=0">
                         {{
@@ -1576,12 +1576,12 @@
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629  || org_id == 0">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
-                        <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
-                        <td width="50" v-if="org_id == 10598 || org_id == 0">护士签名</td>
+                        <td width="50" v-if="org_id == 10490 ">碳酸氢钠<br />(ml)</td>
+                        <td width="50" v-if="org_id == 10598 ">护士签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -1705,16 +1705,16 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==0">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
                           {{ monitor.accumulated_blood_volume? monitor.accumulated_blood_volume:"" }}
                         </td>
-                        <td width="50" v-if="org_id ==10490 || org_id == 0">
+                        <td width="50" v-if="org_id ==10490 ">
                           {{ monitor.dicarbonate?monitor.dicarbonate:"" }}
                         </td>
-                        <td width="50" v-if="org_id == 10598 || org_id == 0">
+                        <td width="50" v-if="org_id == 10598 ">
                           <span v-if="monitor.creator == 0">
                             <span
                             v-if="setAdminUserES(monitor.modify) == ''"

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -277,7 +277,7 @@
                                   <el-input style="width:50%;" @input="searchAction"
                                             @keyup.enter.native='searchAction'
                                             v-model.trim="search_keyword"
-                                            placeholder="请输入药品名字"></el-input>
+                                            placeholder="请输入药品名字" :clearable="true"></el-input>
                                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder=""
                                              @change="changeKind">
                                       <el-option
@@ -393,7 +393,7 @@
                                   <el-input style="width:50%;" @input="searchProjectAction"
                                             @keyup.enter.native='searchProjectAction'
                                             v-model.trim="search_project_keyword"
-                                            placeholder="请输入项目名称"></el-input>
+                                            placeholder="请输入项目名称" :clearable="true"></el-input>
 
                                   <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                                              @change="changeClass">
@@ -1752,23 +1752,34 @@ export default {
       }
       this.$refs.additionalCharges.hide()
 
-    }, searchProjectAction() {
+    }, 
+    // 项目
+    searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
-      console.log('5555',this.tabProject)
-      console.log('6666',this.allProject)
-      // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
+      const tabProjects = this.allProject
+      console.log('4444',tabProjects)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
       } else {
         let arr = []
-        for (let i = 0; i < this.tabProject.length; i++) {
+
+        for (let i = 0; i < tabProjects.length; i++) {
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
-              arr = arr.concat(this.tabProject[i])
+            if (tabProjects[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+                tabProjects[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(tabProjects[i])
             }
 
         }
+
+        // for (let i = 0; i < this.tabProject.length; i++) {
+        //     // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+        //     if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+        //     this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+        //       arr = arr.concat(this.tabProject[i])
+        //     }
+
+        // }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);
       }
@@ -1788,22 +1799,34 @@ export default {
       }
 
     },
+    // 药品
     searchAction() {
+      const drug2 =this.allDrugs
+      console.log('this.allDrugs',drug2);
       if (this.search_keyword.length == 0) {
         this.drugs = this.allDrugs
       } else {
+       
         let arr = []
-        for (let i = 0; i < this.drugs.length; i++) {
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        for (let i = 0; i < drug2.length; i++) {
+          if (drug2[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            drug2[i].wubi.indexOf(this.search_keyword) != -1 ||
+            drug2[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            drug2[i].first_letter.indexOf(this.search_keyword) != -1
            ) {
-            arr = arr.concat(this.drugs[i])
+            arr = arr.concat(drug2[i])
           }
         }
+        // for (let i = 0; i < this.drugs.length; i++) {
+        //   if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        //    ) {
+        //     arr = arr.concat(this.drugs[i])
+        //   }
+        // }
         this.drugs = arr
-
       }
 
     },
@@ -3877,6 +3900,8 @@ export default {
       getHisProject().then(response => {
         if (response.data.state == 1) {
           var project = response.data.data.project
+          // this.tabProject = project
+          console.log('zzzzzzzzzz',project);
           for (let i = 0; i < project.length; i++) {
             let obj = {
               id: project[i].id,
@@ -3899,7 +3924,6 @@ export default {
               bbx01:project[i].bbx01,
               zuobiao_stock_num:0,
               number:""
-
             }
             this.tabProject.push(obj)
           }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -6,7 +6,6 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-
         <el-date-picker
           v-model="record_date"
           prefix-icon="el-icon-date"
@@ -313,7 +312,17 @@
           <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'
                       :newHisPatient="hisPatientInfo"></checkPrint>
         </div>
-
+        <template>
+          <el-button
+            style="float:right;"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+          >打印
+          </el-button
+          >
+        </template>
       </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -510,7 +519,6 @@
           </div>
         </div>
       </div>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="startVisibility = false">取 消</el-button>
       </span>
@@ -981,7 +989,7 @@ export default {
 
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
-            console.log('hahhahahahahahahah', response.data.data.list_two)
+            // console.log('hahhahahahahahahah', response.data.data.list_two)
             //未就诊
             if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
               let obj = {

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -136,7 +136,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
                       </template>
                     </div>
 
@@ -195,7 +195,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span><span>{{ it.advice_desc}} </span>
                       </template>
                     </div>
 
@@ -558,20 +558,17 @@ export default{
     },
     getPrescriptionPrint() {
       var params = {
-        // patient_id:this.patient_id,
-        // record_date:this.record_date,
-        // prescription_id:this.prescription_id,
         patient_id: this.patient_id,
         record_date: this.record_date,
         prescription_id: this.prescription_id,
         ids: this.ids,
         p_type: 2,
       };
-      console.log("params", params);
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
           console.log("adviceprint9999", advicePrint);
+          console.log("response.data.data", response.data.data);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
 
@@ -602,10 +599,10 @@ export default{
           }
         }
         
-          console.log('4444444',this.advicePrint);
+          // console.log('4444444',this.advicePrint);
         //  console.log('55555555',this.arr);
 
-          console.log(this.doctorList_1, "医生列表");
+          // console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
             for (var index = 0; index < operatorsLen; index++) {
@@ -617,12 +614,12 @@ export default{
             }
           }
 
-          console.log("处方222222", this.prescriptions);
+          // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          console.log("hisPatient", hisPatient);
+          // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", projectlist);
+          // console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
         }
       });
@@ -658,7 +655,7 @@ export default{
       return name;
     },
     getTotalOne(id) {
-      console.log('999999999',this.prescriptions);
+      // console.log('999999999',this.prescriptions);
       var total = 0;
       var addtotal = 0;
       var zimuyao = 0;