Merge branch 'CommonTemplate' into dev/new1

src/components/TemplateItems/TemplateItem/index.less

@@ -59,7 +59,7 @@
       vertical-align: top;
     //   margin-top: 3px;
     // padding: 0 5px;
-      max-width: 150px;
+      max-width: 200px;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;

src/store/async-actions/patInfo.js

@@ -60,6 +60,7 @@ export const getAdminCheckout = (val1,val2,dispatch) => {
               type: SETADMIN,
               admin:data.data
             });
+            dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
         } else {
             console.log(res)
         }
@@ -185,18 +186,17 @@ export async function getPatientMessage(dispatch, getState){
   let data1 = {},data2 = {};
   if(res1.data.code=='0'){
     data1 = res1.data.data;
-    getAdminCheckout(data1.doctorId,data1.hospitalId,dispatch)
     getDoctorConfig(data1.doctorId,dispatch);
   }
   if(res2.data.code=='0'){
     data2 = res2.data.data;
   }
+  getAdminCheckout(data1.doctorId,data1.hospitalId,dispatch)
   dispatch({
     type: GET_PATIENT_MESSAGE,
     data:Object.assign(data1,data2)
   });
   localStorage.removeItem('deletedTags');
-  dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
   dispatch(getCommonList(5));     //获取常用化验标签列表
   dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
   dispatch(initHistoryDetails());      //历史病历回读