Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/inspection.js

         params:params,
     })
 }
+
+
+export function GetUploadInspections(params){
+  return request({
+    url:'/api/patient/inspection/get',
+    method:'get',
+    params:params,
+  })
+}
+
+export function GetInitInspections(params){
+  return request({
+    url:'/api/patient/inspectioninit/get',
+    method:'get',
+    params:params,
+  })
+}
+
+
+
+

src/xt_pages/data/druguseTemplate.vue

 
               <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
-                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
-                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                  <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.advice_type == 1&&scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.advice_type == 1&&scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
                 </template>
               </el-table-column>
 
 
                   <el-table-column prop="blood_flow_volume" align="center" label="提醒频率" v-if="form.advice_type == 1">
                     <template slot-scope="scope">
-                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
-                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
-                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.advice_type == 1 &&scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
                     </template>
                   </el-table-column>
 

src/xt_pages/upload/fast/FastCountry.vue

       v-on:inspection="inspectionClick()"
     ></fast-patients-sidebar>
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
-    <one v-if="isShow == 1" :id="patientID" :is-edit='true' :class='panelClass'></one>
-    <two v-if="isShow == 2"
+    <one ref="one" v-if="isShow == 1" :patientID="patientID" :is-edit='true' :class='panelClass' @></one>
+    <two ref="two" v-if="isShow == 2"
          :id="patientID"
          :is-edit="true"
          :class="panelClass"></two>
-    <!--<fast-upload-inspectiton-detail-->
-    <!--v-if="isShow == 2"-->
-    <!--:id="patientID"-->
-    <!--:is-edit="true"-->
-    <!--:class="panelClass"-->
-    <!--&gt;</fast-upload-inspectiton-detail>-->
   </div>
 </template>
 
     },
     data() {
       return {
-        patientID: 1,
+        patientID: 0,
         panelClass: 'patient-app-container',
         patientInfo: {
           id: 0
             this.patientsList = response.data.data.patients
             if (type == 1) {
               this.patientID = this.patientsList[0].id
+
             } else {
               this.patientID = this.$route.query.id
             }
+            this.$nextTick(() => {
+              this.$refs.one.fetchPatient(this.patientID)
+
+            })
           }
         })
       },
       patientInfoClick: function() {
         this.isShow = 1
+        this.$nextTick(() => {
+          this.$refs.one.fetchPatient(this.patientID)
+
+        })
+
       },
       inspectionClick: function() {
         this.isShow = 2
+        this.$nextTick(() => {
+          var start_time = new Date(this.getQuarterStartDate().replace(/-/g, '/')).getTime() / 1000
+          var end_time = new Date(this.getQuarterEndDate().replace(/-/g, '/')).getTime() / 1000
+          this.$refs.two.GetInitInspections()
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,1,"1")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,2,"2-4-20")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,3,"21")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,4,"2-4-15-24-25")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,5,"15-23")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,6,"14")
+          this.$refs.two.GetUploadInspections(this.patientID,start_time,end_time,7,"22")
+        })
+
+      }, getQuarterStartDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+
+        var quarterStartDate = new Date(nowYear, this.getQuarterStartMonth(), 1)
+        return this.formatDate(quarterStartDate)
+      }, getQuarterEndDate: function() {
+        var now = new Date() //当前日期
+        var nowYear = now.getFullYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var quarterEndMonth = this.getQuarterStartMonth() + 2
+        var quarterStartDate = new Date(nowYear, quarterEndMonth, this.getMonthDays(quarterEndMonth))
+        return this.formatDate(quarterStartDate)
+      }, formatDate: function(date) {
+        var myyear = date.getFullYear()
+        var mymonth = date.getMonth() + 1
+        var myweekday = date.getDate()
+
+        if (mymonth < 10) {
+          mymonth = '0' + mymonth
+        }
+        if (myweekday < 10) {
+          myweekday = '0' + myweekday
+        }
+        return (myyear + '-' + mymonth + '-' + myweekday)
+      }, getQuarterStartMonth: function() {
+        var now = new Date() //当前日期
+        var nowMonth = now.getMonth() //当前月
+
+        var quarterStartMonth = 0
+        if (nowMonth < 3) {
+          quarterStartMonth = 0
+        }
+        if (2 < nowMonth && nowMonth < 6) {
+          quarterStartMonth = 3
+        }
+        if (5 < nowMonth && nowMonth < 9) {
+          quarterStartMonth = 6
+        }
+        if (nowMonth > 8) {
+          quarterStartMonth = 9
+        }
+        return quarterStartMonth
+      },  //获得某月的天数
+      getMonthDays(myMonth) {
+        var now = new Date() //当前日期
+        var nowYear = now.getYear() //当前年
+        nowYear += (nowYear < 2000) ? 1900 : 0
+        var monthStartDate = new Date(nowYear, myMonth, 1)
+        var monthEndDate = new Date(nowYear, myMonth + 1, 1)
+        var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
+        return days
       }
+
     }
   }
 </script>

src/xt_pages/upload/fast/FastPatientsSidebar.vue

     handleNodeClick(data) {
       var name = data.name;
       if (name == "1-1") {
-        this.$emit("patient");
+        this.$emit("patient",this.selectID);
       } else if (name == "1-2") {
-        this.$emit("inspection");
+        this.$emit("inspection",this.selectID);
       }
     },
 
             for (let index = 0; index < len; index++) {
               if (this.patientsList[index].id == this.id) {
                 this.currentPatient = this.patientsList[index];
-
                 this.selectID = this.patientsList[index].id;
                 this.$emit("tran-patient", this.currentPatient);
                 break;
+
               }
             }
           }

src/xt_pages/upload/fast/FastProvince.vue

               :value="item.id">
             </el-option>
           </el-select>
-          <el-select v-model="form.city" disabled filterable placeholder="请选择" @change="changeCity">
+          <el-select v-model="form.city" disabled filterable placeholder="请选择" >
             <el-option
               v-for="item in citys"
               :key="item.id"
         dialogVisible: false,
         end_time: '',
         provinces: [],
+        citys:[],
         form: {
           province: '',
           city: ''

src/xt_pages/upload/fast/FastUploadDetail.vue

       fetchPatient(id) {
         fetchPatient(id)
           .then(response => {
-            console.log(response.data.data)
             if (response.data.state === 1) {
               this.$emit('tran-patient-info', response.data.data.patient)
               var patietInfo = response.data.data.patient

src/xt_pages/upload/fast/One.vue

       <div class="row">
         <div class="rowOne">
           <p class="rowName">首次诊治时间:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.first_treatment_date" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.first_treatment_date"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName1">
             首次肾脏替代治疗时间 :
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.firstDialysisDate" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.firstDialysisDate"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">创建者:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.registrars" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.registrars"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">创建日期:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.create_time" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.create_time"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">姓名:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.name" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.name"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">性别:</p>
           <div class="radioOne">
             <template>
-              <el-radio v-model="radio" label="1">男</el-radio>
-              <el-radio v-model="radio" label="2">女</el-radio>
+              <el-radio v-model="form.gender" label="1">男</el-radio>
+              <el-radio v-model="form.gender" label="2">女</el-radio>
             </template>
           </div>
         </div>
         <div class="rowOne">
           <p class="rowName">证件类型:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" :disabled="true" v-model="form.id_type">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.id_type"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">身份证号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" style="width: 200px;" v-model="form.idCardNo" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.idCardNo"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
-          <p class="rowName">名族:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <p class="rowName">民族:</p>
+          <el-input placeholder="请输入内容" v-model="form.nation" :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
           <p class="rowName">
             婚姻状况:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  :disabled="true" v-model="form.maritalStatus">
           </el-input>
+
         </div>
         <div class="rowOne">
           <p class="rowName">年龄:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.age" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.age"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">出生日期:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.birth" :disabled="true">
           </el-input>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">教育程度:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" style="width: 270px;" v-model="form.education" :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
           <p class="rowName">
             职业:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  style="width: 270px;" v-model="form.profession" :disabled="true">
           </el-input>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">门诊号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-if="form.source == 1" v-model="form.admissionNumber" :disabled="true">
+          </el-input>
+          <el-input placeholder="请输入内容" v-if="form.source == 2"  :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn"  v-clipboard:copy="form.admissionNumber"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">
             住院号:
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-if="form.source == 2" v-model="form.admissionNumber" :disabled="true">
+          </el-input>
+          <el-input placeholder="请输入内容" v-if="form.source == 1"  :disabled="true">
           </el-input>
+          <div class="btn"  v-clipboard:copy="form.admissionNumber"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">透析病案号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.dialysisNo" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.dialysisNo"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName">透析龄(月):</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.dialysis_age" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.dialysis_age"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row1">
           <p class="rowName">费别:</p>
           <div class="radioOne">
             <template>
-              <el-radio v-model="radio" label="1">基本医保</el-radio>
-              <el-radio v-model="radio" label="2">新农合</el-radio>
-              <el-radio v-model="radio" label="2">自费医疗</el-radio>
-              <el-radio v-model="radio" label="2">公费医疗</el-radio>
-              <el-radio v-model="radio" label="2">商业保险</el-radio>
-              <el-radio v-model="radio" label="2">军队医疗</el-radio>
-              <el-radio v-model="radio" label="2">其他</el-radio>
+              <el-radio v-model="form.expense_kind"  label="1">基本医保</el-radio>
+              <el-radio  v-model="form.expense_kind" label="2">新农合</el-radio>
+              <el-radio  v-model="form.expense_kind" label="3">自费医疗</el-radio>
+              <el-radio  v-model="form.expense_kind" label="4">公费医疗</el-radio>
+              <el-radio v-model="form.expense_kind" label="5">商业保险</el-radio>
+              <el-radio  v-model="form.expense_kind" label="6">军队医疗</el-radio>
+              <el-radio  v-model="form.expense_kind" label="7">其他</el-radio>
             </template>
           </div>
         </div>
       <div class="row1">
         <div class="line">
           <p class="rowName">通信地址:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容"  :disabled="true">
           </el-input
-          ><el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          ><el-input placeholder="请输入内容" :disabled="true">
           </el-input
-          ><el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          ><el-input placeholder="请输入内容"  :disabled="true">
           </el-input>
         </div>
         <div class="rowOne">
-          <p class="rowName">门诊号:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <p class="rowName">具体地址:</p>
+          <el-input placeholder="请输入内容" v-model="form.homeAddress" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.homeAddress"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
       <div class="row">
         <div class="rowOne">
           <p class="rowName">联系人姓名:</p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.contact_name" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.contact_name"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowTwo">
           <p class="rowName1">
             固定电话 &ensp;&ensp;&ensp;&ensp;(电话):
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
-          </el-input>
-          <div class="btn">复制</div>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.tell_phone" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.tell_phone"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
         <div class="rowOne">
           <p class="rowName1">
             联系电话 &ensp;&ensp;&ensp;&ensp;(电话):
           </p>
-          <el-input placeholder="请输入内容" v-model="input" :disabled="true">
+          <el-input placeholder="请输入内容" v-model="form.homeTelephone" :disabled="true">
           </el-input>
-          <div class="btn">复制</div>
+          <div class="btn" v-clipboard:copy="form.homeTelephone"
+               v-clipboard:success="onCopy" v-clipboard:error="onError">复制</div>
         </div>
       </div>
     </div>
   </div>
 
 </template>
+<script>
+  import { getDataConfig } from '@/utils/data'
+  import {
+    uParseTime
+  } from '@/utils/tools'
+  import {
+    fetchPatient
+  } from '@/api/patient'
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  const defaultForm = {
+    avatar: '',
+    patientType: '',
+    dialysisNo: '',
+    admissionNumber: '',
+    source: '',
+    lapseto: '',
+    partition: '',
+    bed: '',
+    name: '',
+    gender: '',
+    nation: '',
+    native_place: '',
+    maritalStatus: '',
+    idCardNo: '',
+    birth: '',
+    age: '',
+    reimbursementWayID: '',
+    healthCareNo: '',
+    healthCareDueDate: '',
+    height: '',
+    blood: '',
+    rh: '',
+    healthCareDueAlertDate: '',
+    education: '',
+    profession: '',
+    phone: '',
+    homeTelephone: '',
+    homeAddress: '',
+    work: '',
+    receivingDate: '',
+    firstDialysisDate: '',
+    dialysisAge: '',
+    induction: '',
+    initial: '',
+    dialysisTotal: '',
+    contagions: [],
+    doctor: '',
+    nurse: '',
+    assessment: '',
+    diseases: [],
+    diagnose: '',
+    registrars: '',
+    patient_complains: '',
+    present_history: '',
+    past_history: '',
+    temperature: '',
+    pulse: '',
+    respiratory: '',
+    sbp: '',
+    dbp: '',
+    record_date: '',
+    response_result: '',
+    is_infectious: '',
+    formItem: [],
+    tell_phone:'',
+    first_treatment_date:'',
+    dialysis_age:'',
+    expense_kind:'',
+    contact_name:'',
+    create_time:'',
+    id_type:"身份证"
+  }
+
+  export default {
+    name: 'One',
+    components: { },
+
+    data() {
+      return {
+        expenseOptions:[
+          {id:1,name:"基本医保"},
+          {id:2,name:"新农合"},
+          {id:3,name:"自费医疗"},
+          {id:4,name:"公费医疗"},
+          {id:5,name:"商业保险"},
+          {id:6,name:"军队医疗"},
+          {id:7,name:"其他"},
+        ],
+        form: Object.assign({}, defaultForm),
+        adminUserOptions:[],
+        maritalOptions:[],
+        educationOptions: [],
+        professionOptions:[],
+
+      }
+    },
+    created() {
+      this.maritalOptions = getDataConfig('patient', 'marital_options')
+      this.educationOptions = getDataConfig('patient', 'education_types')
+      this.professionOptions = getDataConfig('patient', 'profession_options')
+      this.fetchAllAdminUsers()
+    },
+    methods: {
+      getTime(val){
+        return uParseTime(val, '{y}年{m}月{d}日')
+      },
+
+      getZones() {
+        getZones().then(response => {
+          if (response.data.state === 1) {
+            this.partitionOptions = response.data.data.zones
+          }
+        })
+      },
+      fetchPatient(id) {
+        fetchPatient(id)
+          .then(response => {
+            if (response.data.state === 1) {
+              var patietInfo = response.data.data.patient
+              this.form.avatar = patietInfo.avatar
+              this.form.name = patietInfo.name
+              this.form.alias = patietInfo.alias
+              this.form.lapseto = patietInfo.lapseto
+              this.form.idCardNo = patietInfo.id_card_no
+              this.form.dialysisNo = patietInfo.dialysis_no
+              this.form.gender = patietInfo.gender
+              this.form.is_infectious = patietInfo.is_infectious
+              // this.form.record_date = patietInfo.is_infectious
+              this.form.response_result = patietInfo.response_result
+              this.form.remind_cycle = patietInfo.remind_cycle
+              this.infections = response.data.data.infections
+              this.form.formItem = this.infections
+              if (patietInfo.gender === 1 || patietInfo.gender === 2) {
+                this.form.gender = patietInfo.gender.toString()
+              }
+              this.form.nation = patietInfo.nation
+              this.form.native_place = patietInfo.native_place
+              this.form.birth = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
+              this.form.create_time = uParseTime(patietInfo.created_time, '{y}-{m}-{d}')
+
+              this.form.firstDialysisDate = uParseTime(patietInfo.first_dialysis_date, '{y}-{m}-{d}')
+              this.form.height = patietInfo.height + ''
+              if (patietInfo.marital_status > 0) {
+                this.form.maritalStatus = patietInfo.marital_status
+              }
+              this.form.children = patietInfo.children
+              this.form.admissionNumber = patietInfo.admission_number
+              if (patietInfo.reimbursement_way_id > 0) {
+                this.form.reimbursementWayID = patietInfo.reimbursement_way_id
+              }
+              this.form.healthCareNo = patietInfo.health_care_no
+              this.form.phone = patietInfo.phone
+              this.form.homeTelephone = patietInfo.home_telephone
+              this.form.relative_phone = patietInfo.relative_phone
+              this.form.relative_relations = patietInfo.relative_relations
+              this.form.homeAddress = patietInfo.home_address
+              this.form.work = patietInfo.work_unit
+              this.form.unit_address = patietInfo.unit_address
+
+              if (patietInfo.age == 0) {
+                this.form.age = jsGetAge(this.form.birth, '-')
+              } else {
+                this.form.age = patietInfo.age
+              }
+
+              if (patietInfo.profession > 0) {
+                this.form.profession = patietInfo.profession
+              }
+              if (patietInfo.education_level > 0) {
+                this.form.education = patietInfo.education_level
+              }
+              if (patietInfo.source === 1 || patietInfo.source === 2) {
+                this.form.source = patietInfo.source
+              }
+              console.log("source:"+this.form.source)
+              if (patietInfo.lapseto === 1 || patietInfo.lapseto === 2) {
+                this.form.lapseto = patietInfo.lapseto
+              }
+              if (patietInfo.is_hospital_first_dialysis === 1 || patietInfo.is_hospital_first_dialysis === 2) {
+                this.form.is_hospital_first_dialysis = patietInfo.is_hospital_first_dialysis
+              }
+              if (patietInfo.first_dialysis_date !== 0) {
+                this.form.firstDialysisDate = uParseTime(
+                  patietInfo.first_dialysis_date,
+                  '{y}-{m}-{d}'
+                )
+              }
+              this.form.first_dialysis_hospital = patietInfo.first_dialysis_hospital
+              if (patietInfo.predialysis_condition.length > 0) {
+                this.form.predialysis_condition = patietInfo.predialysis_condition.split(',')
+              }
+              this.form.pre_hospital_dialysis_frequency = patietInfo.pre_hospital_dialysis_frequency
+              this.form.pre_hospital_dialysis_times = patietInfo.pre_hospital_dialysis_times
+              if (patietInfo.hospital_first_dialysis_date !== 0) {
+                this.form.hospital_first_dialysis_date = uParseTime(
+                  patietInfo.hospital_first_dialysis_date,
+                  '{y}-{m}-{d}'
+                )
+              }
+              this.form.contagions = response.data.data.contagions
+              this.form.diseases = response.data.data.diseases
+              this.form.remark = patietInfo.remark
+              this.form.diagnose = patietInfo.diagnose
+
+              this.form.patient_complains = patietInfo.patient_complains
+              this.form.present_history = patietInfo.present_history
+              this.form.past_history = patietInfo.past_history
+              this.form.temperature = patietInfo.temperature
+              this.form.pulse = patietInfo.pulse
+              this.form.respiratory = patietInfo.respiratory
+              this.form.sbp = patietInfo.sbp
+              this.form.dbp = patietInfo.dbp
+
+              this.form.contact_name = patietInfo.contact_name
+              this.form.tell_phone = patietInfo.tell_phone
+              this.form.dialysis_age = patietInfo.dialysis_age
+              if( patietInfo.expense_kind == 0){
+                this.form.expense_kind = ""
+              }else{
+                this.form.expense_kind = patietInfo.expense_kind.toString()
+              }
+
+
+
+              this.form.first_treatment_date =  uParseTime(
+                patietInfo.first_treatment_date,
+                '{y}-{m}-{d}'
+              )
+
+              if (patietInfo.registrars_id > 0) {
+                var eLen = this.adminUserOptions.length
+                for (let index = 0; index < eLen; index++) {
+                  if (this.adminUserOptions[index].id === patietInfo.registrars_id) {
+                    this.form.registrars = this.adminUserOptions[index].name
+                    break
+                  }
+                }
+              } else {
+                this.form.registrars = ''
+              }
+
+
+              this.form.maritalStatus = this.getMaritalType(patietInfo.marital_status)
+              this.form.education = this.getEducationType(patietInfo.education_level)
+              this.form.profession = this.getProfessionType(patietInfo.profession)
+
+
+
+
+
+
+            } else {
+              console.log('patient get err state')
+              this.$notify.error({
+                title: '错误',
+                message: '网络异常'
+              })
+            }
+          }).catch(err => {
+          this.$notify.error({
+            title: '错误',
+            message: '网络异常'
+          })
+        })
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state === 1) {
+            this.adminUserOptions = response.data.data.users
+          }
+        })
+      },getMaritalType(id){
+        for(let i = 0; i < this.maritalOptions.length; i++){
+          if(this.maritalOptions[i].id == id){
+            return this.maritalOptions[i].name
+          }
+        }
+      },getEducationType(id){
+        for(let i = 0; i < this.educationOptions.length; i++){
+          if(this.educationOptions[i].id == id){
+            return this.educationOptions[i].name
+          }
+        }
+      },getProfessionType(id){
+        for(let i = 0; i < this.professionOptions.length; i++){
+          if(this.professionOptions[i].id == id){
+            return this.professionOptions[i].name
+          }
+        }
+      },onCopy(){
+        this.$message.success('复制成功')
+
+      },onError(){
+        this.$message.success('复制失败,请重试')
+      },
+
+    }
+  }
+</script>
+
 
 <style lang="scss">
 .basicInfo {
     .rowOne {
       float: left;
       height: 36px;
-      width: 262px;
+      width: 350px;
       // line-height: 36px;
       margin-right: 12px;
       margin-bottom: 20px;

src/xt_pages/user/components/PatientDetail.vue

                   <el-date-picker v-model="form.birth" type="date" disabled placeholder="选择日期" :suffix-icon="'el-icon-menu'" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
+
+
+            <el-col :span="8">
+              <el-form-item label="首次肾脏治疗时间 : " label-width="150px"  class="is-required" prop="birth" >
+                <el-date-picker v-model="form.firstDialysisDate" type="date" disabled placeholder="选择日期" :suffix-icon="'el-icon-menu'" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
+              </el-form-item>
+            </el-col>
+
+
+
             <el-col :span="8">
               <el-form-item label="本人电话: " class="is-required" prop="phone">
                 <el-input v-model="form.phone" maxlength="20" disabled></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="家属姓名: " >
+                <el-input v-model="form.contact_name" maxlength="20" disabled></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="家属电话: " prop="homeTelephone">
                 <el-input v-model="form.homeTelephone" maxlength="20" disabled></el-input>
                 </el-select>
               </el-form-item>
             </el-col>
+
+
+              <el-col :span="8">
+                <el-form-item label="固定电话 : ">
+                  <el-input v-model="form.tell_phone" maxlength="20" disabled></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="费别 : ">
+                  <el-select v-model="form.expense_kind" disabled>
+                    <el-option v-for="item in expenseOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" >
+                <el-form-item label="透析龄(月): ">
+                  <el-input v-model="form.dialysis_age"  disabled></el-input>
+                </el-form-item>
+              </el-col>
+
+
             <el-col :span="8" >
               <el-form-item label="亲友电话: " prop="relative_phone">
                 <el-input v-model="form.relative_phone" maxlength="20" disabled></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="首次透析日期 : "  prop="firstDialysisDate">
-            <el-date-picker v-model="form.firstDialysisDate" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
+        <el-form-item label="首次诊治日期 : "  >
+            <el-date-picker v-model="form.first_treatment_date" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span="6" >
   record_date: '',
   response_result: '',
   is_infectious: '',
-  formItem: []
+  formItem: [],
+  tell_phone:'',
+  first_treatment_date:'',
+  dialysis_age:'',
+  expense_kind:'',
+  contact_name:'',
 }
 
 export default {
 
   data() {
     return {
+      expenseOptions:[
+        {id:1,name:"基本医保"},
+        {id:2,name:"新农合"},
+        {id:3,name:"自费医疗"},
+        {id:4,name:"公费医疗"},
+        {id:5,name:"商业保险"},
+        {id:6,name:"军队医疗"},
+        {id:7,name:"其他"},
+      ],
+
       generic_info_fold: true,
       treat_info_fold: true,
       dialogFormVisible: false,
       patientPrint: {},
       print_time: '',
 
+
+
       rules: {
         contagions: [
           { type: 'array', required: false, trigger: 'change' }
             this.form.nation = patietInfo.nation
             this.form.native_place = patietInfo.native_place
             this.form.birth = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
+            this.form.firstDialysisDate = uParseTime(patietInfo.first_dialysis_date, '{y}-{m}-{d}')
             this.form.height = patietInfo.height + ''
             // this.form.age = jsGetAge(this.form.birth, "-");
             if (patietInfo.marital_status > 0) {
             this.form.sbp = patietInfo.sbp
             this.form.dbp = patietInfo.dbp
 
+            this.form.contact_name = patietInfo.contact_name
+            this.form.tell_phone = patietInfo.tell_phone
+            this.form.dialysis_age = patietInfo.dialysis_age
+            if( patietInfo.expense_kind == 0){
+              this.form.expense_kind = ""
+            }else{
+              this.form.expense_kind = patietInfo.expense_kind
+            }
+
+            this.form.first_treatment_date =  uParseTime(
+              patietInfo.first_treatment_date,
+              '{y}-{m}-{d}'
+            )
+
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;

src/xt_pages/user/components/PatientForm.vue

                                   value-format="yyyy-MM-dd"></el-date-picker>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="6" :style="isEdit?'width:380px':''">
+                <el-form-item label="首次肾脏治疗时间:" prop="firstDialysisDate" label-width="150px">
+                  <el-date-picker v-model="form.firstDialysisDate" type="date" format="yyyy-MM-dd"
+                                  value-format="yyyy-MM-dd"></el-date-picker>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="本人电话 : " class="is-required" prop="phone">
                   <el-input v-model="form.phone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-form-item label="家属姓名 : ">
+                  <el-input v-model="form.contact_name" maxlength="20"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="家属电话 : " prop="homeTelephone">
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
+
+
+
               <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="患者来源 : " class="is-required" prop="source">
                   <el-radio-group v-model="form.source">
                     </el-select>
                   </el-form-item>
                 </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''">
+                  <el-form-item label="固定电话 : ">
+                    <el-input v-model="form.tell_phone" maxlength="20"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''">
+                  <el-form-item label="费别 : ">
+                    <el-select v-model="form.expense_kind">
+                      <el-option v-for="item in expenseOptions" :key="item.id" :label="item.name" :value="item.id"/>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+                  <el-form-item label="透析龄(月): ">
+                    <el-input v-model="form.dialysis_age" ></el-input>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="亲友电话 : " prop="relative_phone">
                     <el-input v-model="form.relative_phone" maxlength="20"></el-input>
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
             <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="首次透析日期 : " prop="firstDialysisDate">
-                <el-date-picker v-model="form.firstDialysisDate" type="date" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" @change="selectFirstDialysisDate"></el-date-picker>
+              <el-form-item label="首次诊治时间 : " >
+                <el-date-picker v-model="form.first_treatment_date" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6" :style="isEdit?'width:360px':''">
     diagnose: '',
     is_infectious:1,
     age: '',
+
     response_result:'',
     remind_cycle:0,
     record_date:'',
+
+    tell_phone:'',
+    first_treatment_date:'',
+    dialysis_age:'',
+    expense_kind:'',
+    contact_name:'',
+
+
+
     formItem:[
       { id: 0,
         item: "",
       }
 
       return {
+
         crumbs: [
           { path: false, name: '病人管理' },
           { path: false, name: '新增病人' }
         submitMsg: '',
         patientID: 0,
         formLoading:false,
+        expenseOptions:[
+          {id:1,name:"基本医保"},
+          {id:2,name:"新农合"},
+          {id:3,name:"自费医疗"},
+          {id:4,name:"公费医疗"},
+          {id:5,name:"商业保险"},
+          {id:6,name:"军队医疗"},
+          {id:7,name:"其他"},
+        ],
 
 
         subscibe: {},
           idCardNo: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
           birth: [{ required: true, message: '请填写生日', trigger: 'blur' }],
           age: [{ required: true, message: '请填写年龄', trigger: 'blur' }],
+          firstDialysisDate:[{ required: true, message: '请选择日期', trigger: 'blur' }],
 
 
           // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
               this.form.remind_cycle = patietInfo.remind_cycle
               this.form.is_infectious = patietInfo.is_infectious
 
+              this.form.tell_phone = patietInfo.tell_phone
+              this.form.dialysis_age = patietInfo.dialysis_age
+              this.form.contact_name = patietInfo.contact_name
+              if( patietInfo.expense_kind == 0){
+                this.form.expense_kind = ""
+              }else{
+                this.form.expense_kind = patietInfo.expense_kind
+              }
+
+              this.form.first_treatment_date =  uParseTime(
+                patietInfo.first_treatment_date,
+                '{y}-{m}-{d}'
+              )