8月15日

src/api/his/his_config.js

   })
 }
 
+export function getPatientListTwenty(params) {
+  return request({
+    url: '/api/his/patient/getpatientlisttwenty',
+    method: 'Get',
+    params: params
+  })
+}
+
 export function getPrescriptionTemplateList(params) {
   return request({
     url: '/api/his/prescriptiontemplate/list',

src/xt_pages/dialysis/details/assessmentBefore.vue

           <span class="content" v-if="dry_weight != '0'">{{ dry_weight }}</span>
           <span class="unit" v-if="dry_weight != '0'">kg</span>
         </li>
+
+        <li v-if="isShow('身高')">
+          <label>身高 : </label>
+          <span class="content">
+            {{this.record.height}}
+          </span>
+        </li>
+        <li v-if="isShow('年龄')">
+          <label>年龄 : </label>
+          <span class="content">
+            {{this.record.age}}
+          </span>
+        </li>
         <li v-if="isShow('脉搏')">
           <label>脉搏 : </label>
           <span class="content" v-if="pulse_frequency != '0'">{{

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

             </el-form-item>
           </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="身高(cm)："
+                          v-if="isShow('身高')">
+              <el-input  v-model="assessmentBeforeDislysis.height"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="年龄(岁)：" v-if="isShow('年龄')">
+              <el-input  v-model="assessmentBeforeDislysis.age" ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="衣物重(kg)：" v-if="isShow('衣物重')">
               <el-input type="number" v-model="assessmentBeforeDislysis.additional_weight"></el-input>
           urea_befor:"",
           suction:"",
           weight_befor_remake:"",
+          height:"",
+          age:"",
         },
 
         InnerDialogProps: {

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

                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
-                            <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant==7" :label="'首剂(mg):'"> 
+                            <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant==7 && this.$store.getters.xt_user.template_info.template_id!=6" :label="'首剂(mg):'"> 
                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
 
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                           <el-form-item v-else :label="'首剂(iu):'"> 
+                           <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant!=7" :label="'首剂(iu):'"> 
                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
 
                             </el-form-item>
 
                              <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant == 7'
+                                    v-if='this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant == 7 && this.$store.getters.xt_user.template_info.template_id!=6'
                                     :label="'总量(mg)'">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
-                            <el-form-item v-else  :label="总量(mg)">
+                            <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant!=7" :label="'总量(iu)'">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"

src/xt_pages/hospitalStation/components/deskPrescription.vue

           return
         }
        }
-      this.teamList.push(row)
+      this.teamList = selection
     },
     getlist() {
       this.tabProject = []

src/xt_pages/hospitalStation/doctorDesk.vue

                         <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
                         <el-tab-pane label="透析记录" name="透析记录"></el-tab-pane>
                         <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-                       
+
                     </el-tabs>
-                   
+
                     <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
                         <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                                    v-loading="saveLoading">保存
                     price: prescription.project[b].price,
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
+                    unit: prescription.project[b].unit,
                     type: prescription.project[b].type
 
                   }
                       total: prescription.project[b].count.toString(),
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit,
+                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type
 
                     }
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
 
                           }
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type
                       }
 
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

         this.teamList = row
       },
       selectChange(selection, row) {
-        console.log('row', row)
+        console.log('row', selection)
         // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
         //    if (row.stock_count <= 0) {
         //     if (row.type == 3) {
               return
           }
          }
-
-        this.teamList.push(row)
+        this.teamList = selection
       },
       getlist() {
         this.tabProject = []

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit,
+                  unit: prescription.project[b].unit,
                   type: prescription.project[b].type,
                   execution_state: prescription.project[b].execution_state,
 
                     total: prescription.project[b].count.toString(),
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
+                    unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
                     execution_state: 2,
 
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
                       }
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
 
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
 
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
 
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit,
+                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state
 
                         total: prescription.project[b].count.toString(),
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: 2
 
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state
 
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
                         }
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state
 
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
   delHisPrescriptionTemplate,
-  getPatientList,
+  getPatientListTwenty,
   getPrescriptionTemplateList,
 } from "@/api/his/his_config";
 import { uParseTime } from "@/utils/tools";
       });
     },
     getList(id) {
-      getPatientList().then((response) => {
+      getPatientListTwenty().then((response) => {
         if (response.data.state == 1) {
           this.data = response.data.data.list;
           this.all_data = response.data.data.list;

src/xt_pages/stock/detail/cancelStockDetail.vue

 
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
-            {{ typeName(scope.row.good_type_id) }}
+           <span v-if="scope.row.is_total!=1"> {{ typeName(scope.row.GoodInfo.good_type_id) }}</span>
           </template>
         </el-table-column>
 
       return name;
     },
     typeName: function(good_type_id) {
+      console.log("good_type_id",good_type_id)
+      console.log("goodType",this.goodType)
       let name = "";
       for (let i = 0; i < this.goodType.length; i++) {
         if (this.goodType[i].id == good_type_id) {
             this.cancelStockDate.push(obj);
 
           }
-
+          console.log("list232323232322332232323ow",this.cancelStockDate)
           this.tableDataList = response.data.data.list
 
           var listgroup = response.data.data.listgroup
              }
           }
         }
+        console.log("tableist233232323w",this.tableList)
         this.tableList = listgroup
 
         }

src/xt_pages/user/components/PatientDetail.vue

           <span>{{ form.registrars }} </span>
         </el-form-item>
       </el-col>
+
+       <el-col :span="6">
+        <el-form-item label="医生 : ">
+           <el-select v-model="form.doctor">
+              <el-option
+                v-for="item in adminUserOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+        </el-form-item>
+      </el-col>
     </el-form>
 
     <div style="display: none">
                 }}</span>
                 <span v-else>{{ printDate }}</span>
               </div>
-              <div class="proj"><span class="proj_title">医生签名：</span></div>
+              <div class="proj">
+                 <span class="proj_title">医生签名：
+                    <span v-if="patientPrint!=undefined&&getDcotorName(patientPrint.doctor) == ''">{{getDcotorNameOne(patientPrint.doctor)}}</span>
+                    <span v-else>
+                      <img style="height:30px;margin-top:20px" :src="getDcotorName(patientPrint.doctor)" alt="" srcset="">
+                    </span>
+                 </span>
+              </div>
             </div>
           </div>
         </div>
   troble_shoot: "",
   zb_patient_id: "",
   treatment_plan: "",
+  doctor:"",
 };
 
 export default {
         { id: 1, name: "是" },
         { id: 2, name: "否" },
       ],
+      operators:[],
     };
   },
   computed: {
   },
   created() {
     this.org_id = this.$store.getters.xt_user.org.id;
+    this.form.doctor = this.$store.getters.xt_user.user.id
+    console.log("owowow",this.$store.getters.xt_user.user.id)
+  
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
             this.form.treatment_plan = patietInfo.treatment_plan;
+            this.form.doctor = patietInfo.doctor
             if (patietInfo.is_infectious == 1) {
               this.form.remind_cycle = 0;
             }
       fetchAllAdminUsers().then((response) => {
         if (response.data.state === 1) {
           this.adminUserOptions = response.data.data.users;
+          this.operators = response.data.data.operators
+          console.log("医生签名",this.operators)
         }
       });
     },
-
+   getDcotorName(admin_user_id){
+    var url = ""
+    if(this.operators!=null && this.operators.length > 0){
+      for(let i=0;i<this.operators.length;i++){
+        if(admin_user_id == this.operators[i].admin_user_id){
+          url = this.operators[i].url
+        }
+      }
+    }
+  
+    return url
+   },
+   getDcotorNameOne(admin_user_id){
+    var name = ""
+    for(let i=0;i<this.adminUserOptions.length;i++){
+      if(admin_user_id == this.adminUserOptions[i].id){
+          name = this.adminUserOptions[i].name
+      }
+    }
+    return name
+   },
     printCard() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");

src/xt_pages/user/components/PatientForm.vue

             </el-form-item>
           </el-col>
 
+         <el-col :span="6">
+          <el-form-item label="医生 : ">
+            <el-select v-model="form.doctor">
+                <el-option
+                  v-for="(item,index) in adminUserOptions"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+          </el-form-item>
+       </el-col>
+
           <el-col :span="24" align="right" class="newCol">
             <el-form-item>
               <el-button
   generateDialysisNo,
   GetPatientTotal
 } from "@/api/patient";
+import { fetchAllAdminUsers } from "@/api/doctor";
 // import { fetchAllDoctorAndNurse } from "@/api/doctor";
 import { getDataConfig } from "@/utils/data";
 
   user_sys_before_count: "",
   troble_shoot:2,
   zb_patient_id:"",
+  doctor:"",
   formItem: [
     {
       id: 0,
   dbp: "",
   showOne:true,
   treatment_plan:"",
+ 
 };
 
 export default {
 
         // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
         // homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
-      }
+      },
+      adminUserOptions:[],
     };
   },
   components: {
     }
   },
   created() {
+  
+   this.fetchAllAdminUsers();
+  
+  
     if(this.isEdit == true){
        this.showLapseto = false
     }
       this.form = Object.assign({}, defaultForm);
       this.form.lapseto  = 1
     }
+
   },
   watch: {
     "form.record_date": function(val) {
     }
   },
   methods: {
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then((response) => {
+        if (response.data.state === 1) {
+          this.form.doctor = this.$store.getters.xt_user.user.id
+          this.adminUserOptions = response.data.data.users;
+         
+        }
+      });
+    },
     recordCheck() {
       if (this.form.record_date == "") {
         this.$message.error("请先选择检验检查日期");
             this.form.age = parseInt(this.form.age);
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
-
+            this.form.doctor = parseInt(this.form.doctor)
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
             }else{
           } else {
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
-
+            this.form.doctor = parseInt(this.form.doctor)
+            console.log("form233322332w",this.form)
+           
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {
             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }
+            this.form.doctor = patietInfo.doctor
             this.checkIdCardNo();
           } else {
             this.$notify.error({