Merge branch 'dev5.3.3' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.3

src/components/AddInspect/SlideSelect/index.jsx

@@ -121,7 +121,7 @@ class SlideSelect extends Component {
     const listLen = currentData.details&&currentData.details.length;
     const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (
-      <li key={item.questionId} className={styles.slideLi}> 
+      <li key={item.questionId} className={`${styles.slideLi} clearfix`}> 
         {
             // 标签，血常规。。
             item.show ?

src/utils/tools.js

@@ -98,7 +98,7 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.currentIllSelecteds = baseList.currentIll.selecteds;      //主诉选中状态保存
     jsonData.otherHistorySelecteds = baseList.otherHistory.selecteds;      //主诉选中状态保存
     jsonData.checkBodySelecteds = baseList.checkBody.selecteds;      //主诉选中状态保存
-    jsonData.addItems = baseList.homePage.addItems||{};
+    //jsonData.addItems = baseList.homePage.addItems||{};
     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
     jsonData.mainChronicDesease = baseList.mainSuit.chronicDesease;      //主诉慢病{}
     jsonData.diagChronicMagItem = baseList.diagnosticList.chronicMagItem;      //诊断慢病{}
@@ -299,10 +299,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr.advice
                 });
-                store.dispatch({
+                /*store.dispatch({
                   type:SETREADDITEMS,
                   data:dataJson.addItems
-                });
+                });*/
                 store.dispatch({
                   type:CLEAR_FIRST_MAIN_DIAG,
                   flag:dataJson.isFirstMainDiag
@@ -372,10 +372,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr[7].content ? dataJsonStr[7].content:''
                 });
-              store.dispatch({
+              /*store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });
+              });*/
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag
@@ -426,10 +426,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr.advice,
                 });
-              store.dispatch({
+              /*store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });
+              });*/
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag
@@ -487,10 +487,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                     data:dataJson.advice,
                     saveText:dataJsonStr[7].content ? dataJsonStr[7].content:''
                 });
-              store.dispatch({
+              /*store.dispatch({
                 type:SETREADDITEMS,
                 data:dataJson.addItems
-              });
+              });*/
               store.dispatch({
                 type:CLEAR_FIRST_MAIN_DIAG,
                 flag:dataJson.isFirstMainDiag