Merge branch 'release' into 'master'

Release



See merge request !63

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -151,26 +151,26 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="医保号" prop="socialCard">
-              <el-input
-                v-model.trim="patientInfoForm.socialCard"
-                placeholder="请输入居民医保卡号码"
-                maxlength="30"
-                clearable>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="健康档案编号" prop="fileLocator">
-              <el-input
-                v-model.trim="patientInfoForm.fileLocator"
-                placeholder="请输入居民健康档案编号"
-                maxlength="30"
-                clearable>
-              </el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="医保号" prop="socialCard">-->
+              <!--<el-input-->
+                <!--v-model.trim="patientInfoForm.socialCard"-->
+                <!--placeholder="请输入居民医保卡号码"-->
+                <!--maxlength="30"-->
+                <!--clearable>-->
+              <!--</el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="健康档案编号" prop="fileLocator">-->
+              <!--<el-input-->
+                <!--v-model.trim="patientInfoForm.fileLocator"-->
+                <!--placeholder="请输入居民健康档案编号"-->
+                <!--maxlength="30"-->
+                <!--clearable>-->
+              <!--</el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
         </el-row>
         <div class="has-header">联系方式</div>
         <el-row>

src/views/patients/mypatients-manage/patient-detail.vue

@@ -31,10 +31,10 @@
                 <div><p class="title">民族：</p><p class="info">{{nationalityDes}}</p></div>
                 <div><p class="title">常驻类型：</p><p class="info">{{patientInfo.permanentResidence | permanentFilter}}</p></div>
               </div>
-              <div class="item">
-                <div><p class="title">健康档案编号：</p><p class="info">{{patientInfo.fileLocator | emptyFilter}}</p></div>
-                <div><p class="title">医保号：</p><p class="info">{{patientInfo.socialCard | emptyFilter}}</p></div>
-              </div>
+              <!--<div class="item">-->
+                <!--<div><p class="title">健康档案编号：</p><p class="info">{{patientInfo.fileLocator | emptyFilter}}</p></div>-->
+                <!--<div><p class="title">医保号：</p><p class="info">{{patientInfo.socialCard | emptyFilter}}</p></div>-->
+              <!--</div>-->
               <div class="has-header">数据记录</div>
               <div class="item wrap-p">
                 <div><p class="title">诊断：</p><p class="info">{{showDiseaseName | emptyFilter}}</p></div>