新分支

src/api/device.js

@@ -382,4 +382,21 @@ export function deleteObjectRegistration(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getRegistGoodInforList(params){
+  return request({
+    url:"/api/manage/getregistgoodinforlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getRegistNumber(id,record_date,params){
+  
+  return request({
+    url:"/api/manage/getregistnumber?id="+id+"&record_date="+record_date,
+    method:"Get",
+    params:params,
+  })
 }

src/api/role/admin.js

@@ -92,4 +92,20 @@ export function toSign(params){
     method:"get",
     params:params
   })
+}
+
+export function toTestOne(params){
+  return request({
+    url:"/api/sign/createrusername",
+    method:"get",
+    params:params
+  })
+}
+
+export function toTestTwo(params){
+  return request({
+    url:"/api/sign/createpersionseal",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/device/objectRegistration.vue

@@ -45,7 +45,7 @@
 
                 <el-table-column prop="fenopda" label="使用数量" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{ scope.row.model_number }}
+                        {{ scope.row.user_count }}
                     </template>
                 </el-table-column>
 
@@ -128,20 +128,29 @@
                 <el-form :model="form" ref="form">
                     <el-row :span="24">
                       <el-col :span="8">
-                        <el-form-item label="登记日期:" label-width="110px" prop="record_date" >
+                        <el-form-item label="登记日期:" label-width="110px" prop="record_date">
                             <el-date-picker
                             value-format="yyyy-MM-dd"
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="record_date">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -251,14 +260,23 @@
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="model_number">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -427,7 +445,9 @@
         getRegistrationDisInfectList,
         getObjectRegistrationByIdList,
         UpdateObjectRegistration,
-        deleteObjectRegistration 
+        deleteObjectRegistration,
+        getRegistGoodInforList,
+        getRegistNumber 
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -491,10 +511,11 @@
          ],
          operators: [],
          operatorMaps:{},
-         
+         goodList:[],
         }
       },
       created(){
+        this.getRegistGoodInforList()
         this.getAllDoctorList()
         this.getlist()
       },
@@ -723,10 +744,16 @@
                 if(this.form.packaging_identification ==false ){
                     packaging_identification_one = 2
                 }
+                var model_number = ""
+                for(let i=0;i<this.goodList.length;i++){
+                  if(this.form.model_number == this.goodList[i].id){
+                    model_number = this.goodList[i].specification_name
+                  }
+                }
                 var params = {
                     id:this.form.id,
                     record_date:this.form.record_date,
-                    model_number:this.form.model_number,
+                    model_number:model_number,
                     user_count:this.form.user_count.toString(),
                     product_date:this.form.product_date,
                     expiry_date:this.form.expiry_date,
@@ -844,9 +871,15 @@
               if(this.form.packaging_identification ==false ){
                 packaging_identification_one = 2
               }
+              var model_number = ""
+              for(let i=0;i<this.goodList.length;i++){
+                if(this.form.model_number == this.goodList[i].id){
+                   model_number = this.goodList[i].specification_name
+                }
+              }
               var params = {
                 record_date:this.form.record_date,
-                model_number:this.form.model_number,
+                model_number:model_number,
                 user_count:this.form.user_count.toString(),
                 product_date:this.form.product_date,
                 expiry_date:this.form.expiry_date,
@@ -870,6 +903,32 @@
       },
       toSeach(){
         this.getlist()
+      },
+      getRegistGoodInforList(){
+        getRegistGoodInforList().then(response=>{
+           if(response.data.state == 1){
+             var  goodList =  response.data.data.list
+             this.goodList = goodList
+           } 
+        })
+      },
+
+      changeModelNumber(val){
+        console.log("val23233223",val)
+
+        getRegistNumber(val,this.form.record_date).then(response=>{
+          if(response.data.state ==1 ){
+            var list =  response.data.data.list
+            var count = 0
+            if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                count +=list[i].count
+              }
+            }
+            this.form.user_count = ""
+            this.form.user_count = count
+          }
+        })
       }
         
       }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1336,6 +1336,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id == 0">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836">
@@ -1465,6 +1466,13 @@
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id==0 || org_id == 10478">
+                            {{
+                              monitor_record.arterial_pressure
+                                ? monitor_record.arterial_pressure
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.venous_pressure

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

@@ -312,11 +312,13 @@
                         this.$store.getters.xt_user.template_info.org_id != 9829 &&
                         this.$store.getters.xt_user.template_info.org_id != 10440 &&
                         this.$store.getters.xt_user.template_info.org_id != 10469 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10471 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10495">
+                       <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
                           this.$store.getters.xt_user.template_info.template_id != 45 &&
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10387">
+                          this.$store.getters.xt_user.template_info.org_id != 10387 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -360,7 +362,8 @@
                                     this.$store.getters.xt_user.template_info.template_id == 38 ||
                                     this.$store.getters.xt_user.template_info.org_id == 9987 ||
                                     this.$store.getters.xt_user.template_info.org_id == 10346 ||
-                                    this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    this.$store.getters.xt_user.template_info.org_id == 10387 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10495'
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -411,8 +414,8 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
                                            this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -420,7 +423,8 @@
                                             this.$store.getters.xt_user.template_info.template_id != 38 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9987  &&
                                             this.$store.getters.xt_user.template_info.org_id != 54 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 9990 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10495" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -435,7 +439,9 @@
                                           this.$store.getters.xt_user.template_info.org_id == 54 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10346 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10387  ||
-                                          this.$store.getters.xt_user.template_info.org_id == 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                          this.$store.getters.xt_user.template_info.org_id == 9990 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10495
+                                          " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -490,10 +496,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -501,7 +507,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 '
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1432,6 +1432,14 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
+                        <td width="50" v-if="org_id==10478 || org_id == 0">
+                          动脉压<br />({{
+                            monitors[0] &&
+                            monitors[0]["venous_pressure_type"] == 2
+                              ? "kpa"
+                              : "mmHg"
+                          }})
+                        </td>
                         <td width="50">
                           静脉压<br />({{
                             monitors[0] &&
@@ -1480,6 +1488,13 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                        <td v-if="org_id == 0 ||org_id ==10478">
+                          {{
+                            monitor.arterial_pressure
+                              ? monitor.arterial_pressure
+                              : ""
+                          }}
+                        </td>
                         <td>
                           {{
                             monitor.venous_pressure
@@ -1635,6 +1650,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0 || org_id ==10478"></td>
                         <td></td>
                         <td></td>
                         <td></td>
@@ -3009,13 +3025,13 @@
                       >
                         <span
                           style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(prescription.creater) == ''"
+                          v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
                         >
-                          {{ getAdminUser(prescription.creater) }}
+                          {{ getAdminUser(doctor_advices[0].advice_doctor) }}
                         </span>
                         <img
                           style="height: 40px"
-                          :src="setAdminUserES(prescription.creater)"
+                          :src="setAdminUserES(doctor_advices[0].advice_doctor)"
                           alt=""
                           srcset=""
                           v-else

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1092,7 +1092,7 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10475">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>

src/xt_pages/hospitalStation/hospitalBatchStatementPrint.vue

@@ -197,54 +197,112 @@ export default {
             return false
           } else {
             let infos = []
+            console.log(response.data.data.infos)
             for(var i  = 0; i < response.data.data.infos.length; i++){
+              let tempInfo = {}
               var info = response.data.data.infos[i]
-              that.info['patient'] = info.patient
-              that.info['diagnosis'] = info.diagnosis
-              that.info['p_admin'] = info.printor_admin
-              that.info['charge_admin'] = info.charge_admin
-              that.info['fixmedins_name'] = info.org_name
-              that.info['fixmedins_code'] = info.org_code
-              that.info['order'] = info.order
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['dia_config'] = info.dia_config
-              that.info['doctor_info'] = info.doctor_info
-              that.info['bed_cost_total'] = info.bedCostTotal
-              that.info['bed_cost_self_total'] = info.bedCostSelfTotal
-              that.info['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
-              that.info['operation_cost_total'] = info.operationCostTotal
-              that.info['operation_cost_self_total'] = info.operationCostSelfTotal
-              that.info['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
-              that.info['other_cost_total'] = info.otherCostTotal
-              that.info['other_cost_self_total'] = info.otherCostSelfTotal
-              that.info['other_cost_part_self_total'] = info.otherCostPartSelfTotal
-              that.info['material_cost_total'] = info.materialCostTotal
-              that.info['material_cost_self_total'] = info.materialCostSelfTotal
-              that.info['material_cost_part_self_total'] = info.materialCostPartSelfTotal
-              that.info['western_medicine_cost_total'] = info.westernMedicineCostTotal
-              that.info['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
-              that.info['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
-              that.info['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
-              that.info['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
-              that.info['check_cost_total'] = info.checkCostTotal
-              that.info['check_cost_self_total'] = info.checkCostSelfTotal
-              that.info['check_cost_part_self_total'] = info.checkCostPartSelfTotal
-              that.info['laboratory_cost_total'] = info.laboratoryCostTotal
-              that.info['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
-              that.info['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
-              that.info['treat_cost_total'] = info.treatCostTotal
-              that.info['treat_cost_self_total'] = info.treatCostSelfTotal
-              that.info['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
-              that.info['date'] = info.date
-              that.info['number'] = info.number
-              that.info['order_infos'] = info.order_infos
-              that.info['diagnosis'] = info.diagnosis
-              that.info['his'] = info.his_hospital
-              infos.push(that.info)
+              console.log("info1")
+              console.log(info)
+              tempInfo["patient"] = info.patient
+              console.log("info2")
+              console.log(info.patient)
+
+              tempInfo["diagnosis"] = info.diagnosis
+              console.log("info3")
+              console.log(info.diagnosis)
+
+              tempInfo["p_admin"] = info.printor_admin
+              console.log("info4")
+              console.log( info.printor_admin)
+              tempInfo['charge_admin'] = info.charge_admin
+              console.log("info5")
+              console.log( info.charge_admin)
+              tempInfo['fixmedins_name'] = info.org_name
+              console.log("info6")
+              console.log( info.org_name)
+              tempInfo['fixmedins_code'] = info.org_code
+              console.log("info7")
+              console.log( info.org_code)
+              tempInfo['order'] = info.order
+              console.log("info8")
+              console.log( info.order)
+              tempInfo['date'] = info.date
+              console.log("info9")
+              console.log( info.date)
+              tempInfo['number'] = info.number
+              console.log("info10")
+              console.log( info.number)
+              tempInfo['order_infos'] = info.order_infos
+              console.log("info11")
+              console.log( info.order_infos)
+              tempInfo['diagnosis'] = info.diagnosis
+              console.log("info12")
+              console.log( info.diagnosis)
+              tempInfo['dia_config'] = info.dia_config
+              console.log("info13")
+              console.log( info.dia_config)
+              tempInfo['doctor_info'] = info.doctor_info
+              console.log("info14")
+              console.log( info.doctor_info)
+              tempInfo['bed_cost_total'] = info.bedCostTotal
+              console.log("info15")
+              console.log( info.bedCostTotal)
+              tempInfo['bed_cost_self_total'] = info.bedCostSelfTotal
+              console.log("info16")
+              console.log( info.bedCostSelfTotal)
+              tempInfo['bed_cost_part_self_total'] = info.bedCostPartSelfTotal
+              console.log("info17")
+              console.log( info.bedCostPartSelfTotal)
+              tempInfo['operation_cost_total'] = info.operationCostTotal
+              console.log("info18")
+              console.log( info.operationCostTotal)
+              tempInfo['operation_cost_self_total'] = info.operationCostSelfTotal
+              console.log("info19")
+              console.log( info.operationCostSelfTotal)
+              tempInfo['operation_cost_part_self_total'] = info.operationCostPartSelfTotal
+              console.log("info20")
+              console.log( info.operationCostPartSelfTotal)
+              tempInfo['other_cost_total'] = info.otherCostTotal
+              console.log("info21")
+              console.log( info.otherCostTotal)
+              tempInfo['other_cost_self_total'] = info.otherCostSelfTotal
+              console.log("info22")
+              console.log( info.otherCostSelfTotal)
+              tempInfo['other_cost_part_self_total'] = info.otherCostPartSelfTotal
+              console.log("info23")
+              console.log( info.otherCostPartSelfTotal)
+              tempInfo['material_cost_total'] = info.materialCostTotal
+              console.log("info24")
+              console.log( info.materialCostTotal)
+              tempInfo['material_cost_self_total'] = info.materialCostSelfTotal
+              console.log("info25")
+              console.log( info.materialCostSelfTotal)
+              tempInfo['material_cost_part_self_total'] = info.materialCostPartSelfTotal
+              console.log("info26")
+              console.log( info.materialCostPartSelfTotal)
+              tempInfo['western_medicine_cost_total'] = info.westernMedicineCostTotal
+              console.log("info27")
+              console.log( info.westernMedicineCostTotal)
+              tempInfo['western_medicine_cost_self_total'] = info.westernMedicineCostSelfTotal
+              console.log("info28")
+              console.log( info.westernMedicineCostSelfTotal)
+              tempInfo['western_medicine_cost_part_self_total'] = info.westernMedicineCostPartSelfTotal
+              console.log("info29")
+              console.log( info.westernMedicineCostPartSelfTotal)
+              tempInfo['chinese_traditional_medicine_cost_total'] = info.chineseTraditionalMedicineCostTotal
+              tempInfo['chinese_traditional_medicine_cost_self_total'] = info.chineseTraditionalMedicineCostSelfTotal
+              tempInfo['chinese_traditional_medicine_cost_part_self_total'] = info.chineseTraditionalMedicineCostPartSelfTotal
+              tempInfo['check_cost_total'] = info.checkCostTotal
+              tempInfo['check_cost_self_total'] = info.checkCostSelfTotal
+              tempInfo['check_cost_part_self_total'] = info.checkCostPartSelfTotal
+              tempInfo['laboratory_cost_total'] = info.laboratoryCostTotal
+              tempInfo['laboratory_cost_self_total'] = info.laboratoryCostSelfTotal
+              tempInfo['laboratory_cost_part_self_total'] = info.laboratoryCostPartSelfTotal
+              tempInfo['treat_cost_total'] = info.treatCostTotal
+              tempInfo['treat_cost_self_total'] = info.treatCostSelfTotal
+              tempInfo['treat_cost_part_self_total'] = info.treatCostPartSelfTotal
+              tempInfo['his'] = info.his_hospital
+              infos.push(tempInfo)
             }
             that.infos = infos
             console.log(infos)

src/xt_pages/management/components/ManageForm.vue

@@ -34,6 +34,24 @@
             </el-form-item>
           </el-col>
 
+          <!-- <el-col :span="8">
+            <el-form-item
+              label="分区:"
+              v-show="bedShow"
+              required
+              prop="zone_id"
+            >
+              <el-select style="width:135px" v-model="form.zone_id">
+                <el-option
+                  v-for="item in this.deviceType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+
           <el-col :span="8">
             <el-form-item
               label="机位号:"
@@ -388,7 +406,8 @@ export default {
         revers_mode: "", // 反渗模式
         treat_mode: [],
         treat_type: [], // 治疗模式
-        beds: ""
+        beds: "",
+        zone_id:"",
       },
       forms: {
         beds: ""
@@ -471,6 +490,7 @@ export default {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
           var zones = response.data.data.zones;
+        
           this.deviceType = zones;
           var numbers = response.data.data.numbers;
           var devicenumber = response.data.data.devicenumber;

src/xt_pages/management/home.vue

@@ -117,6 +117,13 @@
                                   </el-select>
                                  </el-form-item>
                               </el-col>
+                              <el-col :span="8">
+                                  <el-form-item label="分区:">
+                                       <el-select style="width:150px" v-model="form.zone_id" :disabled="disableThree">
+                                          <el-option v-for="item in this.bedZone" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                       </el-select>
+                                  </el-form-item>
+                              </el-col>
                               <el-col :span="8">
                                   <el-form-item label="机位号:">
                                        <el-select style="width:150px" v-model="form.bed_number" :disabled="disableThree">
@@ -2779,7 +2786,8 @@ export default {
           Disinfection_mode: '',
           revers_mode: '',
           beds: '',
-          bed_numbers: ''
+          bed_numbers: '',
+          zone_id:"",
         },
         activeName: 'first',
         activeNameTwo: 'first',
@@ -3347,6 +3355,7 @@ export default {
       getAllSubregion() {
         getAllSubregion().then(response => {
           var zones = response.data.data.zones
+          console.log("zones",zones)
           this.deviceType = zones
           var numbers = response.data.data.numbers
 
@@ -3469,6 +3478,7 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
+            console.log("addmacher",addmacher)
             var warning = response.data.data.warning
 
             var time = this.getTimestamp(this.userform.date) - warning.stime
@@ -3587,7 +3597,10 @@ export default {
             this.form.device_name = addmacher.device_name
             this.form.manufacture_factory = addmacher.manufacture_factory
             this.form.service_manufacturer = addmacher.service_manufacturer
-
+            if(addmacher.zone_id >=0){
+              this.form.zone_id = addmacher.zone_id
+            }
+          
             // this.form.unit_type = addmacher.unit_type
 
             this.form.unit_type = parseInt(addmacher.device_mode)

src/xt_pages/medicalScheduling/index.vue

@@ -954,13 +954,24 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
-
-                    this.tableData = data
+                    console.log("data2o2oo2o2o2o22o",data)
+                    this.tableData = this.distinct(data)
 
 
                 }
             })
         },
+        distinct(tempArr) {
+            for (let i = 0; i < tempArr.length; i++) {
+                for (let j = i + 1; j < tempArr.length; j++) {
+                    if (tempArr[i].admin_user_id == tempArr[j].admin_user_id) {
+                        tempArr.splice(j, 1);
+                        j--;
+                    };
+                };
+            };
+            return tempArr;
+       },
 
         getClass(name,index){
             if(name != undefined){

src/xt_pages/role/admin.vue

@@ -21,7 +21,22 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toTest">测试</el-button> -->
+          @click="toTest">短信</el-button> -->
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestOne">个人用户实名</el-button> -->
+         
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTwo">创建个人印章</el-button> -->
+          
      </div>
     
       
@@ -176,7 +191,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus,toSign } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -473,6 +488,22 @@ export default {
           console.log("sign",sign)
         }
       })
+    },
+    toTestOne(){
+      toTestOne().then(response=>{
+        if(response.data.state==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestTwo(){
+      toTestTwo().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
     }
   },
   watch: {

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

@@ -94,6 +94,11 @@
                 {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                 {{scope.row.number}}
@@ -402,6 +407,7 @@ export default {
      isClose: false,
      drug_type: 0,
      storehouseId:0,
+     dealerList:[],
     }
   
   },
@@ -454,6 +460,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -1489,7 +1496,16 @@ export default {
           this.$message.success("保存成功!")
         }
       })
-    }
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
   created(){
     this.getStorehouseList()

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -99,6 +99,18 @@
                  <span v-if="scope.row.inventory_type == 11">盘亏</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -222,6 +234,15 @@ export default {
         console.log("str",str)
         this.ids = str  
       },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+           if(admin_user_id == this.doctorList[i].admin_user_id){
+               user_name = this.doctorList[i].user_name
+           }
+         }
+         return user_name
+      }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryDetails.vue

@@ -41,13 +41,13 @@
                   {{scope.row.good_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="规格" width="200" align="center">
+            <el-table-column prop="name" label="规格" width="100" align="center">
                <template slot-scope="scope">
                   {{scope.row.specification_name}}
                 </template>
             </el-table-column>
 
-            <el-table-column  prop="name" label="有效日期" width="200" align="center">
+            <el-table-column  prop="name" label="有效日期" width="100" align="center">
                <template slot-scope="scope">
                  {{getTime(scope.row.expire_date)}}
                </template>
@@ -88,6 +88,18 @@
                 <span v-if="scope.row.inventory_type ==7">有效期到期</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
           
         </el-table>
         <el-pagination
@@ -107,6 +119,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
+import user from '../../store/modules/user';
 
 export default {
     name: "inventory",
@@ -127,6 +140,7 @@ export default {
             damageList:[],
             storehouse_id:0,
             houseList:[],
+            docList:[]
          }
     },
     methods:{
@@ -173,6 +187,7 @@ export default {
                for(let i=0;i<response.data.data.houseList.length;i++){
                  this.houseList.push(response.data.data.houseList[i])
                }
+               this.docList = response.data.data.doclist
               
              }
           })
@@ -236,6 +251,15 @@ export default {
       changeHouseList(){
         this.houseList = []
         this.getlist()
+      },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.docList.length;i++){
+           if(admin_user_id == this.docList[i].admin_user_id){
+               user_name = this.docList[i].user_name
+           }
+         }
+         return user_name
       }
     },
     created(){

src/xt_pages/stock/query/goodNewQuery.vue

@@ -48,6 +48,11 @@
             border
            :cell-class-name="cellStyle"
           >
+          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+              <template slot-scope="scope">
+                 {{ scope.row.good_number?scope.row.good_number:"" }}
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                 {{getGoodTypeName(scope.row.good_type_id)}}
@@ -68,6 +73,11 @@
                   {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                  {{scope.row.number}}
@@ -358,7 +368,8 @@ export default {
      warehouseOutByList:[],
      flushList:[],
      type_name:0,
-     storehouseId:0
+     storehouseId:0,
+     dealerList:[]
     }
   
   },
@@ -411,6 +422,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -445,6 +457,15 @@ export default {
       }
       return manufacturer_name
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
     handleSizeChange(val) {
       this.limit = val;
       this.getlist()

src/xt_pages/user/components/PatientForm.vue

@@ -1497,6 +1497,14 @@ export default {
       this.submitMsg = "新增患者成功";
       this.form = Object.assign({}, defaultForm);
       this.form.lapseto  = 1
+      if(this.org_id == 0 || this.org_id ==9919){
+         this.form.diagnose = "1.慢性肾脏病5期  IgA肾病 维持性血液透析 肾性贫血 肾性高血压  继发性甲状旁腺功能亢进症  2.右前臂自体动静脉内瘘成形术后"
+         this.form.treatment_plan ="完善相关检查，规律血液透析，每周2次，每次5小时。纠正贫血，  达泊丁 （自备） 120ug  皮下注射  每4周1次；控制血压：非洛地平缓释片 5mg    口服  1次/日，酒石酸美托洛尔片 50mg/次 口服  每日1次；阿托伐他汀钙片 40mg/次  口服  每日1次。"
+         this.form.patient_complains = "维持性血液透析1年余"
+         this.form.past_history = "既往否认冠心病、糖尿病等慢性疾病；否认肝炎、结核、艾滋、梅毒等传染病史；否认药物、食物过敏史；无重大手术、外伤史。"
+         this.form.present_history = "患者于30年前体检查尿蛋白+，行肾穿刺活检，病理结果示：IgA肾病，此后于香港当地医院规范治疗，定时复查，至2021年12月复查发现血肌酐渐升高，300+umol/L，血压高于正常，开始为肾透析行右前臂自体动静脉内瘘成形术，1年前导入透析治疗，每周2次，每次5小时，规律维持至今。平素无胸闷、心慌，无咳嗽、咳痰，无恶心、呕吐，饮食、睡眠可，尿量约1000ml/日。本次检查感染四项阴性，血红蛋白103g/L，PTH 28.2pmol/L， Ca 2.17mmol/L ，P 1.57mmol/L。"
+         this.form.remark = "神志清，精神可，体型肥胖，面色黝黑，颜面、眼睑无浮肿，皮肤未见出血点、瘀斑；胸廓对称，心前区无隆起，心界向左扩大，心音有力，节律规整，未闻及明显杂音，双肺呼吸音粗；腹部呈脂肪堆积，腹软，无包块、无皮疹、无静脉曲张、无压痛；脊柱、四肢未见畸形，关节活动正常，肌力正常；双下肢无明显水肿；右前臂自体动静脉内瘘能触及震颤、闻及连续杂音。"
+      }
     }
 
   },

src/xt_pages/workforce/components/tableData.vue

@@ -1379,9 +1379,9 @@ export default {
             }
           }
         } else {
-          if(column.label == '晚' ){
-            return 'evening_border'
-          }
+          // if(column.label == '晚' ){
+          //   return 'evening_border'
+          // }
         }
       }
       return "";