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

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -293,6 +293,9 @@
         }, {
           value: 4,
           label: '电子凭证'
+        },{
+          value: 5,
+          label: '人脸识别'
         }],
         settlement: [
           { value: 1, label: '医保' },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1752,7 +1752,7 @@ export default {
       }
       this.$refs.additionalCharges.hide()
 
-    }, 
+    },
     // 项目
     searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
@@ -1806,7 +1806,7 @@ export default {
       if (this.search_keyword.length == 0) {
         this.drugs = this.allDrugs
       } else {
-       
+
         let arr = []
         for (let i = 0; i < drug2.length; i++) {
           if (drug2[i].drug_name.indexOf(this.search_keyword) != -1 ||
@@ -3683,173 +3683,373 @@ export default {
       //   }
       // }
 
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        if (this.prescriptions[i].name == this.editableTabsValue) {
-          var temp = this.deepClone(this.curDrugs)
-          var temp2 = this.deepClone(this.teamList)
-
-          var temp3 = this.deepClone(templateDrugs)
-          if (temp3.length > 0) {
-            for (let b = 0; b < temp3.length; b++) {
-              let obj = {
-                advice_id: 0,
-                id: temp3[b].id,
-                drug_name: temp3[b].advice_name,
-                single_dose: temp3[b].single_dose.toString(),
-                delivery_way: temp3[b].delivery_way,
-                execution_frequency: temp3[b].execution_frequency,
-                retail_price: temp3[b].drug.retail_price.toString(),
-                remark: '',
-                day: '1',
-                prescribing_number: temp3[b].prescribing_number,
-                single_dose_unit: temp3[b].drug.drug_dose_unit,
-                prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
-                medical_insurance_number: temp3[b].drug.medical_insurance_number
-              }
 
-              if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
-                obj.prescribing_number = 1
-              }
-
-              this.prescriptions[i].advices.push(obj)
+      //大丰限制用药提醒逻辑
+      var temp = this.deepClone(this.curDrugs)
+      console.log("-----~~~~")
+      console.log(temp)
+      console.log("-----~~~~")
+
+      let limit_remark = ""
+      if (temp.length > 0) {
+        for (let b = 0; b < temp.length; b++) {
+          if(temp[b].limit_remark.length > 0){
+            if(limit_remark.length == 0){
+              limit_remark = temp[b].limit_remark
+            }else{
+              limit_remark = limit_remark +  "\n" + temp[b].limit_remark
             }
-            this.curStatus = 1
+
           }
+        }
+      }
+      if((limit_remark.length > 0 && this.org_id == 10217)){
+        this.$confirm(limit_remark, '限制用药提醒', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            if (this.prescriptions[i].name == this.editableTabsValue) {
+              var temp = this.deepClone(this.curDrugs)
+              var temp2 = this.deepClone(this.teamList)
 
-          let index = 0
+              var temp3 = this.deepClone(templateDrugs)
+              if (temp3.length > 0) {
+                for (let b = 0; b < temp3.length; b++) {
+                  let obj = {
+                    advice_id: 0,
+                    id: temp3[b].id,
+                    drug_name: temp3[b].advice_name,
+                    single_dose: temp3[b].single_dose.toString(),
+                    delivery_way: temp3[b].delivery_way,
+                    execution_frequency: temp3[b].execution_frequency,
+                    retail_price: temp3[b].drug.retail_price.toString(),
+                    remark: '',
+                    day: '1',
+                    prescribing_number: temp3[b].prescribing_number,
+                    single_dose_unit: temp3[b].drug.drug_dose_unit,
+                    prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
+                    medical_insurance_number: temp3[b].drug.medical_insurance_number
+                  }
 
-          if (this.curPrescriptions.advices.length > 0) {
-            index = this.curPrescriptions.advices.length
-          }
+                  if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                    obj.prescribing_number = 1
+                  }
 
-          if (temp.length > 0) {
-            for (let b = 0; b < temp.length; b++) {
-              if(temp[b].max_unit == temp[b].min_unit){
-                temp[b].retail_price = temp[b].min_price
+                  this.prescriptions[i].advices.push(obj)
+                }
+                this.curStatus = 1
               }
-              let temp_index = 0
-              if(this.org_id == 0 || this.org_id == 10206){
 
-                 temp_index  = Math.floor(Math.random() * 90 + 10);
-              }else{
-                 temp_index = b + 1
+              let index = 0
+
+              if (this.curPrescriptions.advices.length > 0) {
+                index = this.curPrescriptions.advices.length
               }
-              let obj = {
-                advice_id: 0,
-                id: temp[b].id,
-                drug_name: temp[b].drug_name,
-                single_dose: temp[b].single_dose,
-                delivery_way: temp[b].delivery_way,
-                execution_frequency: temp[b].execution_frequency,
-                retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
-                remark: '',
-                day: temp[b].drug_day ? temp[b].drug_day : 1,
-                prescribing_number: temp[b].prescribing_number,
-                single_dose_unit: temp[b].dose_unit,
-                prescribing_number_unit: temp[b].prescribing_number_unit,
-                medical_insurance_number: temp[b].medical_insurance_number,
-                drug: temp[b],
-                groupno: index + temp_index,
-                hosp_appr_flag: '1',
-                execution_state:2,
 
+              if (temp.length > 0) {
+                for (let b = 0; b < temp.length; b++) {
+                  if(temp[b].max_unit == temp[b].min_unit){
+                    temp[b].retail_price = temp[b].min_price
+                  }
+                  let temp_index = 0
+                  if(this.org_id == 0 || this.org_id == 10206){
+
+                    temp_index  = Math.floor(Math.random() * 90 + 10);
+                  }else{
+                    temp_index = b + 1
+                  }
+                  let obj = {
+                    advice_id: 0,
+                    id: temp[b].id,
+                    drug_name: temp[b].drug_name,
+                    single_dose: temp[b].single_dose,
+                    delivery_way: temp[b].delivery_way,
+                    execution_frequency: temp[b].execution_frequency,
+                    retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
+                    remark: '',
+                    day: temp[b].drug_day ? temp[b].drug_day : 1,
+                    prescribing_number: temp[b].prescribing_number,
+                    single_dose_unit: temp[b].dose_unit,
+                    prescribing_number_unit: temp[b].prescribing_number_unit,
+                    medical_insurance_number: temp[b].medical_insurance_number,
+                    drug: temp[b],
+                    groupno: index + temp_index,
+                    hosp_appr_flag: '1',
+                    execution_state:2,
+
+
+                  }
+                  if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                    obj.prescribing_number = 1
+                  }
+                  // 针对灵山圣康
+                  if(this.org_id == 0 || this.org_id ==10375){
+                    if(this.prescriptions[i]!=null){
+                      console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
+                      if(this.prescriptions[i].advices.length >=5){
+
+                        this.$message.error("添加条数已经大于5条,添加失败!")
+                        return false
+                      }
+
+
+                    }
+                  }
+                  this.prescriptions[i].advices.push(obj)
+                }
+                this.curStatus = 1
 
               }
-              if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
-                obj.prescribing_number = 1
-              }
-               // 针对灵山圣康
-               if(this.org_id == 0 || this.org_id ==10375){
-                if(this.prescriptions[i]!=null){
-                  console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
-                  if(this.prescriptions[i].advices.length >=5){
-
-                    this.$message.error("添加条数已经大于5条,添加失败!")
-                    return false
+
+              if (temp2.length > 0) {
+                for (let b = 0; b < temp2.length; b++) {
+                  let obj = {
+                    id: 0,
+                    project_id: temp2[b].id,
+                    project_name: temp2[b].project_name,
+                    statistical_classification: '',
+                    single_dose: temp2[b].single_dose.toString(),
+                    delivery_way: temp2[b].delivery_way,
+                    execution_frequency: temp2[b].execution_frequency,
+                    number_days: temp2[b].number_days.toString(),
+                    total: temp2[b].cus_total,
+                    price: temp2[b].price,
+                    remark: '',
+                    medical_code: temp2[b].medical_code,
+                    type: temp2[b].type,
+                    execution_state:2,
+
                   }
-                  
-                  
+
+                  if (temp2[b].type == 2){
+                    obj['project'] = temp2[b].project
+                    obj['unit'] = temp2[b].project.unit
+
+
+                  }else if(temp2[b].type == 3){
+                    obj['good_info'] = temp2[b].good_info
+                    obj['unit'] = temp2[b].good_info.packing_unit
+
+
+                  }
+                  if (temp2[b].team_id == undefined) {
+                    obj['team_id'] = 0
+                  } else {
+                    obj['team_id'] = temp2[b].team_id
+                  }
+                  if (obj.total == 0 || obj.total == undefined) {
+                    obj.total = 1
+                  }
+                  if (obj.type == 3) {
+                    obj.single_dose = 1
+                  }
+                  // 针对灵山圣康
+                  if(this.org_id == 0 || this.org_id ==10375){
+                    if(this.prescriptions[i]!=null){
+                      if(this.prescriptions[i].project.length >=5){
+                        this.$message.error("添加条数已经大于5条,添加失败!")
+                        return false
+                      }
+
+
+                    }
+                  }
+                  this.prescriptions[i].project.push(obj)
                 }
+                this.curStatus = 2
               }
-              this.prescriptions[i].advices.push(obj)
-            }
-            this.curStatus = 1
 
+              this.curPrescriptions = this.prescriptions[i]
+
+
+
+
+
+              this.$refs.multipleTable.clearSelection()
+              this.$refs.tables.clearSelection()
+              this.clearSelection()
+
+            }
           }
+          this.curDrugs = []
+          this.preDrugs = []
+          this.teamList = []
+        }).catch(() => {
+
+        })
+      }else{
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].name == this.editableTabsValue) {
+            var temp = this.deepClone(this.curDrugs)
+            var temp2 = this.deepClone(this.teamList)
 
-          if (temp2.length > 0) {
-            for (let b = 0; b < temp2.length; b++) {
-              let obj = {
-                id: 0,
-                project_id: temp2[b].id,
-                project_name: temp2[b].project_name,
-                statistical_classification: '',
-                single_dose: temp2[b].single_dose.toString(),
-                delivery_way: temp2[b].delivery_way,
-                execution_frequency: temp2[b].execution_frequency,
-                number_days: temp2[b].number_days.toString(),
-                total: temp2[b].cus_total,
-                price: temp2[b].price,
-                remark: '',
-                medical_code: temp2[b].medical_code,
-                type: temp2[b].type,
-                execution_state:2,
+            var temp3 = this.deepClone(templateDrugs)
+            if (temp3.length > 0) {
+              for (let b = 0; b < temp3.length; b++) {
+                let obj = {
+                  advice_id: 0,
+                  id: temp3[b].id,
+                  drug_name: temp3[b].advice_name,
+                  single_dose: temp3[b].single_dose.toString(),
+                  delivery_way: temp3[b].delivery_way,
+                  execution_frequency: temp3[b].execution_frequency,
+                  retail_price: temp3[b].drug.retail_price.toString(),
+                  remark: '',
+                  day: '1',
+                  prescribing_number: temp3[b].prescribing_number,
+                  single_dose_unit: temp3[b].drug.drug_dose_unit,
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
+                  medical_insurance_number: temp3[b].drug.medical_insurance_number
+                }
+
+                if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                  obj.prescribing_number = 1
+                }
 
+                this.prescriptions[i].advices.push(obj)
               }
+              this.curStatus = 1
+            }
 
-              if (temp2[b].type == 2){
-                obj['project'] = temp2[b].project
-                obj['unit'] = temp2[b].project.unit
+            let index = 0
 
+            if (this.curPrescriptions.advices.length > 0) {
+              index = this.curPrescriptions.advices.length
+            }
 
-              }else if(temp2[b].type == 3){
-                obj['good_info'] = temp2[b].good_info
-                obj['unit'] = temp2[b].good_info.packing_unit
+            if (temp.length > 0) {
+              for (let b = 0; b < temp.length; b++) {
+                if(temp[b].max_unit == temp[b].min_unit){
+                  temp[b].retail_price = temp[b].min_price
+                }
+                let temp_index = 0
+                if(this.org_id == 0 || this.org_id == 10206){
 
+                  temp_index  = Math.floor(Math.random() * 90 + 10);
+                }else{
+                  temp_index = b + 1
+                }
+                let obj = {
+                  advice_id: 0,
+                  id: temp[b].id,
+                  drug_name: temp[b].drug_name,
+                  single_dose: temp[b].single_dose,
+                  delivery_way: temp[b].delivery_way,
+                  execution_frequency: temp[b].execution_frequency,
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
+                  remark: '',
+                  day: temp[b].drug_day ? temp[b].drug_day : 1,
+                  prescribing_number: temp[b].prescribing_number,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
+                  groupno: index + temp_index,
+                  hosp_appr_flag: '1',
+                  execution_state:2,
 
+
+                }
+                if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                  obj.prescribing_number = 1
+                }
+                // 针对灵山圣康
+                if(this.org_id == 0 || this.org_id ==10375){
+                  if(this.prescriptions[i]!=null){
+                    console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
+                    if(this.prescriptions[i].advices.length >=5){
+
+                      this.$message.error("添加条数已经大于5条,添加失败!")
+                      return false
+                    }
+
+
+                  }
+                }
+                this.prescriptions[i].advices.push(obj)
               }
-              if (temp2[b].team_id == undefined) {
-                obj['team_id'] = 0
-              } else {
-                obj['team_id'] = temp2[b].team_id
-              }
-              if (obj.total == 0 || obj.total == undefined) {
-                obj.total = 1
-              }
-              if (obj.type == 3) {
-                obj.single_dose = 1
-              }
-              // 针对灵山圣康
-              if(this.org_id == 0 || this.org_id ==10375){
-                if(this.prescriptions[i]!=null){
-                  if(this.prescriptions[i].project.length >=5){
-                    this.$message.error("添加条数已经大于5条,添加失败!")
-                    return false
+              this.curStatus = 1
+
+            }
+
+            if (temp2.length > 0) {
+              for (let b = 0; b < temp2.length; b++) {
+                let obj = {
+                  id: 0,
+                  project_id: temp2[b].id,
+                  project_name: temp2[b].project_name,
+                  statistical_classification: '',
+                  single_dose: temp2[b].single_dose.toString(),
+                  delivery_way: temp2[b].delivery_way,
+                  execution_frequency: temp2[b].execution_frequency,
+                  number_days: temp2[b].number_days.toString(),
+                  total: temp2[b].cus_total,
+                  price: temp2[b].price,
+                  remark: '',
+                  medical_code: temp2[b].medical_code,
+                  type: temp2[b].type,
+                  execution_state:2,
+
+                }
+
+                if (temp2[b].type == 2){
+                  obj['project'] = temp2[b].project
+                  obj['unit'] = temp2[b].project.unit
+
+
+                }else if(temp2[b].type == 3){
+                  obj['good_info'] = temp2[b].good_info
+                  obj['unit'] = temp2[b].good_info.packing_unit
+
+
+                }
+                if (temp2[b].team_id == undefined) {
+                  obj['team_id'] = 0
+                } else {
+                  obj['team_id'] = temp2[b].team_id
+                }
+                if (obj.total == 0 || obj.total == undefined) {
+                  obj.total = 1
+                }
+                if (obj.type == 3) {
+                  obj.single_dose = 1
+                }
+                // 针对灵山圣康
+                if(this.org_id == 0 || this.org_id ==10375){
+                  if(this.prescriptions[i]!=null){
+                    if(this.prescriptions[i].project.length >=5){
+                      this.$message.error("添加条数已经大于5条,添加失败!")
+                      return false
+                    }
+
+
                   }
-                  
-                  
                 }
+                this.prescriptions[i].project.push(obj)
               }
-              this.prescriptions[i].project.push(obj)
+              this.curStatus = 2
             }
-            this.curStatus = 2
-          }
 
-          this.curPrescriptions = this.prescriptions[i]
-       
-          
-          
-         
-         
-          this.$refs.multipleTable.clearSelection()
-          this.$refs.tables.clearSelection()
-          this.clearSelection()
+            this.curPrescriptions = this.prescriptions[i]
+
+
+
+
+
+            this.$refs.multipleTable.clearSelection()
+            this.$refs.tables.clearSelection()
+            this.clearSelection()
 
+          }
         }
+        this.curDrugs = []
+        this.preDrugs = []
+        this.teamList = []
       }
-      this.curDrugs = []
-      this.preDrugs = []
-      this.teamList = []
+
+
 
     }, changeAllGoodInfoTableDataTwo(row) {
       this.teamList = row

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -21,7 +21,11 @@
         >
           {{ orgname }}处方笺
         </div>
-        <div class="printTitle" v-else>{{ orgname }}处方笺</div>
+        <div class="printTitle" v-else>
+          <span>{{ orgname }}处方笺</span>
+          <span style="font-size: 14px;font-weight: normal;color: red;" 
+            v-if="prescriptions[index].med_type == '1112'">(精)</span>
+        </div>
         <div >
           <div  style="display: flex;border-top: 2px solid #000;margin-top: 10px;line-height: 24px;padding: 0 10px;">
             <p style="width: 200px;">姓名：{{ item.patient.name ? item.patient.name : "" }}</p>

src/xt_pages/outpatientTool/components/detail.vue

@@ -547,7 +547,8 @@ export default {
               let new_name = tempPatientsTwo[i].new_order_info[b].item_name
               if (new_name != undefined){
                 if (new_name.length != 0) {
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString())).toFixed(2))
+                  console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
+                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
                 }
 
 
@@ -807,7 +808,7 @@ export default {
           // sums[index] = sums[index].toFixed(2)
           let num = 0
           data.map(item => {
-            num += item.price.toFixed(2) * item.count
+            num += item.price * item.count
           })
           sums[index] = num.toFixed(2)
         } else {