慢病bug修改

src/components/ChronicInfo/index.jsx

@@ -310,8 +310,8 @@ class ChronicInfo extends React.Component{
                       {v.details&&v.details.map((it,j)=>{
                         if(it.type==1){
                           return <p>
-                                <span className={style["listName"]} onClick={this.showTable.bind(this,it.content,v.id,i)}>
-                                  {'【'+it.content.name+'】'}
+                                <span className={style["listName"]}>
+                                  <i onClick={this.showTable.bind(this,it.content,v.id,i)}>{'【'+it.content.name+'】'}</i>
                                   {formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].pIndex==i?<i>{'结果：'}{formulaResult[it.content.id].calcalculate&&formulaResult[it.content.id].calcalculate.result.value +' '+ formulaResult[it.content.id].calcalculate.result.text}</i>:''}
                                   
                                 </span>
@@ -505,11 +505,11 @@ class ChronicInfo extends React.Component{
               <ConfirmModal visible={showHide&&showHide.showList} noFooter='true' title='全部量表' close={this.close} titleBg="#DFEAFE" icon={allTableIcon} height={400} width={400}>
                       <ul className={style['toast-cont']}>
                         {tableList&&tableList.map((v,i)=>{
-                          return <li onClick={this.handleListClick.bind(this,v)}>
+                          return <li>
                           <span>
-                            {'【'+v.name+'】'}
+                            <i onClick={this.handleListClick.bind(this,v)}>{'【'+v.name+'】'}</i>
                             {/*{formulaResult&&formulaResult[v.id]?<i>{'结果：'+formulaResult[v.id].text}</i>:''}*/}
-                            {formulaResult&&formulaResult[v.id]?<i>{'结果：'}{formulaResult[v.id].calcalculate&&formulaResult[v.id].calcalculate.result.value+' '+ formulaResult[v.id].calcalculate.result.text}</i>:''}
+                            {formulaResult&&formulaResult[v.id]?<i className={style['res']}>{'结果：'}{formulaResult[v.id].calcalculate&&formulaResult[v.id].calcalculate.result.value+' '+ formulaResult[v.id].calcalculate.result.text}</i>:''}
                           </span>
                           </li>
                         })}

src/components/ChronicInfo/index.less

@@ -217,7 +217,7 @@
         margin-top: 10px;
         cursor: pointer;
       }
-      i{
+      .res{
         color:#3B9ED0;
         margin-left: 10px;
       }

src/store/async-actions/homePage.js

@@ -39,10 +39,9 @@ export const getInitModules= (dispatch,getStore)=>{
   const param = {
     age:message.patientAge,
     sexType:message.sex,
-    mouduleType:chronicId?2:(message.hospitalDeptId?1:0),//慢病2  科室1 其他0
-    relationId:chronicId?chronicId:(message.hospitalDeptId?message.hospitalDeptId:0), //慢病id  科室id  其他0
-    // mouduleType:2,
-    // relationId:21773, //慢病id  科室id  其他0
+    mouduleType:chronicId?2:(message.selfDeptId?1:0),//慢病2  科室1 其他0
+    // relationId:chronicId?chronicId:(message.hospitalDeptId?message.hospitalDeptId:0), //慢病id  科室id  其他0
+    relationId:chronicId?chronicId:(message.selfDeptId?message.selfDeptId:0), //慢病id  科室id  其他0
   }
   // return json(api.getModules,{age:message.patientAge,sexType:message.sex}).then((res) => {
   return json(api.getModules,param).then((res) => {

src/store/async-actions/pushMessage.js

@@ -117,7 +117,7 @@ export const getTipsDetails = () => {
         const url ='/introduceInfo/getByQuestionId'
         
         const params = {
-            type: 7,
+            type: state.diagnosticList.clickDiag.type,
             questionId: state.diagnosticList.clickDiag.id,
             position:2
         }
@@ -138,7 +138,7 @@ export const getTableList = (id)=>{
     return (dispatch,getState)=>{
         json(api.getTableList, {disId:id})
         .then((res)=>{
-            if(res.data.code==0){
+            if(res.data.code==0 && res.data.data && res.data.data.length>0){
                 dispatch({
                     type: SET_CHRONIC_TABLELIST,
                     data: res.data.data
@@ -149,7 +149,7 @@ export const getTableList = (id)=>{
                     value:true
                 })
             }else{
-                Notify.info(res.data.msg)
+                Notify.info(res.data.msg||'无关联量表')
             }
         }).catch((e) => {
             console.log(e)