Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

src/views/patients/labels-manage/dialog/select-patitents.vue

@@ -146,7 +146,7 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="age"
+            prop="ageStr"
             label="年龄"
             min-width="50"
             align="center">
@@ -158,7 +158,7 @@
             min-width="130">
           </el-table-column>
           <el-table-column
-            prop="idNo"
+            prop="idNoStr"
             label="身份证"
             align="center"
             min-width="130">
@@ -362,9 +362,6 @@
               item.disableNum = 1;
               let diseaseNames = [];
               let groupNames = []
-              if(!item.idNo) {
-                item.idNo = '-';
-              }
               //转化分组
               if(item.labelModels) {
                 item.labelModels.forEach(item => {
@@ -440,7 +437,18 @@
           }else if(item.sex==2){
             this.patientsData[index].sexStr = '女'
           }else{
-            this.patientsData[index].sexStr = '未知'
+            this.patientsData[index].sexStr = '-'
+          }
+
+          if(!item.idNo) {
+            this.patientsData[index].idNoStr = '-'
+          }else {
+            this.patientsData[index].idNoStr = item.idNo
+          }
+          if(item.age || item.age == 0) {
+            this.patientsData[index].ageStr = item.age
+          }else {
+            this.patientsData[index].ageStr = '-'
           }
         })
       },