Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.1315"
+  "version": "2999.999.1316"
 }

src/api/pharmacy.js

@@ -191,3 +191,12 @@ export function changeDrugCode(params){
     params:params,
   })
 }
+
+export function getDrugTocalCount(params){
+
+  return request({
+    url:"/api/pharmacy/getdrugtocalcount",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -228,7 +228,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
+                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index,scope.row.DrugId)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
               </template>
             </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
@@ -354,7 +354,8 @@ import {
   drugwithdrawal,
   getpartitionlist,
   changeDrugCode,
-  changeZeroFlag
+  changeZeroFlag,
+  getDrugTocalCount
 
 } from "@/api/pharmacy";
 import dataDruguse from "../../router/modules/dataDruguse";
@@ -415,8 +416,10 @@ export default {
       currentIndex:0,
       is_drug_open:"2",
       textarea:"",
-      patientList:[]
-
+      patientList:[],
+      drug_id:0,
+      total_count:0,
+      newArrList:[]
     };
   },
   watch: {},
@@ -1238,20 +1241,98 @@ export default {
        }
        return spc
     },
-    getDrugCode(id,DataSources,DrugCode,index){
-      this.id = id
-      var is_source =0
-       if (DataSources == "his处方"){
-        is_source = 1
-       }
-       if (DataSources == "临时医嘱"){
-         is_source = 2
-       }
-       this.is_source = is_source
-       this.textarea = DrugCode
-       this.currentIndex = index
+    getDrugCode(id,DataSources,DrugCode,index,DrugId){
       
-       this.dialogVisibleOne = true
+     // 针对百霖
+       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 0){
+          var params = {
+            drug_id:DrugId,
+            start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
+          }
+          console.log("params-------------",params)
+         getDrugTocalCount(params).then(response=>{
+           if(response.data.state == 1){
+             
+            var adviceList = response.data.data.adviceList
+
+            var str = ""
+            if(adviceList!=null && adviceList.length>0){
+              for(let i=0;i<adviceList.length;i++){
+                if(adviceList[i].drug_code!=""){
+                  str+=adviceList[i].drug_code 
+                }
+               
+              }
+            }
+            var new_arr = str.split(",");
+
+            console.log("adviceList==========",new_arr)
+
+            if(new_arr!=null && new_arr.length>0){
+               
+               let dataInfo = {}
+               new_arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                 }
+               })
+               let arr = Object.values(dataInfo)
+
+               if(arr!=null && arr.length>0){
+                
+                 for(let i=0;i<arr.length;i++){
+                   for(let j=0;j<new_arr.length;j++){
+                      if(arr[i].drug_code == new_arr[j]){
+                         arr[i].child.push(new_arr[j])
+                      }
+                   }
+                 }
+               }
+               
+               this.newArrList = []
+               this.newArrList = arr
+
+
+            }
+              
+            this.drug_id = DrugId
+            this.id = id
+            var is_source =0
+            if (DataSources == "his处方"){
+              is_source = 1
+            }
+            if (DataSources == "临时医嘱"){
+              is_source = 2
+            }
+            this.is_source = is_source
+            this.textarea = DrugCode
+            this.currentIndex = index
+            
+            this.dialogVisibleOne = true
+           }
+         })
+       }else{
+        
+        this.drug_id = DrugId
+        this.id = id
+        var is_source =0
+        if (DataSources == "his处方"){
+          is_source = 1
+        }
+        if (DataSources == "临时医嘱"){
+          is_source = 2
+        }
+        this.is_source = is_source
+        this.textarea = DrugCode
+        this.currentIndex = index
+        
+        this.dialogVisibleOne = true
+       }
+
+     
 
     },
     saveTextArea(){
@@ -1274,6 +1355,7 @@ export default {
       })
     },
     changeText(event){
+
      
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
@@ -1281,30 +1363,118 @@ export default {
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
          
-      
-
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
+
+          var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
+          console.log("drugindentification===================",drugindentificaitoncode)
+
+          var scan_code = this.getDrugScanCode(this.drug_id)
+          
+          console.log("scan_code============",scan_code)
+
+          var total_one = 0
+          var total_two = 0
+
+          console.log("newArr-------------",this.newArrList)
+
+         
+
           var arr= []
           arr = textarea.split(",")
+          var arrList = []
+          if(arr!=null && arr.length>0){
+            let dataInfo = {}
+               arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                 }
+               })
+               let new_arr = Object.values(dataInfo)
+
+               if(new_arr!=null && new_arr.length>0){
+                
+                 for(let i=0;i<new_arr.length;i++){
+                   for(let j=0;j<arr.length;j++){
+                      if(new_arr[i].drug_code == arr[j]){
+                         new_arr[i].child.push(arr[j])
+                      }
+                   }
+                 }
+               }
+            arrList = new_arr
+            
+          }
+
           var is_err_check = false
           var i_index = ""
+          var drug_code = ""
+       
           if(arr!=null && arr.length>0){
             for(let i=0;i<arr.length;i++){
+
                if(arr[i]!=""){
+                 drug_code = arr[i]
+                 i_index = i
                  if(arr[i].length!=20){
                    this.$message.error("药品追溯码长度没有满足20位!")
                    is_err_check = true
-                   i_index = i
                  }
+                 if(drugindentificaitoncode>0){
+                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
+                    this.$message.error("药品标识码格式不正确,请重新扫码")
+                    is_err_check = true
+                  }
+                 }
+                
+
                }
 
             }
           }
-          console.log("is_err_check+++++++++++++",is_err_check)
           if(is_err_check == true){
               arr.splice(i_index,1)
           }
-          console.log("arr-------------------------",arr)
+         
+          for(let i=0;i<this.newArrList.length;i++){
+             if(drug_code == this.newArrList[i].drug_code){
+                 total_one = this.newArrList[i].child.length
+             }
+          }
+
+          for(let i=0;i<arrList.length;i++){
+             if(drug_code == arrList[i].drug_code){
+                 total_two = arrList[i].child.length
+             }
+          }
+
+
+          console.log("数量1--------------",total_one)
+          console.log("数量2---------------",total_two)
+        
+          console.log("scan_code=====",scan_code)
+          
+          if(scan_code>0){
+            if((total_one + total_two)>scan_code){
+              this.$message.error("扫码次数已经超过限制!")
+              arr.splice(i_index,1)
+            }
+          }
+         
+
+
+
+         var is_arr = this.hasDuplicates(arr)
+
+         if(is_arr == true){
+           this.$message.error("药品追溯码已经存在,不能重复扫码!")
+           arr.splice(i_index,1)
+         }
+
+         console.log("is_arr-=--------------",is_arr)
+
           this.textarea = arr.join(",")
         }else{
 
@@ -1317,6 +1487,31 @@ export default {
 
 
     },
+    
+    hasDuplicates(arr) {
+      const uniqueNumbers = [...new Set(arr)];
+      return uniqueNumbers.length !== arr.length;
+    },
+    getDrugIdentificationCode(id){
+       
+      var drug_identification_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+          if(id == this.baseList[i].id){
+            drug_identification_code = this.baseList[i].drug_identification_code
+          }
+      }
+      return drug_identification_code
+    },
+    getDrugScanCode(drug_id){
+      var scan_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+       if(drug_id == this.baseList[i].id){
+          scan_code = this.baseList[i].scan_code
+       }
+      }
+      return scan_code
+    }
+
 
 
   },

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -97,6 +97,8 @@
            </template>
         </el-table-column>
 
+       
+
         <el-table-column
           align="center"
           prop="name"
@@ -184,6 +186,12 @@
            </template>
         </el-table-column>
 
+        <el-table-column  align="center"  width="60" label="钙"  v-if="org_id ==10610 || org_id == 10610">
+           <template slot-scope="scope">
+            {{scope.row.dialysis_solution.calcium}}
+           </template>
+        </el-table-column>
+
         <el-table-column
           align="center"
           prop="name"

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -30,6 +30,7 @@
                 <td width="100">姓名</td>
                 <td width="100">透析号</td>
                 <td width="100">透析模式</td>
+               
                 <td width="200" v-for="(item,index) in rowList" :key="index">
                   {{item.filed_name_cn}} 
                 </td>
@@ -45,6 +46,7 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td>{{ getModeId(item.mode_id) }}</td>
+               
                 <td v-for="(it,index) in rowList" :key="index">
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
                   <span v-if="org_id !=10599">
@@ -68,6 +70,7 @@
                 <td width="100">姓名</td>
                 <td width="100">透析机号</td>
                 <td width="100">透析模式</td>
+                <td width="100" v-if="org_id == 10610 || org_id == 0">钙</td>
                 <td width="200" v-for="(item,index) in typeList" :key="index">
                   {{item.type_name}} 
                 </td>
@@ -82,6 +85,7 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td>{{ getModeId(item.mode_id) }}</td>
+                <td v-if="org_id == 0 || org_id == 10610">{{ item.dialysis_solution.calcium }}</td>
                 <td v-for="(it,index) in typeList" :key="index">
                   <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
                   <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
@@ -105,6 +109,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
   import { getDataConfig } from '@/utils/data'
+import org from '../../../../router/modules/org'
   export default {
     name: 'SchedulePrint',
     data() {

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -138,6 +138,7 @@
             {{scope.row.patient.dialysis_no}}
            </template>
         </el-table-column>
+      
         <el-table-column align="center" label="住院(门诊)号"  v-if="dialysisSett.admission_number==1">
            <template slot-scope="scope">
              {{scope.row.xt_receive_treatment_asses.admission_number}}

src/xt_pages/user/deathSummary.vue

@@ -238,7 +238,7 @@
             {id:2,name:"心血管"},
             {id:3,name:"感染"},
             {id:4,name:"营养不良"},
-            {id:5,name:"全是衰竭"},
+            {id:5,name:"全身衰竭"},
             {id:6,name:"肿瘤"},
             {id:7,name:"出血"},
             {id:8,name:"呼吸衰竭"},

src/xt_pages/user/patient.vue

@@ -98,6 +98,7 @@
         <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
         <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
+        
         <el-table-column property="name" label="姓名" min-width="80" align="center">
           <template slot-scope="scope" >
             <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff;width:100%;display:block;" >{{scope.row.name}}</router-link>

src/xt_pages/user/patients.vue

@@ -416,6 +416,13 @@
           align="center"
         >
         </el-table-column>
+        <el-table-column
+          label="年龄"
+          min-width="70"
+          property="age"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           property="name"
           label="姓名"
@@ -1651,6 +1658,9 @@
             return false
           } else {
             this.tableData = response.data.data.patients
+            for(let i=0;i<this.tableData.length;i++){
+              this.tableData[i].age = this.getAge(this.tableData[i])
+            }
             console.log("wowowowo",this.tableData)
             console.log('2222222',response.data.data)
             this.pageTotal = this.tableData.length
@@ -1659,6 +1669,27 @@
           }
         })
       },
+      getAge: function(val) {
+          if (val.id_card_no == undefined) {
+            return false
+          }
+          var thisLen = val.id_card_no.length
+          var birth = ''
+          if (thisLen == 15) {
+            birth = '19' + val.id_card_no.substr(6, 6)
+          } else {
+            birth = val.id_card_no.substr(6, 8)
+          }
+          var birthtwo =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2)
+
+          var age = jsGetAge(birthtwo, '-')
+          return age
+      },
 
       OpenView(name, number, id) {
         this.name = name