Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

src/store/async-actions/homePage.js

@@ -31,11 +31,12 @@ function modulesParseJson(data){
 export const getInitModules= (dispatch,getStore)=>{
   const state = getStore();
   const {message} = state.patInfo;
+  const chronicId = '';//诊断为慢病复诊时储存慢病信息到store
   const param = {
     age:message.patientAge,
     sexType:message.sex,
-    mouduleType:1,//慢病2  科室1 其他0
-    relationId:message.hospitalDeptId, //慢病id  科室id  其他0
+    mouduleType:chronicId?2:(message.hospitalDeptId?1:0),//慢病2  科室1 其他0
+    relationId:chronicId?chronicId:(message.hospitalDeptId?message.hospitalDeptId:0), //慢病id  科室id  其他0
   }
   // return json(api.getModules,{age:message.patientAge,sexType:message.sex}).then((res) => {
   return json(api.getModules,param).then((res) => {