新分支

src/api/fallassement.js

       method:"post",
       data:data,
     })
+  }
+
+  export function getPedDiatricFallAssessmentList(params){
+   
+    return request({
+      url:"/api/patient/getbeddiatricfallassessmentlist",
+      method:"get",
+      params:params
+    })
   }

src/xt_pages/dialysis/PatientBox.vue

       modedata: 0,
       stockType: [],
       dryWeightList:[],
+      lastAccept:{id:0}
     };
   },
   props: {
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation;
           console.log("上次透前评估", lastPredialysisEvaluation);
+          this.lastAccept = resp.data.lastAcceptTreatment
+          console.log("上次透析数据----",this.lastAccept)
+          
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0;

src/xt_pages/dialysis/batch_print/batch_print_order_seventyone.vue

                     </td>
                     <td v-if="advice_index === 4">净脱水量</td>
                     <td v-if="advice_index === 4">
-                      {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '0'}}L
+                      {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '0'}}
+                      <span v-if="org_id ==10617"> ml</span>
+                      <span v-else>L</span>
                     </td>
                     <td v-if="advice_index === 5">透后体重</td>
                     <td v-if="advice_index === 5">

src/xt_pages/dialysis/details/NavIgation.vue

       ref="accepts"
       :patient="patient"
       :receiver_treatment_access="receiver_treatment_access"
+      :lastTreat="lastTreat"
     ></accepts-treatment-dialog>
 
     <assessment-before-dislysis-dialog
     },
     record_date:{
       type:String
+    },
+    lastTreat:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {

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

         :rules="isCheckmust('病人情况')"
         v-if="isShow('病人情况')"
       >
-      <el-radio-group v-model="receiveTreatmentAsses.condition">
+      <el-radio-group v-model="receiveTreatmentAsses.condition" @change="changeRaido">
         <el-radio label="1"
           >住院</el-radio
         >
         return { id: 0 };
       },
     },
+    lastTreat:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    }
   },
   watch: {
     isVisibility(val) {},
     },
   },
   created() {
+    console.log("lastTreat",this.lastTreat)
+    if(this.lastTreat!=null){
+      if(this.receiveTreatmentAsses.condition ==1){
+        this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+      }
+    
+    }
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
   },
+  methods:{
+    changeRaido(val){
+      if(val ==1){
+        this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+      }else{
+        this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+      }
+    }
+  }
 };
 </script>
 

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

     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
+    this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
     // this.form.schedual_type = this.dialysis_order.schedule_type
     // this.schedual_type = this.dialysis_order.schedule_type
       this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
       this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
-
+      this.form.blood_drawing = this.dialysis_order.blood_drawing
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
       // this.form.schedual_type = this.dialysis_order.schedule_type
       // console.log("8823832323223",this.form.schedual_type)

src/xt_pages/dialysis/details/index.vue

           :lastOrder="lastOrder"
           :dryWeightList="dryWeightList"
           :docList="docList"
-
+          :lastTreat="lastTreat"
         >
         </nav-igation>
 
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
       orderList:[],
+      lastTreat:{id:0}
       // start_time2:'',
       // end_time2:'',
     }
           var stockType =  resp.data.stockType
           this.stockType = stockType
 
+          this.lastTreat = resp.data.lastAcceptTreatment
+          console.log("上次透后平出-----------",this.lastTreat)
+
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList
           console.log("doclist-----",this.docList)

src/xt_pages/dialysis/details/indexs.vue

           :lastOrder="lastOrder"
           :dryWeightList="dryWeightList"
           :docList="docList"
+          :lastTreat="lastTreat"
 
         >
         </nav-igation>
       dryWeightList:[],
       docList:[],
       blood_access_part_opera: [],
+      lastTreat:{id:0}
     }
   },
   created() {
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList
           console.log("doclist-----",this.docList)
+
+          this.lastTreat = resp.data.lastAcceptTreatment
+          console.log("上次透后平出-----------",this.lastTreat)
           var prepare = resp.data.prepare
           if(prepare!=null){
             this.preparestock = prepare

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

                   : ""
               }}</span>
               <span v-else>{{ "/" }}</span> -->
+
+              <span>{{
+                patientInfo.DialysisSchedule.device_zone.name
+                  ? patientInfo.DialysisSchedule.device_zone.name
+                  : ""
+              }}</span>
             </div>
           </div>
           <div class="inline_block" >
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
               <span v-else>{{ "/" }}</span> -->
+              {{dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+                }}
             </div>
           </div>
           <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

               <td v-if="advice_index === 3">较干体重增加量</td>
               <td v-if="advice_index === 3">{{ (predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2) }}kg</td>
               <td v-if="advice_index === 4">净脱水量</td>
-              <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}L</td>
+              <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }} 
+                <span v-if="org_id ==10617"> ml</span>
+                <span v-else>L</span>
+              </td>
               <td v-if="advice_index === 5">透后体重</td>
               <td v-if="advice_index === 5">{{ afterdialysis.weight_after }}kg</td>
               <td v-if="advice_index === 6">本次透析体重下降量</td>

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402){
+              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402 || this.org_id ==10215){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
               list[i].drugOutSalePrice = "/"
 
          
-            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402){
+            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402 || this.org_id ==10215){
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }else{
               list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

                 list[i].drugAddOne= 0
                 list[i].drugOutOne =0
                
-                if(this.org_id ==10210 || this.org_id ==10402){
+                if(this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
                    list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                 }else{
                   list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 list[i].drugOutSalePrice = "/"
 
                
-                if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402){
+                if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
                   list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)

src/xt_pages/stock/query/purchaseNewStockQuery.vue

            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id == 0 || this.org_id ==10210){
+              if(this.org_id ==10210){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
-                list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
-                if(list[i].stockIn <0){
-                  list[i].stockIn =0
+                console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
+                console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
+                console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )
+                console.log("盘亏",this.getAllStockOutFlow(list[i].WareStartOutStockFlow))
+                //针对武穴软水盐的问题
+                if(list[i].id== 5052){
+                  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+                }else{
+                  list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                  if(list[i].stockIn <0){
+                    list[i].stockIn =0
+                  }
                 }
+               
               }
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                list[i].stock_in_price = "/"
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
               list[i].stockOutprice = "/"
               list[i].saleOutMoney = "/"
-              if(this.org_id == 10265 || this.org_id == 0){
+              if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+                if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
+                  list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+                }else{
+                  list[i].overStock = 0
+                }
+               
               }
             
             

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

                     if(this.org_id == 0 || this.org_id ==10210){
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                     }else{
-                       list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
-                       if(list[i].stockIn <0){
-                         list[i].stockIn =0
-                       }
+                      if(list[i].id== 5052){
+                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+                      }else{
+                        list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                        if(list[i].stockIn <0){
+                          list[i].stockIn =0
+                        }
+                      }
                     }
                     list[i].stock_in_price = "/"
                     list[i].stockMoney = "/"

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

                             <el-select v-model="tumble" placeholder="请选择" >
                                 <el-option
                                 v-for="item in tumble_options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
+                                :key="item.admin_user_id"
+                                :label="item.user_name"
+                                :value="item.admin_user_id"
                                 style="width:150px;">
                                 </el-option>
                             </el-select>
 import PatientSidebar from '../components/PatientSidebar.vue'
 import Falloutbedprint from './Falloutbedprint.vue'
 import { uParseTime } from '@/utils/tools'
-import { savePediatrcFallAssesment } from '@/api/fallassement'
+import { savePediatrcFallAssesment,getAllNurseList } from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar,
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patient_id = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     ageclick(e,item){
     },
     // 历史评估
     childerHistory(){
-      this.$router.push({path: '/patients/Children_history'})
+      this.$router.push({path: '/patients/Children_history?patient_id='+this.patient_id})
     },
     getTime(val) {
         if(val < 0){
           patient:this.patient,
        }
        console.log("params----",params)
-      savePediatrcFallAssesment(params).then(Response=>{
-
+      savePediatrcFallAssesment(params).then(response=>{
+         if(response.data.state ==1){
+           var pedFallssessment =  response.data.data.pedFallssessment
+           this.$message.success("保存成功!")
+         }
       })
-    }
+    },
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+           if(response.data.state ==1){
+             var nurseList  = response.data.data.nurseList
+
+             this.tumble_options =nurseList
+           }
+        })
+    },
   },
   computed:{
     pedia_Totalpoints(){

src/xt_pages/user/history/Children_history.vue

             </template>
           </el-table-column>
         </el-table>
+
       </div>
 
     </div>
 <script>
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
+import {  getPedDiatricFallAssessmentList } from '@/api/fallassement'
 export default{
   data(){
     return{
       patient_id:0,
       patient:'',
       touxihao:0,//透析号
-      dayintime:new Date()//打印时间
+      dayintime:new Date(),//打印时间
+      patient_id:0,
+      page:1,
+      limit:10,
+      total:0,
     }
   },
   methods:{
+    handleSizeChange(limit){
+      this.limit = limit
+      this.getPedDiatricFallAssessmentList()
+    },
+    handleCurrentChange(page){
+      this.page = page;
+      this.getPedDiatricFallAssessmentList();
+    },
     fanhui(){
       window.history.go(-1);
     },
         return uParseTime(val, '{y}-{m}-{d}')
         }
     },
+
+    getPedDiatricFallAssessmentList(){
+        var params = {
+          patient_id:this.patient_id,
+          is_type:1,
+          page:this.page,
+          limit:this.limit,
+        }
+      getPedDiatricFallAssessmentList(params).then(response=>{
+         if(response.data.state ==1){
+          var list = response.data.data.list
+          console.log("list------",list)
+          var total =  response.data.data.total
+          this.total = total
+         }
+      })
+    }
   },
   computed:{
     pedia_Totalpoints(){
       return this.agevalue + this.sexvalue + this.diagnosis_val +this.cognize_val + this.environment_val + this.medicine_val
     },
+  },
+  created(){
+    this.patient_id = this.$route.query.patient_id
+    this.getPedDiatricFallAssessmentList()
   }
 }
 </script>