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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2186,18 +2186,6 @@
               return
             }
 
-<<<<<<< HEAD
-=======
-        if (this.dayorMonth == 'day') {
-          if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 4) {
-            this.$message.error('当前处方已经结算或者已经上传医保系统,无法保存')
-            return
-          }
-          if (this.doctorValue.length <= 0) {
-            this.$message.error('医生不能为空')
-            return
->>>>>>> fd0a04e2b50dc8a2d5c0ca448691e936f6b6198f
-          }
 
           if (this.dayorMonth == 'day') {
             if (this.curPrescriptions.order_status == 2 ||this.curPrescriptions.order_status == 4 ) {
@@ -2355,81 +2343,81 @@
             this.$refs.saveTemplate.show()
           }
         } else if (this.dayorMonth == 'month') {
-          if (this.isShowDayPrescription) {
-            // if (this.curDayPrescriptions.order_status == 2) {
-            //   this.$message.error('当前处方已经结算,无法保存')
-            //   return
-            // }
-            if (this.doctorValue.length <= 0) {
-              this.$message.error('医生不能为空')
-              return
-            }
-
-            if (this.departmentValue.length <= 0) {
-              this.$message.error('科室不能为空')
-              return
-            }
-
-            if (index == 1) {
-              let params = {
-                patient_id: this.patientInfo.id,
-                diagnose: this.diagnose.join(','),
-                sick_type: this.state1,
-                sick_history: this.state2,
-                doctor: this.doctorValue,
-                department: this.departmentValue,
-                record_date: this.end_time,
-                his_patient_id: this.hisPatientInfo.id,
-                reg_type: this.register_type,
-                p_type: 1
+            if (this.isShowDayPrescription) {
+              // if (this.curDayPrescriptions.order_status == 2) {
+              //   this.$message.error('当前处方已经结算,无法保存')
+              //   return
+              // }
+              if (this.doctorValue.length <= 0) {
+                this.$message.error('医生不能为空')
+                return
               }
 
-              var month_prescriptions = this.deepClone(this.month_prescriptions)
+              if (this.departmentValue.length <= 0) {
+                this.$message.error('科室不能为空')
+                return
+              }
 
-              for (let i = 0; i < month_prescriptions.length; i++) {
-                if (month_prescriptions[i].advices.length > 0 && month_prescriptions[i].project.length == 0) {
-                  month_prescriptions[i]['type'] = 1
-                }
-                if (month_prescriptions[i].advices.length == 0 && month_prescriptions[i].project.length > 0) {
-                  month_prescriptions[i]['type'] = 2
+              if (index == 1) {
+                let params = {
+                  patient_id: this.patientInfo.id,
+                  diagnose: this.diagnose.join(','),
+                  sick_type: this.state1,
+                  sick_history: this.state2,
+                  doctor: this.doctorValue,
+                  department: this.departmentValue,
+                  record_date: this.end_time,
+                  his_patient_id: this.hisPatientInfo.id,
+                  reg_type: this.register_type,
+                  p_type: 1
                 }
 
-                for (let b = 0; b < month_prescriptions[i].advices.length; b++) {
-                  month_prescriptions[i].advices[b].single_dose = month_prescriptions[i].advices[b].single_dose.toString()
-                  month_prescriptions[i].advices[b].prescribing_number = month_prescriptions[i].advices[b].prescribing_number.toString()
-                  month_prescriptions[i].advices[b].retail_price = month_prescriptions[i].advices[b].retail_price.toString()
-                  month_prescriptions[i].advices[b].day = parseInt(month_prescriptions[i].advices[b].day)
+                var month_prescriptions = this.deepClone(this.month_prescriptions)
 
-                }
+                for (let i = 0; i < month_prescriptions.length; i++) {
+                  if (month_prescriptions[i].advices.length > 0 && month_prescriptions[i].project.length == 0) {
+                    month_prescriptions[i]['type'] = 1
+                  }
+                  if (month_prescriptions[i].advices.length == 0 && month_prescriptions[i].project.length > 0) {
+                    month_prescriptions[i]['type'] = 2
+                  }
 
-                for (let b = 0; b < month_prescriptions[i].project.length; b++) {
-                  month_prescriptions[i].project[b].price = month_prescriptions[i].project[b].price.toString()
-                  month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
-                  month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
+                  for (let b = 0; b < month_prescriptions[i].advices.length; b++) {
+                    month_prescriptions[i].advices[b].single_dose = month_prescriptions[i].advices[b].single_dose.toString()
+                    month_prescriptions[i].advices[b].prescribing_number = month_prescriptions[i].advices[b].prescribing_number.toString()
+                    month_prescriptions[i].advices[b].retail_price = month_prescriptions[i].advices[b].retail_price.toString()
+                    month_prescriptions[i].advices[b].day = parseInt(month_prescriptions[i].advices[b].day)
 
-                }
+                  }
+
+                  for (let b = 0; b < month_prescriptions[i].project.length; b++) {
+                    month_prescriptions[i].project[b].price = month_prescriptions[i].project[b].price.toString()
+                    month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
+                    month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
+
+                  }
 
-                for (let b = 0; b < month_prescriptions[i].addition.length; b++) {
-                  month_prescriptions[i].addition[b].id = parseInt(month_prescriptions[i].addition[b].id)
-                  month_prescriptions[i].addition[b].item_id = parseInt(month_prescriptions[i].addition[b].item_id)
-                  month_prescriptions[i].addition[b].price = month_prescriptions[i].addition[b].price.toString()
-                  month_prescriptions[i].addition[b].count = month_prescriptions[i].addition[b].count.toString()
+                  for (let b = 0; b < month_prescriptions[i].addition.length; b++) {
+                    month_prescriptions[i].addition[b].id = parseInt(month_prescriptions[i].addition[b].id)
+                    month_prescriptions[i].addition[b].item_id = parseInt(month_prescriptions[i].addition[b].item_id)
+                    month_prescriptions[i].addition[b].price = month_prescriptions[i].addition[b].price.toString()
+                    month_prescriptions[i].addition[b].count = month_prescriptions[i].addition[b].count.toString()
+                  }
                 }
-              }
 
-              let data = {
-                'prescriptions': month_prescriptions
-              }
-              editHisPrescription(data, params).then(response => {
-                if (response.data.state == 1) {
-                  this.month_prescriptions = month_prescriptions
-                  this.$message.success('编辑成功')
+                let data = {
+                  'prescriptions': month_prescriptions
                 }
-              })
+                editHisPrescription(data, params).then(response => {
+                  if (response.data.state == 1) {
+                    this.month_prescriptions = month_prescriptions
+                    this.$message.success('编辑成功')
+                  }
+                })
 
+              }
             }
-          }
-        }
+          }}
       },
       addTab(targetName) {
         // if (this.curPrescriptions.order_status == 2) {