Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

         </el-input>
       </el-form-item>
     </el-form>
-   
+
   </div>
 </template>
 
             "doctor_advice":this.doctor_advice,
             "remark":this.remark
           }
-        
+
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error("患者病历已存在")
               this.remark = ""
             }
           })
-       
+
 
       },
-    
+
 
       getTemplateDetail(id){
           console.log("22222")
           getTemplateDetail(id).then(response=>{
-              if(response.data.state == 1){  
+              if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
                 console.log("templatedetail",templatedetail)
-            
-                this.case_history.chief_conplaint =  templatedetail.chief_conplaint 
-                this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness 
-                this.case_history.past_history =  templatedetail.past_history 
-                this.case_history.personal_history =    templatedetail.personal_history 
-                this.case_history.family_history = templatedetail.family_history 
-                this.case_history.diagnostic = templatedetail.diagnostic 
-               
+
+                this.case_history.chief_conplaint =  templatedetail.chief_conplaint
+                this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness
+                this.case_history.past_history =  templatedetail.past_history
+                this.case_history.personal_history =    templatedetail.personal_history
+                this.case_history.family_history = templatedetail.family_history
+                this.case_history.diagnostic = templatedetail.diagnostic
+
               }
           })
         },
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-       
+
     },
     watch:{
       detalid:function(val){
         },
         immediate: true,
         deep: true
+      },
+      case_history:function(val){
+        console.log("val",val)
+        if(val.breathing == 0){
+           this.case_history.breathing = ''
+        }
       }
     }
   }

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

                 name:''
             },
             radio:"1",
-            options:[]
+            options:[],
+            value:''
         }
     },
     methods:{

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">门诊病历</div>
         <div class="infoTitle">
-            <div>姓名：{{patient.name}}</div>
+            <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{patient.age}}岁</div>
+            <div>年龄：{{patient.age?patient.age:''}}岁</div>
         </div>
         <div class="infoTitle">
             <div>婚姻状况：
               <span v-if="patient.marital_status == 1">已婚 </span>
               <span v-if="patient.marital_status == 2">未婚 </span>
             </div>
-            <div>职业：{{getProfession(patient.profession)}}</div>
+            <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>
         <div class="otherInfo">
             <div>医保号：</div>
-            <div style="flex:1;">{{patient.health_care_no}}</div>
+            <div style="flex:1;">{{patient.health_care_no?patient.health_care_no:''}}</div>
         </div>
         <div class="otherInfo">
             <div>联系电话：</div>
-            <div style="flex:1;">{{patient.phone}}</div>
+            <div style="flex:1;">{{patient.phone?patient.phone:''}}</div>
         </div>
         <div class="otherInfo">
             <div>通讯地址：</div>
-            <div style="flex:1;">{{patient.home_address}}</div>
+            <div style="flex:1;">{{patient.home_address?patient.home_address:''}}</div>
         </div>
         <div class="otherInfo">
             <div>药物过敏史：</div>
-            <div style="flex:1;">{{patient.past_history}}</div>
+            <div style="flex:1;">{{patient.past_history?patient.past_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div>病历编号：</div>
-            <div style="flex:1;">{{patient.id}}</div>
+            <div style="flex:1;">{{patient.id?patient.id:''}}</div>
         </div>
         <div style="page-break-after:always;margin-top:50px;"></div>
 
 
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
-            <div>科别：{{hispatient.departments}}</div>
-            <div>姓名：{{hispatient.name}}</div>
+            <div>科别：{{hispatient.departments?hispatient.departments:''}}</div>
+            <div>姓名：{{hispatient.name?hispatient.name:''}}</div>
             <div>性别：
                 <span v-if="hispatient.gender == 1">男</span>
                 <span v-if="hispatient.gender == 2">女</span>
             </div>
-            <div>年龄：{{hispatient.age}}岁</div>
+            <div>年龄：{{hispatient.age?hispatient.age:''}}岁</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">主诉：</div>
-            <div style="flex:1;">{{history.chief_conplaint}}</div>
+            <div style="flex:1;">{{history.chief_conplaint?history.chief_conplaint:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">现病史：</div>
-            <div style="flex:1;">{{history.history_of_present_illness}}</div>
+            <div style="flex:1;">{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">既往史：</div>
-            <div style="flex:1;">{{history.past_history}}</div>
+            <div style="flex:1;">{{history.past_history?history.past_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">药物过敏史：</div>
-            <div style="flex:1;">{{history.past_history}}</div>
+            <div style="flex:1;">{{history.past_history?history.past_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">个人史：</div>
-            <div style="flex:1;">{{history.personal_history}}</div>
+            <div style="flex:1;">{{history.personal_history?history.personal_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">家族史：</div>
-            <div style="flex:1;">{{history.family_history}}</div>
+            <div style="flex:1;">{{history.family_history?history.family_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">体格检查：</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">门诊诊断：</div>
-            <div style="flex:1;">{{history.diagnostic}}</div>
+            <div style="flex:1;">{{history.diagnostic?history.diagnostic:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">门诊医嘱：</div>
-            <div style="flex:1;">{{history.doctor_advice}}</div>
+            <div style="flex:1;">{{history.doctor_advice?history.doctor_advice:''}}</div>
         </div>
         <div style="margin-top:20px;text-align:right;">
-            医生签名：{{getDoctor(history.doctor)}}
+            医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
         </div>
     </div>
 </template>

src/xt_pages/outpatientRegistration/registrationHistory.vue

             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete
+                  style="margin:16px 5px"
                   popper-class="my-autocomplete"
                   v-model.trim="search_input"
                   :fetch-suggestions="querySearchAsync"
                         <span v-if="scope.row.register_type == 5">专家</span>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="就诊号" width="140">
+                <el-table-column align="center" prop="name" label="就诊号" width="80">
                     <template slot-scope="scope">
                         {{scope.row.number}}
                     </template>
                     <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
+                    <template slot-scope="scope">{{getDoctor(scope.row.admin_user_id) }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
                     <template slot-scope="scope">{{ scope.row.register_cost }}</template>
                     <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作人" width="70">
-                    <template slot-scope="scope">{{getDoctor(scope.row.admin_user_id) }}</template>
+                    <template slot-scope="scope">{{creator}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="info" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
-                        <el-button size="mini" type="info" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
-                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</el-button>  
                     </template>
                 </el-table-column>
             </el-table>
                 name: "生育保险"
             }],
             
-            tablePatient:[]
+            tablePatient:[],
+            creator:""
         }
     },
     created(){
         // })
         // this.tableData = arr
        //获取所有挂号号的患者
+
+       this.creator = this.$store.getters.xt_user.user.user_name
+    
        this.getlist()
     },
     methods:{