Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize

src/components/ChronicInfo/index.jsx

@@ -521,13 +521,12 @@ class ChronicInfo extends React.Component{
     if(data&&data.length>0){
       return <div className={style["tips"]} style={{marginBottom:'15px'}}>
         <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-          <div className={style["tips-name"]}>
+          <div className={style["tips-name"]} onClick={this.slideToggle}>
             <img src={chronicPic} />
-            <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}</h2>
-            <span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span>
+            <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}<span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span></h2>
           </div>
           <div className={style['toggle-btn']}>
-            <img src={slideUp?down:up} alt="展开/收起" onClick={this.slideToggle}/>
+            <img src={slideUp?down:up} alt="展开/收起"/>
           </div>
         </div>
         <div className={style["content"]} ref={this.$content}>

src/components/ChronicInfo/index.less

@@ -8,6 +8,8 @@
     padding: 8px 15px;
     background: #EAF7FA;
     font-weight: bold;
+    white-space: nowrap;
+    cursor: pointer;
     background: rgba(242,150,91,0.1);
     .tips-name{
       width: 238px;

src/components/PushItems/index.jsx

@@ -186,24 +186,25 @@ class PushItems extends Component {
             )}
             {/* 不展示确诊 */}
             {/* {determine && determine.length>0 && <PushDiag titleBg='#FAEBEC' icon={possibleImg} title='确诊' diagList={determine} maxShowNum={28}/>} */}
-            {doubt && doubt.length > 0 && (
+            {possible && possible.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={doubtImg}
-                title="疑似诊断"
-                diagList={doubt}
+                icon={possibleImg}
+                title="可能诊断"
+                diagList={possible}
                 maxShowNum={24}
               />
             )}
-            {possible && possible.length > 0 && (
+            {doubt && doubt.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={possibleImg}
-                title="可能诊断"
-                diagList={possible}
+                icon={doubtImg}
+                title="初步诊断"
+                diagList={doubt}
                 maxShowNum={24}
               />
             )}
+            
             {likely && likely.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"

src/components/SpreadDrop/index.jsx

@@ -430,7 +430,7 @@ class ListItems extends Component{
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(
       <div className={style["drop-list"]} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
-        <p className={style['orderTips']}>按{order?'从左到右列':'点选'}顺序成文</p>
+        <p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>
         {this.getLabels()}
         <div className="oper">
           <span className={style['clear']} onClick={handleClear}>清空选项</span>

src/containers/CurrentIll.js

@@ -9,7 +9,7 @@ import {HIDE,RESET,CLICKCOUNT,ISREAD,SEARCH_DROP_LOCATION} from '@store/types/ho
 import {billing} from '@store/async-actions/pushMessage';
 import {getModule} from '@store/async-actions/fetchModules.js';
 import {didPushParamChange} from '@utils/tools.js';
-
+import {Notify} from '@commonComp';
 
 function mapStateToProps(state) {
   const {homePage,currentIll,mainSuit,diagnosticList} = state;

src/store/async-actions/fetchModules.js

@@ -148,7 +148,7 @@ export function pregetCheckbodyData(flag){     //flag=true获取到数据后立
     const emrData = getEMRParams();
     const param = {
       age: emrData.age,
-      featureType: "1,4,7",
+      featureType: "1,4,41,7",
       diag: emrData.dis,
       lis: emrData.lis,
       other: emrData.other,

src/store/async-actions/pushMessage.js

@@ -25,7 +25,7 @@ export const billing = (mdata,boxMark) => {
   const emrData = getEMRParams();
   const params = {
     age: emrData.age,
-    featureType: getCheck?"4,5,6,7":"5,6,7",
+    featureType: getCheck?"4,41,5,6,7":"4,5,6,7",    //41只返回查体模板，4只返回查体高亮
     // featureType: "22",
     diag: emrData.dis,
     lis: emrData.lis,