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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -193,8 +193,8 @@
                 scanStyles: false
               });
             }
-            
-            
+
+
           },500)
         }else{
           const style =
@@ -232,7 +232,7 @@
 
               return false
             } else {
-              
+
               this.balanceAccounts = response.data.data
               let arr = []
               let obj = {
@@ -252,7 +252,7 @@
               }
               let num = 0
               this.balanceAccounts.order_info.map(item => {
-                
+
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
@@ -378,7 +378,7 @@
                         }
                       }
                       that.info.new_detail_list.push(obj)
-                      
+
                     }
                     let num = 0
                     that.info.new_detail_list.map(item => {
@@ -394,24 +394,36 @@
                       if(that.info.transBody.outputlist2[i].aka111 == '07') {
                         console.log('0707007')
                         newTotal += that.info.transBody.outputlist2[i].bka058
-                        that.info.transBody.outputlist2.splice(i, 1);
+                        // that.info.transBody.outputlist2.splice(i, 1);
                       }
                       if(that.info.transBody.outputlist2[i].aka111 == '19'){
                         console.log('191919')
                         newTotal += that.info.transBody.outputlist2[i].bka058
-                        that.info.transBody.outputlist2.splice(i, 1);
+                        // that.info.transBody.outputlist2.splice(i, 1);
                       }
                     }
-                    console.log(1111111111111)
                     let aka111obj = {
                       aka111:'99',
                       bka058:newTotal
                     }
-                    console.log('aka111obj',aka111obj)
                     that.info.transBody.outputlist2.push(aka111obj)
+
+                    for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
+                      if(that.info.transBody.outputlist2[i].aka111 == '07') {
+                        // console.log('0707007')
+                        // newTotal += that.info.transBody.outputlist2[i].bka058
+                        that.info.transBody.outputlist2.splice(i, 1);
+                      }
+                      if(that.info.transBody.outputlist2[i].aka111 == '19'){
+                        // console.log('191919')
+                        // newTotal += that.info.transBody.outputlist2[i].bka058
+                        that.info.transBody.outputlist2.splice(i, 1);
+                      }
+                    }
+
                     console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-                    
+
                   }
                 }
               })
@@ -442,7 +454,7 @@
 
     created() {
       this.org_id = this.$store.getters.xt_user.org_id
-      
+
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -13,20 +13,19 @@
                  <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
                  <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
                </div> -->
-                <!--<el-date-picker-->
-                        <!--v-model="record_date"-->
-                        <!--prefix-icon="el-icon-date"-->
-                        <!--@change="changeTimeTwo"-->
-                        <!--:editable="false"-->
-                        <!--style="width: 150px;"-->
-                        <!--type="date"-->
-                        <!--:picker-options="pickerOptions"-->
-                        <!--placeholder="选择开始时间"-->
-                        <!--align="right"-->
-                        <!--format="yyyy-MM-dd"-->
-                        <!--value-format="yyyy-MM-dd">-->
-                <!--</el-date-picker>-->
-
+                <el-date-picker
+                v-model="record_date"
+                prefix-icon="el-icon-date"
+                @change="changeTimeTwo"
+                :editable="false"
+                style="width: 150px;"
+                type="date"
+                :picker-options="pickerOptions"
+                placeholder="选择开始时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd">
+                </el-date-picker>
 
 
                 <div class="mainCell" style="margin: 10px">
@@ -139,18 +138,6 @@
                                    type="primary">挂号
                         </el-button>
 
-                        <!--<el-button-->
-                        <!--size="small" @click="open(8)" type="primary"-->
-                        <!--&gt;预结算-->
-                        <!--</el-button>-->
-
-
-                        <!--<el-button v-loading="loadingtwo"-->
-                        <!--v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3"-->
-                        <!--size="small"-->
-                        <!--@click="open(4)"-->
-                        <!--type="primary">收费-->
-                        <!--</el-button>-->
 
                         <el-button size="small" @click="open(5)" type="primary"
                                    v-if="this.radio == 2  && this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
@@ -169,16 +156,7 @@
                         >退号
                         </el-button>
 
-                        <!--<el-button-->
-                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
-                        <!--size="small" @click="open(11)" type="primary"-->
-                        <!--&gt;撤销明细-->
-                        <!--</el-button>-->
-
                     </div>
-                    <!--<el-button size="small" @click="query" type="primary"-->
-                    <!--&gt;查询-->
-                    <!--</el-button>-->
 
 
                 </div>
@@ -263,14 +241,14 @@
                                                         </div>
                                                         <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
 
-                                                            <!--<el-button-->
-                                                            <!--v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0) "-->
+                                                            <el-button
+                                                            v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0) "
 
-                                                            <!--size="small"-->
-                                                            <!--@click="open(8,items.med_type,items.prescriptions[0].order)"-->
-                                                            <!--type="primary"-->
-                                                            <!--&gt;预结算-->
-                                                            <!--</el-button>-->
+                                                            size="small"
+                                                            @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                                            type="primary"
+                                                            >预结算
+                                                            </el-button>
 
 
                                                             <el-button v-loading="loadingtwo"
@@ -281,11 +259,11 @@
                                                             </el-button>
 
 
-                                                            <!--<el-button-->
-                                                            <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
-                                                            <!--size="small" @click="open(11)" type="primary"-->
-                                                            <!--&gt;撤销明细-->
-                                                            <!--</el-button>-->
+                                                            <el-button
+                                                            v-if="items.prescriptions[0].order.order_status = 1 && ($store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990)"
+                                                            size="small" @click="open(11)" type="primary"
+                                                            >撤销明细
+                                                            </el-button>
 
                                                         </div>
                                                     </div>
@@ -504,13 +482,13 @@
                                                         </div>
                                                         <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
 
-                                                            <!--<el-button-->
-                                                            <!--v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "-->
-                                                            <!--size="small"-->
-                                                            <!--@click="open(8,items.med_type,items.curMonthPrescriptions.order)"-->
-                                                            <!--type="primary"-->
-                                                            <!--&gt;预结算-->
-                                                            <!--</el-button>-->
+                                                            <el-button
+                                                                    v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "
+                                                                    size="small"
+                                                                    @click="open(8,items.med_type,items.curMonthPrescriptions.order)"
+                                                                    type="primary"
+                                                            >预结算
+                                                            </el-button>
 
 
                                                             <el-button v-loading="loadingtwo"
@@ -522,8 +500,8 @@
 
 
                                                             <el-button
-                                                            v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
-                                                            size="small" @click="open(11)" type="primary"
+                                                                    v-if="items.curMonthPrescriptions.order.order_status == 1 && ($store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990)"
+                                                                    size="small" @click="open(11)" type="primary"
                                                             >撤销明细
                                                             </el-button>
 
@@ -715,6 +693,20 @@
             <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
             <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
         </el-dialog>
+
+
+        <el-dialog title="输入密码" :visible.sync="pwdFormVisible">
+            <el-form :model="form">
+                <el-form-item label="密码" :label-width="20">
+                    <el-input v-model="pwd"  show-password="false"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="pwdFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="comfirmPWDialog">确 定</el-button>
+            </div>
+        </el-dialog>
+
     </div>
 
 </template>
@@ -776,6 +768,8 @@
       return {
         temp_med_type: '',
         dialogVisible: false,
+        pwdFormVisible: false,
+        pwd:"",
         form: {
           p_type: '',
           sick_type: '',
@@ -917,7 +911,11 @@
 
         temp_prescriptions: null,
 
-        temp_ids: ''
+        temp_ids: '',
+
+        other_prescriptions: [],
+
+
 
       }
     },
@@ -940,6 +938,46 @@
       this.getPatientList()
     },
     methods: {
+      comfirmPWDialog(){
+        var that = this
+        axios.get('http://127.0.0.1:9532/api/pwd/check', {
+          params: {
+            "card_pwd":this.pwd,
+            "his_patient_id":this.hisPatientInfo.id,
+            "admin_user_id": this.$store.getters.xt_user.user.id
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                this.pwd = ""
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
+
+              } else {
+                that.pwdFormVisible = false
+                if (that.activeName == 'first') {
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                } else {
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                }
+              }
+
+            }
+          })
+          .catch(function(error) {
+
+          })
+      },
       openDialog(item) {
         this.dialogVisible = true
         this.temp_prescriptions = item
@@ -963,10 +1001,7 @@
       changevalue(val) {
         this.$forceUpdate()
 
-      },  GetDiagnosisName(ids){
-
-
-
+      }, GetDiagnosisName(ids) {
 
       },
       query() {
@@ -1919,7 +1954,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
+                if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -1930,7 +1965,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -1966,7 +2001,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
+                    if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -1978,7 +2013,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -2139,7 +2174,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
+                if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -2150,7 +2185,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -2507,6 +2542,7 @@
         }
       },
       open(index, med_type, order, prescriptions) {
+        this.other_prescriptions = prescriptions
 
         if (index == 1) {
 
@@ -2526,6 +2562,7 @@
           this.treatVisible = true
           // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
+
           this.currentOrder = order
           this.current_med_type = med_type
           if (this.patientInfo.id == 0) {
@@ -2538,57 +2575,24 @@
             return
           }
 
-          // let ids = []
-          // if (this.activeName == 'first') {
-          //   for (let c = 0; c < this.big_prescriptions.length; c++) {
-          //     for (let i = 0; i < this.big_prescriptions[c].prescriptions.length; i++) {
-          //       for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-          //         ids.push(this.prescriptions[i].advices[a].id)
-          //       }
-          //       for (let a = 0; a < this.prescriptions[i].addition.length; a++) {
-          //         ids.push(this.prescriptions[i].addition[a].id)
-          //       }
-          //
-          //       for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-          //         ids.push(this.prescriptions[i].project[a].id)
-          //       }
-          //     }
-          //   }
-          //   if (ids.length == 0) {
-          //     this.$message.error('请先到医生工作站开处方再来结算')
-          //     return
-          //   }
-          //
-          // } else {
-          //
-          //   for (let i = 0; i < this.month_prescriptions.length; i++) {
-          //     for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-          //       ids.push(this.month_prescriptions[i].advices[a].id)
-          //     }
-          //
-          //     for (let a = 0; a < this.month_prescriptions[i].addition.length; a++) {
-          //       ids.push(this.month_prescriptions[i].addition[a].id)
-          //     }
-          //
-          //     for (let a = 0; a < this.month_prescriptions[i].project.length; a++) {
-          //       ids.push(this.month_prescriptions[i].project[a].id)
-          //     }
-          //   }
-          //   if (ids.length == 0) {
-          //     this.$message.error('请先到医生工作站开处方再来结算')
-          //     return
-          //   }
-          // }
+          if (this.hisPatientInfo.id_card_type == 1) {
+            this.pwdFormVisible = true
+            this.pwd = ""
 
-          if (this.activeName == 'first') {
+          }else{
+            if (this.activeName == 'first') {
 
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+
+            } else {
+              this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
+
+            }
 
-          } else {
-            this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
 
           }
 
+
         } else if (index == 5) {
           if (that.hisPatientInfo.balance_accounts_type == 2) {
             let params = {
@@ -2939,7 +2943,8 @@
             'number': this.order.number,
             'patient_id': this.patientInfo.id,
             'record_time': this.record_date,
-            'org_id': this.$store.getters.xt_user.org_id
+            'org_id': this.$store.getters.xt_user.org_id,
+            'his_patient_id':this.hisPatientInfo.id
           }
           axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
             params: params
@@ -2947,12 +2952,11 @@
             .then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.msg)
-                that.loadingtwo = false
                 return false
               } else {
+                that.changeRadioAndPatient(1)
                 // that.$message({ message: '退号成功', type: 'success' })
                 that.$message({ message: '退明细成功', type: 'success', duration: 5000 })
-                that.loadingtwo = false
               }
             })
             .catch(function(error) {
@@ -3430,7 +3434,7 @@
                   this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
                 }
               }
-            }else{
+            } else {
 
               for (let i = 0; i < this.patientTableData.length; i++) {
                 // console.log(this.patientTableData[i])
@@ -3443,8 +3447,6 @@
 
               }
 
-
-
             }
           }
         })
@@ -3565,7 +3567,7 @@
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
+                if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                   isHasUnCharge = true
                 } else {
                   if (this.all_table_data[i].his_patient_id > 0) {
@@ -3576,7 +3578,7 @@
 
                 }
               }
-              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                 isHasUnCharge = true
 
               }
@@ -3612,7 +3614,7 @@
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                    if (this.all_table_data[i].order_status != 2 ||  this.all_table_data[i].order_status != 3) {
+                    if (this.all_table_data[i].order_status != 2 || this.all_table_data[i].order_status != 3) {
                       isHasUnCharge = true
                     } else {
                       if (this.all_table_data[i].his_patient_id > 0) {
@@ -3624,7 +3626,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -3724,7 +3726,7 @@
                       }
                       this.all_table_data.push(obj)
 
-                      if(obj.name == "许德范"){
+                      if (obj.name == '许德范') {
                         console.log(obj)
 
                       }
@@ -3853,7 +3855,7 @@
                     }
 
                   }
-                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 &&  this.all_table_data[i].order_status != 3) {
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
                     isHasUnCharge = true
 
                   }
@@ -4515,7 +4517,7 @@
 
           }
         })
-      },changeTimeTwo(){
+      }, changeTimeTwo() {
         this.getPatientList()
 
       },
@@ -4697,7 +4699,7 @@
                   record_time: this.record_date,
                   admin_user_id: this.$store.getters.xt_user.user.id,
                   patient_id: this.patientInfo.id,
-                  his_patient_id:this.hisPatientInfo.id,
+                  his_patient_id: this.hisPatientInfo.id
 
                 }
               })

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -253,7 +253,7 @@
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
                 execution_frequency: prescription.doctor_advice[b].execution_frequency,
-                retail_price: prescription.doctor_advice[b].price.toString(),
+                // retail_price: prescription.doctor_advice[b].price.toString(),
                 remark: prescription.doctor_advice[b].remark,
                 day:prescription.doctor_advice[b].day,
                 prescribing_number:prescription.doctor_advice[b].prescribing_number.toString(),
@@ -262,8 +262,15 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
-
               };
+              if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              } else if(obj.prescribing_number_unit == prescription.doctor_advice[b].drug.max_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.max_price
+              } else {
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              }
+
               tempAdvice.push(obj)
 
             }
@@ -281,27 +288,21 @@
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
                 total:prescription.project[b].count,
-                price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 unit: prescription.project[b].unit,
                 type: prescription.project[b].type
-
                 // medical_code:prescription.project[b].project.medical_code,
               };
-              console.log(prescription.project[b].type)
               if(prescription.project[b].type == 2){
-                console.log("pre")
-
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
-
+                obj['price'] = prescription.project[b].project.price
               }else if(prescription.project[b].type == 3){
-                console.log("pre2")
-
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
+                obj['price'] = prescription.project[b].good_info.packing_price
               }
 
               tempProject.push(obj)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2524,40 +2524,32 @@
       },
 
       comfirm() {
+        if(this.curStatus == 1  && this.rightTab == 2){
+          for(let i = 0; i < this.curDrugs.length; i++){
+            if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
 
-        // if(this.curStatus == 1  && this.rightTab == 2){
-        //   for(let i = 0; i < this.curDrugs.length; i++){
-        //     if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
-        //
-        //       if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
-        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-        //         return
-        //       }
-        //
-        //       if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //     }else{
-        //
-        //       if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
-        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-        //         return
-        //       }
-        //
-        //       if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //
-        //     }
-        //
-        //   }
-        // }
+              if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
+                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+                return
+              }
+
+              if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+                return
+              }
+
+            }else{
+              if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
+                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+                return
+              }
+              if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+                return
+              }
+            }
+          }
+        }
 
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -310,7 +310,7 @@
                 single_dose: prescription.doctor_advice[b].single_dose,
                 delivery_way: prescription.doctor_advice[b].delivery_way,
                 execution_frequency: prescription.doctor_advice[b].execution_frequency,
-                retail_price: prescription.doctor_advice[b].price.toString(),
+                // retail_price: prescription.doctor_advice[b].price.toString(),
                 remark: prescription.doctor_advice[b].remark,
                 day:prescription.doctor_advice[b].day,
                 prescribing_number:prescription.doctor_advice[b].prescribing_number.toString(),
@@ -320,6 +320,14 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
               };
+
+              if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              } else if(obj.prescribing_number_unit == prescription.doctor_advice[b].drug.max_unit){
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.max_price
+              } else {
+                obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price
+              }
               tempAdvice.push(obj)
 
             }
@@ -336,7 +344,7 @@
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
                 total:prescription.project[b].count.toString(),
-                price:prescription.project[b].price,
+                // price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 unit: prescription.project[b].unit,
                 type: prescription.project[b].type
@@ -348,11 +356,12 @@
                 obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
                 obj['medical_code'] =  prescription.project[b].project.medical_code
                 obj['project_name'] =  prescription.project[b].project.project_name
-
+                obj['price'] = prescription.project[b].project.price
               }else if(prescription.project[b].type == 3){
                 obj['statistical_classification'] = ""
                 obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                 obj['project_name'] =  prescription.project[b].good_info.good_name
+                obj['price'] = prescription.project[b].good_info.packing_price
               }
 
               tempProject.push(obj)

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -256,13 +256,13 @@
                       type="primary"
                       >打印</el-button
                     >
-                  </template>  
+                  </template>
                   <div id='printMain'>
                     <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
                     <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
                     <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
                   </div>
-                
+
             </el-dialog>
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -1449,7 +1449,7 @@
                       single_dose: prescription.advices[b].single_dose,
                       delivery_way: prescription.advices[b].delivery_way,
                       execution_frequency: prescription.advices[b].execution_frequency,
-                      retail_price: prescription.advices[b].price.toString(),
+                      // retail_price: prescription.advices[b].price.toString(),
                       remark: prescription.advices[b].remark,
                       day: prescription.advices[b].day,
                       prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -1459,6 +1459,13 @@
                       id: prescription.advices[b].drug_id,
                       drug:prescription.advices[b].drug
                     };
+                    if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                      obj['retail_price'] =  prescription.advices[b].drug.min_price
+                    } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                      obj['retail_price'] =  prescription.advices[b].drug.max_price
+                    } else {
+                      obj['retail_price'] =  prescription.advices[b].drug.min_price
+                    }
                     tempAdvice.push(obj)
                   }
 
@@ -1474,7 +1481,6 @@
                       execution_frequency: prescription.project[b].execution_frequency,
                       number_days: prescription.project[b].day,
                       total: prescription.project[b].count.toString(),
-                      price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
@@ -1485,11 +1491,16 @@
                       obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
+                      obj['price'] = prescription.project[b].project.price
+
+
 
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
+                      obj['price'] = prescription.project[b].good_info.packing_price
+
                     }
                     tempProject.push(obj)
                   }
@@ -1765,7 +1776,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -1774,8 +1785,14 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
-
                           };
+                          if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                          } else {
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          }
                           tempAdvice.push(obj)
                         }
 
@@ -1791,7 +1808,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -1802,11 +1818,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -1815,9 +1836,6 @@
                         var preTime = nowTime
 
 
-
-
-
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -1836,10 +1854,8 @@
 
                         }else{
 
-                          obj.med_type =  parseInt(prescription.med_type)
+                          obj.med_type = parseInt(prescription.med_type)
                         }
-
-
                         if(obj.med_type== 0 || obj.med_type == "") {
                           if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
                             obj.med_type = 13
@@ -2193,7 +2209,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -2202,8 +2218,14 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
-
                           };
+                          if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                          } else {
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          }
                           tempAdvice.push(obj)
                         }
 
@@ -2219,7 +2241,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -2230,11 +2251,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -2242,6 +2268,7 @@
 
                         var preTime = nowTime
 
+
                         let index = i + 1;
                         let obj = {
                           id: 0,
@@ -2260,10 +2287,8 @@
 
                         }else{
 
-                          obj.med_type =  parseInt(prescription.med_type)
+                          obj.med_type = parseInt(prescription.med_type)
                         }
-
-
                         if(obj.med_type== 0 || obj.med_type == "") {
                           if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
                             obj.med_type = 13
@@ -2615,7 +2640,7 @@
                             single_dose: prescription.advices[b].single_dose,
                             delivery_way: prescription.advices[b].delivery_way,
                             execution_frequency: prescription.advices[b].execution_frequency,
-                            retail_price: prescription.advices[b].price.toString(),
+                            // retail_price: prescription.advices[b].price.toString(),
                             remark: prescription.advices[b].remark,
                             day: prescription.advices[b].day,
                             prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -2624,8 +2649,14 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug:prescription.advices[b].drug
-
                           };
+                          if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                            obj['retail_price'] =  prescription.advices[b].drug.max_price
+                          } else {
+                            obj['retail_price'] =  prescription.advices[b].drug.min_price
+                          }
                           tempAdvice.push(obj)
                         }
 
@@ -2641,7 +2672,6 @@
                             execution_frequency: prescription.project[b].execution_frequency,
                             number_days: prescription.project[b].day,
                             total: prescription.project[b].count.toString(),
-                            price: prescription.project[b].price,
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].project.unit,
@@ -2652,11 +2682,16 @@
                             obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
+                            obj['price'] = prescription.project[b].project.price
+
+
 
                           } else if (prescription.project[b].type == 3) {
                             obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                             obj['project_name'] = prescription.project[b].good_info.good_name
+                            obj['price'] = prescription.project[b].good_info.packing_price
+
                           }
                           tempProject.push(obj)
                         }
@@ -3092,7 +3127,7 @@
                           single_dose: prescription.advices[b].single_dose,
                           delivery_way: prescription.advices[b].delivery_way,
                           execution_frequency: prescription.advices[b].execution_frequency,
-                          retail_price: prescription.advices[b].price.toString(),
+                          // retail_price: prescription.advices[b].price.toString(),
                           remark: prescription.advices[b].remark,
                           day: prescription.advices[b].day,
                           prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -3101,8 +3136,14 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug:prescription.advices[b].drug
-
                         };
+                        if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                          obj['retail_price'] =  prescription.advices[b].drug.min_price
+                        } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                          obj['retail_price'] =  prescription.advices[b].drug.max_price
+                        } else {
+                          obj['retail_price'] =  prescription.advices[b].drug.min_price
+                        }
                         tempAdvice.push(obj)
                       }
 
@@ -3118,7 +3159,6 @@
                           execution_frequency: prescription.project[b].execution_frequency,
                           number_days: prescription.project[b].day,
                           total: prescription.project[b].count.toString(),
-                          price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
@@ -3129,11 +3169,16 @@
                           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
+                          obj['price'] = prescription.project[b].project.price
+
+
 
                         } else if (prescription.project[b].type == 3) {
                           obj['statistical_classification'] = ""
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
+                          obj['price'] = prescription.project[b].good_info.packing_price
+
                         }
                         tempProject.push(obj)
                       }
@@ -3141,6 +3186,7 @@
 
                       var preTime = nowTime
 
+
                       let index = i + 1;
                       let obj = {
                         id: 0,
@@ -3513,7 +3559,7 @@
                         single_dose: prescription.advices[b].single_dose,
                         delivery_way: prescription.advices[b].delivery_way,
                         execution_frequency: prescription.advices[b].execution_frequency,
-                        retail_price: prescription.advices[b].price.toString(),
+                        // retail_price: prescription.advices[b].price.toString(),
                         remark: prescription.advices[b].remark,
                         day: prescription.advices[b].day,
                         prescribing_number: prescription.advices[b].prescribing_number.toString(),
@@ -3522,8 +3568,14 @@
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
                         drug:prescription.advices[b].drug
-
                       };
+                      if (obj.prescribing_number_unit == prescription.advices[b].drug.min_unit){
+                        obj['retail_price'] =  prescription.advices[b].drug.min_price
+                      } else if(obj.prescribing_number_unit == prescription.advices[b].drug.max_unit){
+                        obj['retail_price'] =  prescription.advices[b].drug.max_price
+                      } else {
+                        obj['retail_price'] =  prescription.advices[b].drug.min_price
+                      }
                       tempAdvice.push(obj)
                     }
 
@@ -3539,7 +3591,6 @@
                         execution_frequency: prescription.project[b].execution_frequency,
                         number_days: prescription.project[b].day,
                         total: prescription.project[b].count.toString(),
-                        price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
@@ -3550,11 +3601,16 @@
                         obj['statistical_classification'] = prescription.project[b].project.statistical_classification
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
+                        obj['price'] = prescription.project[b].project.price
+
+
 
                       } else if (prescription.project[b].type == 3) {
                         obj['statistical_classification'] = ""
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['price'] = prescription.project[b].good_info.packing_price
+
                       }
                       tempProject.push(obj)
                     }
@@ -3581,7 +3637,7 @@
 
                     }else{
 
-                      obj.med_type =  parseInt(prescription.med_type)
+                      obj.med_type = parseInt(prescription.med_type)
                     }
                     if(obj.med_type== 0 || obj.med_type == "") {
                       if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
@@ -3861,7 +3917,7 @@
               this.tableData2 = arr2
               this.tableData4 = arr4
               this.tableData3 = [arr3[0]]
-              
+
             }else{
               var list = response.data.data.list
               let arr = []
@@ -3874,10 +3930,10 @@
               }
               console.log('arrrrrrrrrr',arr)
               this.selecting_schs = arr
-              
+
               this.savePrint()
             }
-            
+
           }
         })
       },
@@ -3938,7 +3994,7 @@
           };
           this.paramsObj = obj1;
         }
-        
+
         //治疗
         var arr2 = [];
         if(this.selecting_schs2.length > 0){
@@ -3968,10 +4024,10 @@
           };
           this.paramsObj3 = obj3;
         }
-          
-        
-        
-        
+
+
+
+
         this.innerVisible = true
 
         // if(this.index == 20){

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1263,39 +1263,39 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
-        // if(this.curStatus == 1  && this.rightTab == 2){
-        //   for(let i = 0; i < this.curDrugs.length; i++){
-        //     if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
-        //
-        //       if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
-        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-        //         return
-        //       }
-        //
-        //       if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //     }else{
-        //
-        //       if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
-        //         this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
-        //         return
-        //       }
-        //
-        //       if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
-        //         this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-        //         return
-        //       }
-        //
-        //
-        //
-        //     }
-        //
-        //   }
-        // }
+        if(this.curStatus == 1  && this.rightTab == 2){
+          for(let i = 0; i < this.curDrugs.length; i++){
+            if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028){
+
+              if(this.curPrescriptions.med_type != 13 && this.curDrugs[i].drug.is_special_diseases == 1){
+                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+                return
+              }
+
+              if(this.curPrescriptions.med_type == 13 && this.curDrugs[i].drug.is_special_diseases != 1){
+                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+                return
+              }
+
+
+            }else{
+
+              if(this.curPrescriptions.med_type != 14 && this.curDrugs[i].drug.is_special_diseases == 1){
+                this.$message.error('该处方不属于特病类型处方，无法开特病类型的药')
+                return
+              }
+
+              if(this.curPrescriptions.med_type == 14 && this.curDrugs[i].drug.is_special_diseases != 1){
+                this.$message.error('该处方属于特病类型处方，开非特病类型的药')
+                return
+              }
+
+
+
+            }
+
+          }
+        }
 
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')

src/xt_pages/user/dialysisSolution.vue

@@ -533,13 +533,13 @@
             </el-form-item>
           </el-col>
 
-          
+
            <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
              <el-form-item label="吸氧流量(L/分)：">
                 <el-input v-model="addPlan.oxygen_flow"></el-input>
              </el-form-item>
           </el-col>
-         
+
          <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
              <el-form-item label="吸氧时长(h）：">
                 <el-input v-model="addPlan.oxygen_time"></el-input>
@@ -551,10 +551,63 @@
               <el-input v-model="addPlan.target_ktv"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
 
-    
-    
+
+          <el-col :span="8" v-if="isShows('透析管路')">
+            <el-form-item label="透析管路:">
+              <el-select v-model="addPlan.hemodialysis_pipelines" >
+                <el-option
+                        v-for="item in hemodialysisPipelinesOptions"
+                        :label="item.name"
+                        :key="item.id"
+                        :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('透析管路支数')">
+            <el-form-item label="透析管路支数">
+              <el-input v-model="addPlan.hemodialysis_pipelines_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="8" v-if="isShows('穿刺针')">
+            <el-form-item label="穿刺针:">
+              <el-input v-model="addPlan.puncture_needle" @focus="showInnerDialog('10')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="8" v-if="isShows('穿刺针支数')">
+            <el-form-item label="穿刺针支数">
+              <el-input v-model="addPlan.puncture_needle_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('促红素')">
+            <el-form-item label="促红素:">
+              <el-select v-model="addPlan.epo" @change="changeBodyFluid">
+                <el-option
+                        v-for="item in epo"
+                        :label="item.name"
+                        :key="item.id"
+                        :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('促红素支数')">
+            <el-form-item label="促红素支数">
+              <el-input v-model="addPlan.epo_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
 
 
         <el-row :gutter="24">
@@ -665,6 +718,9 @@ export default {
       callback()
     }
     return {
+      hemodialysisPipelinesOptions:[],
+      punctureNeedleOptions:[],
+      epoOptions:[],
       zhiShow:false,
       huShow:false,
       totalShow:false,
@@ -751,6 +807,14 @@ export default {
         oxygen_flow:"",
         oxygen_time:"",
 
+        hemodialysis_pipelines:'',
+        hemodialysis_pipelines_count:'',
+        puncture_needle:"",
+        puncture_needle_count:"",
+        epo:"",
+        epo_count:"",
+
+
       },
       childPlan: {
         mode: '',
@@ -966,7 +1030,7 @@ export default {
 
           break
         case '8':
-         
+
           this.InnerDialogProps.values = this.plasmaSeparatorList
           this.InnerDialogProps.titles = '血浆分离器'
           this.InnerDialogProps.type = 'plasma_separator'
@@ -975,13 +1039,23 @@ export default {
 
           break
          case '9':
-         
+
           this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
           this.InnerDialogProps.titles = '胆红素吸附柱'
           this.InnerDialogProps.type = 'bilirubin_adsorption_column'
           this.InnerDialogProps.selected = this.addPlan.bilirubin_adsorption_column
           this.InnerDialogProps.isShowTextArea = false
 
+          break
+
+        case '10':
+
+          this.InnerDialogProps.values = this.punctureNeedleOptions
+          this.InnerDialogProps.titles = '穿刺针'
+          this.InnerDialogProps.type = 'puncture_needle'
+          this.InnerDialogProps.selected = this.addPlan.puncture_needle
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
@@ -1004,6 +1078,9 @@ export default {
         case 'bilirubin_adsorption_column':
           this.addPlan.bilirubin_adsorption_column = val.value.join(',')
           break
+        case 'puncture_needle':
+          this.addPlan.puncture_needle = val.value.join(',')
+          break
       }
     },
     innerDialogCancle: function() {
@@ -1315,8 +1392,7 @@ export default {
           }
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
-          console.log("2233333",this.addPlan)
-          
+
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1440,6 +1516,9 @@ export default {
       this.addPlan.kalium = row.kalium.toString()
       this.addPlan.sodium = row.sodium.toString()
       this.addPlan.calcium = row.calcium.toString()
+
+
+
       this.addPlan.bicarbonate = row.bicarbonate.toString()
       this.addPlan.glucose = row.glucose.toString()
       this.addPlan.dialysate_flow = row.dialysate_flow.toString()
@@ -1447,6 +1526,14 @@ export default {
       this.addPlan.conductivity = row.conductivity.toString()
       this.addPlan.remark = row.remark
 
+      this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
+      this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      this.addPlan.puncture_needle  = row.puncture_needle
+      this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      this.addPlan.epo  = row.epo
+      this.addPlan.epo_count  = row.epo_count.toString()
+
+
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       this.addPlan.plasma_separator = row.plasma_separator.toString()
       this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
@@ -1553,6 +1640,15 @@ export default {
         ultrafiltration: '',
         blood_access: '',
 
+
+        hemodialysis_pipelines:'',
+        hemodialysis_pipelines_count:'',
+        puncture_needle:"",
+        puncture_needle_count:"",
+        epo:"",
+        epo_count:"",
+
+
         dialysis_duration: '3.30',
         dialysis_duration_hour: '3',
         dialysis_duration_minute: '30',
@@ -1803,6 +1899,14 @@ export default {
               oxygen_time:"",
               oxygen_uptake:"",
               oxygen_flow:"",
+
+              hemodialysis_pipelines:'',
+              hemodialysis_pipelines_count:'',
+              puncture_needle:"",
+              puncture_needle_count:"",
+              epo:"",
+              epo_count:"",
+
             }
 
             for (const key in tempAddPlan) {
@@ -1884,6 +1988,9 @@ export default {
       })
       this.$router.back(-1)
     }
+    this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
+    this.punctureNeedleOptions =  getDataConfig('hemodialysis', 'puncture_needle')
+    this.epoOptions =getDataConfig('hemodialysis', 'epo')
 
     this.GetDeviceData()
     this.fetchAllAdminUsers()