hah阿凡达

src/api/advice.js

@@ -259,9 +259,9 @@ export function CreateGroupAdvice(id, groupno, advices, mode) {
     })
   }
 }
-export function DeleteGroupAdvice(groupno, mode) {
+export function DeleteGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
-    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+"&patient_id="+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3
@@ -420,10 +420,10 @@ export function DeleteNewDoctorAdvice(id, mode) {
   })
 }
 
-export function DeleteNewGroupAdvice(groupno, mode) {
+export function DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
     url:
-      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+'&patient_id='+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -445,6 +445,9 @@
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="Datefrom"
           @keyup.native="changeText"
@@ -551,10 +554,30 @@ export default {
       drug_id:0,
       newArrList:[],
       baseList:[],
+      textAreaList:[]
     };
   },
 
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
       

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -305,6 +305,9 @@
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="inputRef"
           @keyup.native="changeText"
@@ -419,10 +422,11 @@ export default {
       patientList:[],
       drug_id:0,
       total_count:0,
-      newArrList:[]
+      newArrList:[],
+      textAreaList:[]
     };
   },
-  watch: {},
+ 
   created() {
     this.init();
     this.gettodaynumber();
@@ -433,6 +437,26 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
+    getTotal(){
+
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+             if(textAreaList[i]!=""){
+               arr.push(textAreaList[i])
+             }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+       
+      }
+     
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -1363,6 +1387,8 @@ 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 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
 
@@ -1481,7 +1507,7 @@ export default {
        
       }
 
-
+      this.getTotal()
     },
     
     hasDuplicates(arr) {
@@ -1511,6 +1537,9 @@ export default {
 
 
   },
+  watch:{
+
+  }
   
 };
 </script>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1197,7 +1197,9 @@
            this.$message.error("已执行的医嘱无法删除!")
            return
         }
-        this.DeleteGroupAdvice(this.groupSelectRow.groupno)
+        console.log("groupno====================",this.groupSelectRow)
+       
+        this.DeleteGroupAdvice(this.groupSelectRow.groupno,this.groupSelectRow.patient_id,this.groupSelectRow.advice_date)
 
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
         //   confirmButtonText: '确定',
@@ -1846,7 +1848,8 @@
       }
       ,
 
-      DeleteGroupAdvice(groupno) {
+      DeleteGroupAdvice(groupno,patient_id,advice_date) {
+
         this.$confirm('确认删除这组医嘱?', '医嘱删除', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1859,7 +1862,7 @@
             ) {
               mode = '5'
             }
-            DeleteGroupAdvice(groupno, mode).then(response => {
+            DeleteGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 if(response.data.code == 600000008){

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -440,6 +440,10 @@
       @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
+
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
         
@@ -595,10 +599,30 @@ export default {
       dialogVisible:false,
       currentRow:{},
       currentIndex:0,
-      textarea:""
+      textarea:"",
+      textAreaList:[]
     };
   },
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -1257,6 +1281,7 @@ export default {
         this.textarea = textarea
 
       }
+      this.getTotal()
    },
   },
 

src/xt_pages/stock/stockOutOrder.vue

@@ -1064,7 +1064,7 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      type: 0,
+      type: 1,
       drug_id: 0,
       dialogVisible: false,
       editdialogVisible: false,

src/xt_pages/user/components/PatientDetail.vue

@@ -662,7 +662,7 @@
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
-                <el-form-item label="别名 : " prop="alias">
+                <el-form-item label="血型 : " prop="alias">
                   <el-input v-model="form.alias" disabled></el-input>
                 </el-form-item>
               </el-col>

src/xt_pages/user/components/PatientForm.vue

@@ -704,7 +704,7 @@
 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="别名 : " prop="alias">
+                  <el-form-item label="血型 : " prop="alias">
                     <el-input v-model="form.alias"></el-input>
                   </el-form-item>
                 </el-col>

src/xt_pages/user/doctorAdvice.vue

@@ -2096,6 +2096,7 @@ import { fetchPatient, PostRemind } from "@/api/patient";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import patient from "../../router/modules/patient";
 let rowIndex = 1;
 const rowKey = 0;
 
@@ -2921,6 +2922,8 @@ export default {
     },
     DeleteGroupAdvice(groupno, row) {
       console.log("patinet_id =======",row)
+      var patient_id = row.patient_id
+      var advice_date = row.advice_date
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -2944,7 +2947,7 @@ export default {
             }
           }
 
-          DeleteNewGroupAdvice(groupno, mode).then(response => {
+          DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)``;
               return false;

src/xt_pages/user/physiqueprinting.vue

@@ -54,7 +54,7 @@
                 <div style="flex: 1;">
                   首次透析日期：{{ patient.first_dialysis_date ? getTime(patient.first_dialysis_date, '{y}-{m}-{d}') : '' }}
                 </div>
-                <div style="flex: 1;">血型：{{ getBloodType(patient.blood_type) }}</div>
+                <div style="flex: 1;">血型：{{ patient.alias }}</div>
                 <div style="flex: 1;">报销方式：{{ getWayOptions(patient.reimbursement_way_id) }}</div>
               </div>
               <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
@@ -137,8 +137,15 @@
               {{index+1}}.<span>{{ item }}</span><br/>
             </div>
             <div style="text-align: right;margin-bottom: 10px;">
-              <span style="font-weight: bold;">病历书写者：</span>
-              {{getDoctorName(item.doctor_id)}}
+
+             <span style="font-weight: bold;">病历书写者：</span>
+              <span v-if="getUrl(item.doctor_id)!=''">
+                <img :src="getUrl(item.doctor_id)" style="height: 50px">
+              </span>
+              <span v-if="getUrl(item.doctor_id)==''">
+                {{getDoctorName(item.doctor_id)}}
+              </span>
+             
             </div>
           </div>
           <div style="float: right;">
@@ -219,7 +226,8 @@ export default {
       },
       diagnosis: [],
       treatment_plan_list:[],
-      org_id:0
+      org_id:0,
+      signatureList:[]
     }
   },
   components: {
@@ -230,9 +238,20 @@ export default {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions = response.data.data.doctors;
+          var signature = response.data.data.signature
+          this.signatureList = signature
         }
       });
     },
+    getUrl(creator){
+      var url = ""
+      for(let i=0;i<this.signatureList.length;i++){
+         if(creator == this.signatureList[i].admin_user_id){
+             url = this.signatureList[i].url
+         }
+      }
+      return url
+    },
     getDoctorName: function(doctor_id) {
       for (let index = 0; index < this.doctorOptions.length; index++) {
         const doctor = this.doctorOptions[index]