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

src/api/his/his.js

@@ -554,5 +554,13 @@ export function getMonthHisPateintInfo(params) {
 
 
 
+export function getAllOrders(params) {
+  return request({
+    url: "/api/orders",
+    method: "get",
+    params:params,
+  });
+}
+
 
 

src/api/project/project.js

@@ -454,10 +454,10 @@ export function getAllDePartmentList(params){
   })
 }
 
-export function getPrescriptionList(id,p_type){
+export function getPrescriptionList(id,p_type,record_date){
 
   return request({
-    url:"/api/hispatient/getprescription?patient_id="+id+"&p_type="+p_type,
+    url:"/api/hispatient/getprescription?patient_id="+id+"&p_type="+p_type+"&record_date="+record_date,
     method:"Get",
   })
 }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -433,7 +433,7 @@
       },
       openPrint() {
         // this.centerDialogVisible = true
-        this.getPrescriptionList(this.patientInfo.id)
+        this.getPrescriptionList(this.patientInfo.id, this.record_date)
       },
       allCheck() {
         this.$refs.multipleTable1.toggleAllSelection()
@@ -4178,7 +4178,7 @@
           this.$refs.prescriptions.open(1, this.saveLoading)
         } else if (index == 2) {
 
-          this.getPrescriptionList(this.patientInfo.id, 1)
+          this.getPrescriptionList(this.patientInfo.id,this.record_date, 1)
           // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
@@ -4186,11 +4186,11 @@
           this.$refs.prescriptions.open(4)
         } else if (index == 6) {
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-          this.getPrescriptionList(this.patientInfo.id, 2)
+          this.getPrescriptionList(this.patientInfo.id,this.record_date, 2)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
         } else if (index == 20) {
-          this.getPrescriptionList(this.patientInfo.id, 2, 3)
+          this.getPrescriptionList(this.patientInfo.id,this.record_date, 2, 3)
         }
 
       },
@@ -4229,8 +4229,8 @@
         this.prescription_id = data
       },
 
-      getPrescriptionList(id, type, checkType) {
-        getPrescriptionList(id, 2).then(response => {
+      getPrescriptionList(id,record_date, type, checkType) {
+        getPrescriptionList(id, 2,record_date).then(response => {
           if (response.data.state == 1) {
             if (checkType != 3) {
               this.centerDialogVisible = true