new branch

config/dev.env.js

   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9529"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
 }
+

config/index.js

 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/hospitalStation/components/registerDialog.vue

                 </el-select>
             </el-form-item>
 
+            <el-form-item label="医生：" prop="doctor">
+                <el-select v-model="form.doctor" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in doctors"
+                            :key="index"
+                            :label="item.user_name"
+                            :value="item.admin_user_id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="科室：" prop="department">
+                <el-select v-model="form.department" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in departments"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
 
             <el-form-item label="社保类型：">
                 <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
                 <el-input v-model="form.medical_expenses"></el-input>
             </el-form-item>
 
-            <el-form-item label="医生：" prop="doctor">
-                <el-select v-model="form.doctor" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in doctors"
-                            :key="index"
-                            :label="item.user_name"
-                            :value="item.admin_user_id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="科室：" prop="department">
-                <el-select v-model="form.department" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in departments"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
         </el-form>
 
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{patient.age?patient.age:''}}岁</div>
+            <div>年龄：{{getAge(patient)?getAge(patient):""}}岁</div>
         </div>
         <div class="infoTitle">
             <div>婚姻状况：
 </div>
 </template>
 <script>
+  import { jsGetAge, uParseTime } from '@/utils/tools'
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
             orgname:'',
             history:{},
             printDate:''
-        }                   
+        }
     },
     methods:{
+      getAge(patient){
+        var thisLen = patient.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + patient.id_card_no.substr(6, 6)
+        } else {
+          birth = patient.id_card_no.substr(6, 8)
+        }
+        var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+      },
       show(val){
-       
+
         this.patientid = val
         this.getAllDoctorList()
         this.getPatientCaseHistory()
                console.log("department",department)
                this.departmentList = department
              }
-           })   
+           })
        },
       getDoctor(id){
         var name = ""
       })
     },
     getDeparment(id){
-  
+
      var name = ''
      for(let i=0;i<this.departmentList.length;i++){
          if(id == this.departmentList[i].id){
       }
       return name
     },
-  
+
 
     },
     created(){
 <style lang="scss" scoped>
 .prescription-print{
     -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;

src/xt_pages/outpatientDoctorStation/template/printFour.vue

                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </p>
-              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
-               
+
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/template/printOne.vue

                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </p>
-              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+              <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
       }
     },
    methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
 
      getAllDoctorList(){
       getAllDoctorList().then(response=>{

src/xt_pages/outpatientDoctorStation/template/printThree.vue

                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </div>
-              <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
+              <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
               </div>
-              
+
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 </div>
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            
+
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
-            
+
           }
        })
      },
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
             this.page = 1
             arr.push(item.advices.length)
             item.pageArr.push(arr)
-            
+
           }else if(item.advices.length > 5){
             this.page = parseInt(item.advices.length / 5)
             let num = item.advices.length % 5
       this.getPrescriptionPrint()
       this.getAllDoctorList()
       this.getInitData()
-      
+
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

                <span v-if="patient.gender == 1">男</span>
                <span v-if="patient.gender == 2">女</span>
             </p>
-            <p>年龄：{{patient.age}}岁</p>
+            <p>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</p>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
                 <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
 
-            
+
         </div>
         <div class="doctorBox">
             <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
       patient_id:Number,
       record_date:String,
       prescription_id:Number
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       }
     },
    methods:{
-     
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
             console.log("patient",patient)
             this.patient = patient
             var doctorPorject = response.data.data.doctorPorject
-          
+
             var arr = doctorPorject.project
               console.log("我的中谷歌",arr)
             for(let i=0;i<arr.length;i++){
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-           
+
           }
        })
      },
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

                     <span v-if="item.patient.gender == 2">女</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">年龄：
-                    <span>{{item.patient.age}}</span>
+                    <span>{{getAge(item.patient)?getAge(item.patient):""}}</span>
                 </div>
                 <div style="margin-bottom: 10px;width:25%">参保类型：{{hisPatient.social_type?hisPatient.social_type:''}}
                 </div>
       }
     },
     methods: {
+      getAge(patient){
+        var thisLen = patient.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + patient.id_card_no.substr(6, 6)
+        } else {
+          birth = patient.id_card_no.substr(6, 8)
+        }
+        var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+      },
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

             <span v-if="item.patient.gender == 1">男</span>
             <span v-if="item.patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
+            <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
       }
     },
    methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+       return jsGetAge(births, '-')
+
+     },
      printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
+
         var name = ""
         let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }