新分支

src/api/stock.js

     params: params
   })
 }
+
+
+export function getStockFlowOrderList(params){
+  return request({
+    url:"/api/stock/getstockfloworderlist",
+    method:"Get",
+    params:params,
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

                         </tr>
                         <tr>
                           <td width="60">时间</td>
-                          <td width="60">体温(°C)</td>
+                          <td width="60">透析液温度(°C)</td>
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
                           <td width="60">血压<br />(mmHg)</td>

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

              
           <el-table-column align="center" label="透析器"  v-if="gatherSetting.dialysis_dialyszers == 1">
              <template slot-scope="scope">
-               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
+               <span v-if="scope.row.schedule_date == timenow">
+                <span v-if="scope.row.dialysis_prescription.dialysis_dialyszers!=''">{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span> 
+                <span v-if="scope.row.dialysis_prescription.dialysis_dialyszers==''">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span> 
+               </span>
 
                <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
 
            <el-table-column align="center" label="灌流器"  v-if="gatherSetting.dialysis_irrigation ==1">
              <template slot-scope="scope">
 
-               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
+               <span v-if="scope.row.schedule_date == timenow">
+                 <span v-if="scope.row.dialysis_prescription.dialysis_irrigation !=''">
+                  {{scope.row.dialysis_prescription.dialysis_irrigation}}
+                 </span> 
+                 <span v-if="scope.row.dialysis_prescription.dialysis_irrigation ==''">
+                  {{scope.row.dialysis_solution.dialysis_irrigation}}
+                 </span> 
+               </span>
                <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
                <span v-if="scope.row.schedule_date > timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
 
           <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_strainer ==1">
              <template slot-scope="scope">
               
-               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
+               <span v-if="scope.row.schedule_date == timenow">
+                <span v-if="scope.row.dialysis_prescription.dialysis_strainer!=''">
+                  {{scope.row.dialysis_prescription.dialysis_strainer}}
+                </span>
+                <span v-if="scope.row.dialysis_prescription.dialysis_strainer==''">
+                  {{ scope.row.dialysis_solution.dialysis_strainer }}
+                </span>
+               </span>
                <span v-if="scope.row.schedule_date<timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
                <span v-if="scope.row.schedule_date>timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
              </template>

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

                     <span v-if="item.mode_id == 35">HDF1000</span>
                  </td>
                   <td width="100" v-if="gatherSetting.dialysis_dialyszers == 1">
-                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_dialyszers}}</span> 
+                    <span v-if="item.schedule_date == timenow">
+                      <span v-if="item.dialysis_prescription.dialysis_dialyszers!=''">{{item.dialysis_prescription.dialysis_dialyszers}}</span> 
+                      <span v-if="item.dialysis_prescription.dialysis_dialyszers==''">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
+                     </span> 
                     <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
                     <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
                   </td>
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">
-                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_irrigation}}</span>
+                    <span v-if="item.schedule_date == timenow">
+                      <span v-if="item.dialysis_prescription.dialysis_irrigation!=''"> {{item.dialysis_prescription.dialysis_irrigation}}</span>
+                      <span v-if="item.dialysis_prescription.dialysis_irrigation==''"> {{item.dialysis_solution.dialysis_irrigation}}</span>
+                    </span>
 
                     <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
 
                     <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
                   </td>
                   <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">
-                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_strainer}}</span>
+                    <span v-if="item.schedule_date == timenow">
+                      <span v-if="item.dialysis_prescription.dialysis_strainer!=''">{{item.dialysis_prescription.dialysis_strainer}}</span> 
+                      <span v-if="item.dialysis_prescription.dialysis_strainer==''">{{item.dialysis_solution.dialysis_strainer}}</span> 
+                    </span>
 
                     <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_strainer}}</span>
 

src/xt_pages/dialysis/signPrint.vue

                             规格:{{getSpecialName(it.drug_id)}} 
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                              
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

                       </tr>
                       <tr>
                         <td width="50">时间</td>
-                        <td width="60">温度(°C)</td>
+                        <td width="60">透析液温度(°C)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="65">血压<br />(mmHg)</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

                   <div style="margin-left:70px ; display: inline-block;">
                     医师签名:
 
-                    <span v-if="setAdminUserES(prescription.creater) == ''">
+                    <!-- <span v-if="setAdminUserES(prescription.creater) == ''">
                       {{ getAdminUser(prescription.creater) }}
                     </span>
                     <img
                       :src="setAdminUserES(prescription.creater)"
                       alt
                       srcset
-                      v-else
+                      v-else -->
+                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                        {{ getAdminUser(advices[0].advice_doctor) }}
+                      </span>
+                      <img
+                        class="es-img"
+                        style="height: 30px"
+                        :src="setAdminUserES(advices[0].advice_doctor)"
+                        alt
+                        srcset
+                        v-else
                     />
                   </div>
                 </td>
                     </div>
                     <div style="display: inline-block; margin-left: 30px;">
                       医生签名：
-
-                      <span v-if="setAdminUserES(prescription.creater) == ''">
-                        {{ getAdminUser(prescription.creater) }}
+                       
+                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                        {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
                         class="es-img"
                         style="height: 30px"
-                        :src="setAdminUserES(prescription.creater)"
+                        :src="setAdminUserES(advices[0].advice_doctor)"
                         alt
                         srcset
                         v-else

src/xt_pages/role/admin.vue

           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> 
+          @click="toAutoDiagnose">自动脚本</el-button>  -->
      </div>
 
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

                </tr>
             </template>
           </el-table-column>
+          <el-table-column label="使用患者" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{getPatientName(item.patient_id)}}
+                  </td>
+               </tr>
+            </template>
+          </el-table-column>
           <el-table-column label="单价" align="center">
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
       warehouseOutList:[],
       exportLoding:false,
       outInfoList:[],
+      patients:[],
     };
   },
   methods: {
           for (let i = 0; i < response.data.data.houseList.length; i++) {
             this.houseList.push(response.data.data.houseList[i]);
           }
+         
         }
       });
     },
           for (let i = 0; i < response.data.data.houseList.length; i++) {
             this.houseList.push(response.data.data.houseList[i]);
           }
+          var objOne = {id:0,name:"系统"}
+          this.patients.push(objOne)
+          for(let i=0;i<response.data.data.patients.length;i++){
+             this.patients.push(response.data.data.patients[i])
+          }
         }
       });
     },
     }
     return max_str + min_str;
   },
+  getPatientName(patient_id){
+      var name = ""
+      console.log("patinetsowowowo",this.patients)
+      for(let i=0;i<this.patients.length;i++){
+         if(patient_id == this.patients[i].id){
+             name = this.patients[i].name
+         }
+      }
+      return name
+    }
   },
 };
 </script>

src/xt_pages/stock/stockFlow.vue

 
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+
+          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
         </span>
        
       </div>
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockDrugCount,getStockFlow} from "@/api/stock"
+  import {getStockDrugCount,getStockFlow,getStockFlowOrderList} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
     formatJson(filterVal, jsonData) {
      return jsonData.map(v => filterVal.map(j => v[j]))
     },
+    toTongBu(){
+       var params = {
+         good_id:this.$route.query.id,
+       }
+      getStockFlowOrderList(params).then(response=>{
+
+      })
+    }
 
     }
   }

src/xt_pages/stock/stockOutOrder.vue

                </tr>
             </template>
           </el-table-column>
+
+          <el-table-column label="使用患者" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+            
+              <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getPatientName(item.patient_id ) }}
+                  </td>
+               </tr>
+            </template>
+          </el-table-column>
       
           <el-table-column label="出货价" align="center">
             <template slot-scope="scope">
       flowList:[],
       cancelInfoList:[],
       exportLoding:false,
+      patients:[]
     };
   },
   methods: {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
+          
         }
       });
     },
           for (let i = 0; i < response.data.data.houselist.length; i++) {
             this.houselist.push(response.data.data.houselist[i]);
           }
+          var objOne = {id:0,name:"系统"}
+          this.patients.push(objOne)
+          for(let i=0;i<response.data.data.patients.length;i++){
+             this.patients.push(response.data.data.patients[i])
+          }
         }
       });
     },
         }
       }
      
+      return name
+    },
+    getPatientName(patient_id){
+      var name = ""
+      for(let i=0;i<this.patients.length;i++){
+         if(patient_id == this.patients[i].id){
+             name = this.patients[i].name
+         }
+      }
       return name
     }
   },

src/xt_pages/stock/stockOutOrderEdit.vue

   import { deleteWarehouseOutInfo, editWarehouseoutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber,checkWarehouseOut,returnCheckWarehouseOut } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
+import patient from '../../router/modules/patient'
 
   export default {
     components: { StockInDialog, BreadCrumb},
                 return
               }
             }
+            console.log("类别喔喔喔w",this.recordInfo.recordData)
             for(let i=0;i<this.recordInfo.recordData.length;i++){
 
               if(parseInt(this.recordInfo.recordData[i].count) > parseInt(this.recordInfo.recordData[i].stock_count) ){
             }
 
             console.log("paramswowowoowow",params)
+            
             var warehout_id = parseInt(this.$route.query.id)
            
             editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer,this.storehouse_id).then(response => {
         }
       getSingleOutOrderDetail(params).then(response=>{
         if(response.data.state == 1){
-
+          this.patients =[]
+          var obj ={id:0,name:"系统"}
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
           var dealerList = response.data.data.dealerList
           this.dealerList = dealerList
           var manufacturerList = response.data.data.manufacturerList
             response.data.data.list[i].remark = response.data.data.list[i].remark
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
-            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
+          
+            // response.data.data.list[i].patient_id = this.getPatientName(response.data.data.list[i].patient_id)
+           
             if(response.data.data.list[i].dealer == 0){
                response.data.data.list[i].dealer = ""
             }
             if(response.data.data.list[i].manufacturer ==0 ){
                response.data.data.list[i].manufacturer = ""
             }
-            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
+            
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
+          console.log("列表我我哦我o",this.recordInfo.recordData)
           this.storelist = response.data.data.storelist
           this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
           this.storehouse_id = response.data.data.out.storehouse_id
-          var obj ={id:0,name:"系统"}
-          this.patients =[]
-          this.patients.push(obj)
-          if(response.data.data.patients!=null){
-            for(let i=0;i<response.data.data.patients.length;i++){
-              this.patients.push(response.data.data.patients[i])
-            }
-          }
+        
+         
           loading.close();
         }
       })
            loading.close()
          }
       })
+    },
+    getPatientName(patient_id){
+      var name = ""
+      for(let i=0;i<this.patients.length;i++){
+         if(patient_id == this.patients[i].id){
+             name = this.patients[i].name
+         }
+      }
+      return name
     }
 
     },

src/xt_pages/user/Physicalexamination.vue

           yinyang_options:[
             {value:1, label:"良好"},
             {value:2, label:"中等"},
-            {value:2, label:"不良"},
-            {value:2, label:"恶病质"},
+            {value:3, label:"不良"},
+            {value:4, label:"恶病质"},
 
           ],  shenzhi_options:[
             {value:1, label:"清楚"},

src/xt_pages/workforce/remind_print_setting.vue

                    <span>{{getAnticoagulant(main_collection.dialysissolution.anticoagulant)}}</span>
                   </span>
                 </div>
-               <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
-                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
+               <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675||org_id ==10571">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
+                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675 || org_id ==10571">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">