Merge branch 'optimize' into optimize-ll

src/common/components/ComplexModal/index.jsx

@@ -20,7 +20,7 @@ class ComplexModal extends Component {
     super(props);
   }
   componentDidMount(){
-    dragBox('complexModalWrap','complexModalTitle','complexModalWrapMove')
+    // dragBox('complexModalWrap','complexModalTitle','complexModalWrapMove')
   }
 
   render() {

src/components/ScaleTable/index.jsx

@@ -191,7 +191,7 @@ class ScaleTable extends React.Component{
   componentDidMount(){
     const {tableId,scaleInfo} = this.props;
     if(scaleInfo&&scaleInfo[tableId]){
-      let scale = this.filterScale(scaleInfo[tableId]);
+      let scale = this.filterScale(scaleInfo[tableId]);console.log(22,JSON.parse(scale.content));
       this.setState({
         // valueData:JSON.parse(scaleInfo[tableId][1].content)
         valueData:scale.content?JSON.parse(scale.content):{}
@@ -230,7 +230,7 @@ class ScaleTable extends React.Component{
     let {selecteds,valueData,start,scaleResult1} = this.state;
     const {tableId,formulaResult} = this.props;
     const scaleResult = scaleResult1 || formulaResult&&formulaResult[tableId]; //量表计算结果
-    const datas = valueData&&valueData.group?valueData:'';//console.log(666,datas);
+    const datas = valueData&&valueData.group?valueData:'';console.log(666,datas);
     let content =  datas&&datas.group&&datas.group.map((v,i)=>{
                 return <div className={style['group']}>
                   <p className={style['groupName']}>{v.groupName}</p>

src/store/async-actions/mainSuit.js

@@ -15,8 +15,10 @@ export const getCommSymptoms = ()=>{//获取常见症状
     const {message} = state.patInfo;
     //从state中拿到门诊号
     const deptCode = message.selfDeptId;
+    const deptName = message.selfDeptName;//标准化
     const params = {
-      'deptId':deptCode,
+      // 'deptId':deptCode,
+      'deptName':deptName,
       'age':message.patientAge,
       'sexType':message.sex,
       'type':1

src/store/async-actions/pushMessage.js

@@ -10,6 +10,7 @@ const api={
   push:'/push/pushInner',
   textPush:'/push/pushText',
   getTableList:'/scale/getList', //获取量表列表
+  getTableInfo:'/scale/getContent', //获取量表明细
 }
 
 //获取右侧推送信息
@@ -188,13 +189,16 @@ export const getScaleInfo = (it)=>{
             symptom: emrData.current + emrData.main,
             // indications:'' //指标结果
           };
-        json(api.push, params)
+        // json(api.push, params)
+        json(api.getTableInfo, params)
         .then((res)=>{
             const result = res.data;
-            if(result.code==0 && result.data.scale && result.data.scale.length>0){
+            // if(result.code==0 && result.data.scale && result.data.scale.length>0){
+            if(result.code==0 && result.data.length>0){
                 dispatch({
                     type: SET_SCALE_INFO,
-                    data: result.data.scale,
+                    // data: result.data.scale,
+                    data: result.data,
                     id:it.id
                 })
                 dispatch({