新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -812,6 +812,7 @@
                               ? record.prescription.dialysis_dialyszers
                               : "/"
                           }}
+                          {{record.dialysis_order.dialysis_dialyszers}}
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -826,6 +827,7 @@
                               ? record.prescription.dialysis_irrigation
                               : "/"
                           }}
+                          {{record.dialysis_order.dialysis_irrigation}}
                         </div>
                       </div>
 

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

@@ -3138,7 +3138,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -82,7 +82,7 @@
           <div class="inline_block" v-if="org_id!=10624">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10567 || org_id ==10206 || org_id ==10644 || org_id ==0" >{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10567 || org_id ==10206 || org_id ==10644 || org_id ==0 || org_id ==10633" >{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -93,7 +93,7 @@
           <div class="inline_block" v-if="org_id!=10460&&org_id!=10624">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id ==10515 || org_id == 10567 || org_id ==10206 || org_id ==10644 || org_id ==0">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id ==10515 || org_id == 10567 || org_id ==10206 || org_id ==10644 || org_id ==0 || org_id ==10633">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -2349,7 +2349,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489 || org_id ==10633 || org_id ==10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -4722,7 +4722,7 @@ export default {
 
         
 
-        if(this.org_id== 0 || this.org_id ==10206 || this.org_id ==10489){
+        if(this.org_id== 0 || this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -806,6 +806,8 @@
                             ? prescription.dialysis_dialyszers
                             : ""
                         }}
+
+                        {{dialysisOrder.dialysis_dialyszers  }}
                       </div>
                       <!--  透析(滤)器合并取值 -->
                        <div v-if="org_id==10414"
@@ -832,6 +834,7 @@
                             ? prescription.dialysis_irrigation
                             : "/"
                         }}
+                         {{dialysisOrder.dialysis_irrigation  }}
                       </div>
                     </div>
 

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

@@ -85,7 +85,8 @@ export default {
    methods:{
     getPatientCaseHistory(){
         const params = {
-          patient_id:this.patient_id
+          patient_id:this.patient_id,
+          record_date:this.record_date,
         }
         getPatientCaseHistory(params).then(response=>{
             if(response.data.state == 1){

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -239,7 +239,6 @@
           v-model="start_time"
           type="date"
           placeholder="选择日期"
-          :picker-options="pickerOptions0"
         >
         </el-date-picker>
       </el-form-item>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -276,7 +276,7 @@
               width="600px"
               title="打印"
               :visible.sync="recordVisible">
-          <recordPrint :patientid="patientid" ref="recordPrint" :showBtn='true'></recordPrint>
+          <recordPrint :patientid="patientid" ref="recordPrint"  :showBtn='true'></recordPrint>
       </el-dialog>
 
   </div>
@@ -4018,7 +4018,7 @@ export default {
     } else if (index == 2) {
       this.recordVisible = true
       this.$nextTick(() => {
-        this.$refs.recordPrint.show(this.patientid,this.org_id)
+        this.$refs.recordPrint.show(this.patientid,this.org_id,this.record_date)
       })
       // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
     } else if (index == 3) {

src/xt_pages/hospitalStation/recordPrint.vue

@@ -20,6 +20,7 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :record_date="record_date"
       ></printOne>
       <printTwo
         v-if="org_id == 10217 || org_id == 0 ||org_id==9675||org_id==9671||org_id == 10164"
@@ -29,6 +30,7 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :record_date="record_date"
       ></printTwo>
     </div>
   </div>
@@ -54,6 +56,7 @@ export default {
   },
   props:{
     patientid:Number,
+    record_date:String,
     showBtn:Boolean
   },
   data() {
@@ -71,16 +74,18 @@ export default {
       history:{},
       keyword:"",
       org_id:0,
+      record_date:"",
     };
   },
   methods: {
 
-    show(val, id) {
+    show(val, id,record_date) {
       this.org_id = id;
+      this.record_date = record_date
       if (id == 10217 || id == 9675 || id == 9671 || id == 0) {
-        this.$refs.printTwo.show(val);
+        this.$refs.printTwo.show(val,id,record_date);
       } else {
-        this.$refs.printOne.show(val);
+        this.$refs.printOne.show(val,id,record_date);
       }
     },
 
@@ -157,11 +162,12 @@ export default {
       },
 
     changePatient(val){
-
+        console.log("val23333333333333333333333")
         const params = {
-          patient_id:val.patient_id
+          patient_id:val.patient_id,
+          record_date:val.record_date,
         };
-        console.log("params",params);
+        console.log("带你病历params",params);
       getPatientCaseHistory(params).then(response=>{
          if(response.data.state == 1){
            var patient = response.data.data.patient;

src/xt_pages/hospitalStation/recordTemplate/printOne.vue

@@ -107,7 +107,8 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
-      patientid:Number
+      patientid:Number,
+      record_date:String,
     //   history:Object,
     },
     data(){
@@ -116,10 +117,16 @@ export default {
             departmentList:[],
             orgname:'',
             history:{},
-            printDate:''
+            printDate:'',
+           
         }
     },
     methods:{
+     show(val,val2,val3) {
+        this.patientid = val;
+        this.getAllDoctorList();
+        this.getPatientCaseHistory();
+      },
       getProfession(id){
         var name = "";
         for(let i=0;i<this.educationOptions.length;i++){
@@ -153,9 +160,10 @@ export default {
       getPatientCaseHistory(){
 
         const params = {
-          patient_id:this.patientid
+          patient_id:this.patientid,
+          record_date:this.record_date,
         };
-      console.log("病历22222",params);
+      console.log("新病历22222",params);
       getPatientCaseHistory(params).then(response=>{
          if(response.data.state == 1){
            var patient = response.data.data.patient;

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -178,6 +178,7 @@ export default {
     patient: Object,
     hispatient: Object,
     patientid: Number,
+    record_date:String,
     //   history:Object,
   },
   data() {
@@ -210,7 +211,7 @@ export default {
         birth.substr(6, 2);
       return jsGetAge(births, "-");
     },
-    show(val) {
+    show(val,val1,val3) {
       this.patientid = val;
       this.getAllDoctorList();
       this.getPatientCaseHistory();
@@ -247,6 +248,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patientid,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printTwo.vue

@@ -222,7 +222,8 @@ export default {
     },
     getPatientCaseHistory() {
       const params = {
-        patient_id: this.patient_id
+        patient_id: this.patient_id,
+        record_date:this.record_date,
       }
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/checkTemplate/checkPrintTwo.vue

@@ -170,6 +170,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -235,6 +235,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -165,6 +165,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/checkTemplate/printTwo.vue

@@ -197,6 +197,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/checkTemplate/printfour.vue

@@ -187,6 +187,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,
+        record_date:this.record_date,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -239,7 +239,6 @@
           v-model="start_time"
           type="date"
           placeholder="选择日期"
-          :picker-options="pickerOptions0"
         >
         </el-date-picker>
       </el-form-item>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -341,7 +341,7 @@
       width="600px"
       title="打印"
       :visible.sync="recordVisible">
-      <recordPrint :patientid="patientid" ref="recordPrint">
+      <recordPrint :patientid="patientid" ref="recordPrint" :record_date="record_date">
       </recordPrint>
     </el-dialog>
     <!-- 透析记录 打印上机单 -->
@@ -816,7 +816,8 @@ export default {
       } else if (index == 2) {
         this.recordVisible = true
         this.$nextTick(() => {
-          this.$refs.recordPrint.show(this.patientid, this.org_id)
+          console.log("haaaaaaaaaaaaaaaaaaaaaaa",this.record_date)
+          this.$refs.recordPrint.show(this.patientid, this.org_id,this.record_date)
         })
         // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
       } else if (index == 3) {

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -27,6 +27,7 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :recorddate="record_date"
       ></printOne>
       <!--   -->
       <printTwo
@@ -44,6 +45,8 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :recorddate="record_date"
+
       ></printTwo>
       
       <printThree
@@ -54,6 +57,7 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :recorddate="record_date"
       >
       <!-- || org_id == 0-->
       </printThree>
@@ -65,6 +69,7 @@
         :hispatient="hispatient"
         :history="history"
         :patientid="patientid"
+        :recorddate="record_date"
       >
       </printFour>
     </div>
@@ -94,6 +99,7 @@ export default {
   },
   props: {
     patientid: Number,
+    record_date:String,
   },
   data() {
     return {
@@ -110,22 +116,25 @@ export default {
       history: {},
       keyword: "",
       org_id: 0,
+      record_date:"",
+      recorddate:"",
     };
   },
 
   methods: {
-    show(val, id) {
+    show(val, id,record_date) {
+      console.log("record_Date----------",this.record_date)
       this.org_id = id;
       if (id == 10217 || id == 9675 || id == 9671|| id == 10188 ) {
-        this.$refs.printTwo.show(val);
+        this.$refs.printTwo.show(val,id,record_date);
       } else if (id == 10138 || id == 10278 || id == 10341 || id == 10342 || id == 0) {
-        this.$refs.printFour.show(val);
+        this.$refs.printFour.show(val,id,record_date);
       }
       else if (id == 10318 || id == 0) {
         // || id == 0
-        this.$refs.printThree.show(val);
+        this.$refs.printThree.show(val,id,record_date);
       } else {
-        this.$refs.printOne.show(val);
+        this.$refs.printOne.show(val,id,record_date);
       }
     },
     getAdminUser(id) {
@@ -267,10 +276,13 @@ export default {
     },
 
     changePatient(val) {
-      const params = {
-        patient_id: val.patient_id,
-      };
-      console.log("params", params);
+      console.log("val23333333333333333333333")
+        const params = {
+          patient_id:val.patient_id,
+          record_date:val.record_date,
+        };
+       console.log("带你病历params",params);
+     
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -116,7 +116,8 @@
         props:{
           patient:Object,
           hispatient:Object,
-          patientid:Number
+          patientid:Number,
+          recorddate:String,
         //   history:Object,
         },
         data(){
@@ -125,29 +126,32 @@
                 departmentList:[],
                 orgname:'',
                 history:{},
-                printDate:''
+                printDate:'',
             }
         },
         methods:{
           getAge(patient){
-            var thisLen = patient.id_card_no.length
-            var birth = ''
-            if (thisLen == 15) {
-              birth = '19' + patient.id_card_no.substr(6, 6)
-            } else {
-              birth = patient.id_card_no.substr(6, 8)
+            if(patient!=null){
+                var thisLen = patient.id_card_no.length
+                var birth = ''
+                if (thisLen == 15) {
+                birth = '19' + patient.id_card_no.substr(6, 6)
+                } else {
+                birth = patient.id_card_no.substr(6, 8)
+                }
+                var births =
+                birth.substr(0, 4) +
+                '-' +
+                birth.substr(4, 2) +
+                '-' +
+                birth.substr(6, 2)
+                return jsGetAge(births, '-')
             }
-            var births =
-              birth.substr(0, 4) +
-              '-' +
-              birth.substr(4, 2) +
-              '-' +
-              birth.substr(6, 2)
-            return jsGetAge(births, '-')
+           
     
           },
-          show(val){
-    
+          show(val,val2,val3){
+            console.log("val2333333333333333",val3)
             this.patientid = val
             this.getAllDoctorList()
             this.getPatientCaseHistory()
@@ -182,12 +186,14 @@
             }
             return name
           },
+          
           getPatientCaseHistory(){
     
             const params = {
-              patient_id:this.patientid
+              patient_id:this.patientid,
+              record_date:this.recorddate,
             }
-          console.log("病历22222",params)
+          console.log("病历222220000000000000000000000",params)
           getPatientCaseHistory(params).then(response=>{
              if(response.data.state == 1){
                var patient = response.data.data.patient

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -116,7 +116,8 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
-      patientid:Number
+      patientid:Number,
+      recorddate:String,
     //   history:Object,
     },
     data(){
@@ -130,29 +131,34 @@ export default {
         }
     },
     methods:{
-      getAge(patient){
-        var thisLen = patient.id_card_no.length
-        var birth = ''
-        if (thisLen == 15) {
-          birth = '19' + patient.id_card_no.substr(6, 6)
-        } else {
-          birth = patient.id_card_no.substr(6, 8)
-        }
-        var births =
-          birth.substr(0, 4) +
-          '-' +
-          birth.substr(4, 2) +
-          '-' +
-          birth.substr(6, 2)
-        return jsGetAge(births, '-')
-
-      },
-      show(val){
-
+       show(val,val2,val3){
+       
         this.patientid = val
         this.getAllDoctorList()
         this.getPatientCaseHistory()
+      },  
+      getAge(patient){
+        console.log("patient2333333333333333",)
+        if(patient!=null){
+            var thisLen = patient.id_card_no.length
+            var birth = ''
+            if (thisLen == 15) {
+            birth = '19' + patient.id_card_no.substr(6, 6)
+            } else {
+            birth = patient.id_card_no.substr(6, 8)
+            }
+            var births =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2)
+            return jsGetAge(births, '-')
+        }
+      
+
       },
+     
       getProfession(id){
         var name = ""
         for(let i=0;i<this.educationOptions.length;i++){
@@ -186,9 +192,10 @@ export default {
       getPatientCaseHistory(){
 
         const params = {
-          patient_id:this.patientid
+          patient_id:this.patientid,
+          record_date:this.recorddate,
         }
-      console.log("病历22222",params)
+      console.log("旧病历22222",params)
       getPatientCaseHistory(params).then(response=>{
          if(response.data.state == 1){
            var patient = response.data.data.patient

src/xt_pages/outpatientDoctorStation/recordTemplate/printSix.vue

@@ -76,6 +76,7 @@ import {getInitData} from "@/api/his/his"
 export default {
     props:{
       patient_id:Number,
+      recorddate:String,
       record_date:String,
       prescription_id:Number,
       ids:String
@@ -96,6 +97,12 @@ export default {
       }
     },
    methods:{
+    show(val,val2,val3){
+       console.log("val3----------",val3)
+        this.patientid = val
+        this.getAllDoctorList()
+        this.getPatientCaseHistory()
+     },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''
@@ -171,6 +178,7 @@ export default {
      getHisPatientDetail(){
           const params = {
               patient_id:this.patient_id
+
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/recordTemplate/printThree.vue

@@ -302,6 +302,7 @@ export default {
     patient: Object,
     hispatient: Object,
     patientid: Number,
+    recorddate:String,
     //   history:Object,
   },
   components: {
@@ -372,7 +373,8 @@ export default {
         birth.substr(6, 2);
       return jsGetAge(births, "-");
     },
-    show(val) {
+    show(val,val2,val3) {
+      console.log("val3222222222222222",val3)
       this.patientid = val;
       this.getAllDoctorList();
       this.getPatientCaseHistory();
@@ -409,6 +411,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patientid,
+        record_date:this.recorddate,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -178,6 +178,7 @@ export default {
     patient: Object,
     hispatient: Object,
     patientid: Number,
+    recorddate:String,
     //   history:Object,
   },
   data() {
@@ -189,6 +190,7 @@ export default {
       printDate: "",
       accessList: {},
       blood_access_part_opera: [],
+      patientid:0,
     };
   },
 
@@ -210,7 +212,8 @@ export default {
         birth.substr(6, 2);
       return jsGetAge(births, "-");
     },
-    show(val) {
+    show(val,val2,val3) {
+      console.log("val323333333333333",val3)
       this.patientid = val;
       this.getAllDoctorList();
       this.getPatientCaseHistory();
@@ -247,6 +250,7 @@ export default {
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patientid,
+        record_date:this.recorddate,
       };
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/workforce/components/tableData.vue

@@ -211,7 +211,7 @@
           </el-table-column>
           <el-table-column label="透析模式" width="100">
             <template slot-scope="scope">
-              {{ scope.row.mode.name }}
+              {{getModeId(scope.row.mode_id )}}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="300">
@@ -4147,7 +4147,113 @@ export default {
       console.log('event3',);
       this.weektypes=val
       this.$emit('event3', val)
-    }
+    },
+    getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="HFHD"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="PHF"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      if(val == 33){
+        name ="HDP"
+      }
+      if(val == 33){
+        name ="HFD"
+      }
+      if(val == 34){
+        name ="HDF100"
+      }
+      if(val == 35){
+        name ="HDF600"
+      }
+      if(val == 36){
+        name ="HDF800"
+      }
+      if(val == 37){
+        name ="HDF1000"
+      }
+      return name
+    },
   },
   components: {
     ScheduleItem