Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

src/components/PushItems/DetailsModal/index.jsx

@@ -67,18 +67,21 @@ class DetailsModal extends Component {
                     })}
                     
                 </div>
-                <div className={styles['content-menu']}>
-                    {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
-                            return (<div>
-                                <div className={styles['details-menu-title-box']}>
-                                    {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
-                                    <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
-                                        <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
-                                    </span>
-                                </div>
-                            </div>)
-                        })}
+                <div className={styles['content-menu-box']}>
+                    <div className={styles['content-menu']}>
+                        {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
+                                return (<div>
+                                    <div className={styles['details-menu-title-box']}>
+                                        {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
+                                        <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                            <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                        </span>
+                                    </div>
+                                </div>)
+                            })}
+                    </div>
                 </div>
+               
            </div>
            <div className={styles['details-mask']} onClick={this.hideTips}>
            </div>

src/components/PushItems/DetailsModal/index.less

@@ -61,10 +61,15 @@
     padding: 0 180px 0 40px;
     overflow-y: auto;
 }
-.content-menu {
+.content-menu-box {
     position: absolute;
     top: 50px;
-    right: 20px;
+    right: -20px;
+    width: 200px;
+    height: 80%;
+    overflow-y: auto;
+}
+.content-menu {
     background: #eee;
     border: 1px solid #eee;
     width: 160px;

src/components/PushItems/index.jsx

@@ -151,13 +151,31 @@ class PushItems extends Component {
       showTips
     } = this;
     let assayNum = 0;
+    let assayNum2 = 0; 
     let assayHide = assay.map((item, index) => {
       assayNum = assayNum + item.name.length + 2;
-      if (assayNum > 23) {
-        return;
+      if (assayNum > 28) {
+        assayNum2 = assayNum2 + item.name.length + 2; 
+        if(assayNum2 > 23) {
+          return;
+        } else {
+          return (
+            <span>
+              
+              <input
+                id={item.id + item.name}
+                onChange={() => changeAssay(item)}
+                type="checkbox"
+                checked={item.checked}
+              />
+              <label for={item.id + item.name}>{item.name}</label>
+            </span>
+          );
+        }
       } else {
         return (
           <span>
+            
             <input
               id={item.id + item.name}
               onChange={() => changeAssay(item)}
@@ -185,10 +203,29 @@ class PushItems extends Component {
     });
 
     let checkNum = 0;
+    let checkNum2 = 0;
     let checkHide = check.map((item, index) => {
       checkNum = checkNum + item.name.length + 2;
-      if (checkNum > 23) {
-        return;
+      if (checkNum > 28) {
+        checkNum2 = checkNum2 + item.name.length + 2; 
+        if(checkNum2 > 23) {
+          return;
+        }else {
+          return (
+            <span>
+              <input
+                id={item.id + item.name}
+                onChange={() => changeCheck(item)}
+                type="checkbox"
+                checked={item.checked}
+              />
+              <label for={item.id + item.name}>{item.name}</label>
+            </span>
+          );
+        }
+
+
+        
       } else {
         return (
           <span>
@@ -219,7 +256,7 @@ class PushItems extends Component {
     });
 
     const vigilants = vigilant.map((item, index) => {
-      return <DiagnosticItem item={item} />;
+      return <div key={item.id} className={style['push-diag-item']}><DiagnosticItem item={item}/></div>;
     });
 
     return (
@@ -293,7 +330,7 @@ class PushItems extends Component {
                           : moreAssay
                           ? assays
                           : assayHide}
-                        {assayNum > 28 ? (
+                        {assayNum2 > 23 ? (
                           <span
                             style={
                               moreAssay
@@ -331,7 +368,7 @@ class PushItems extends Component {
                           : moreCheck
                           ? checks
                           : checkHide}
-                        {checkNum > 28 ? (
+                        {checkNum2 > 23 ? (
                           <span
                             style={
                               moreCheck

src/components/PushItems/index.less

@@ -12,18 +12,15 @@
   .vigilant{
     background: #FF8D54;
     overflow: hidden;
-    margin: 1px;
-    margin-bottom: 15px;
-    line-height: 26px;
-    padding: 20px 0;
+    padding: 10px 0;
     .title{
       color:#fff;
       font-size: 14px;
       float: left;
-      margin: 0 10px 0 0;
+      margin: 10px 10px 0 0;
       img {
         float: left;
-        margin: 4px 2px 0 20px;
+        margin: 1px 2px 0 20px;
         width: 18px;
         height: 17px;
       }
@@ -32,11 +29,17 @@
       float:left;
       width: 340px;
       span {
-        font-size: 16px;
+        font-size: 14px;
         color: #fff;
         display:inline-block;
       }
     }
+    .push-diag-item {
+        display: inline-block;
+        margin-right: 10px;
+        margin-top: 10px;
+        cursor: pointer;
+    }
   }
   .diagnose{
     padding-bottom: 15px;

src/components/TreatDesc/DrugInfo/index.jsx

@@ -54,17 +54,22 @@ class DrugInfo extends Component {
                             <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></div> 
                         </div>
                     })}
-                    <div className={style['content-menu']}>
-                        {drugInfo.drugDesc.map((item, index) => {
-                            return (<div>
-                                <div className={style['details-menu-title-box']}>
-                                    {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
-                                    <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
-                                        <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
-                                    </span>
-                                </div>
-                            </div>)
-                        })}
+                    <div className={style['content-menu-box']}>
+                        
+                        <div className={style['content-menu']}>
+                            {drugInfo.drugDesc.map((item, index) => {
+                                return (<div >
+                                    <div className={style['details-menu-title-box']}>
+                                        {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
+                                        <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                            <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                        </span>
+                                    </div>
+                                </div>)
+                            })}
+
+                        </div>
+                    
                     </div>
                 </div> }
                 { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>

src/components/TreatDesc/DrugInfo/index.less

@@ -1,5 +1,6 @@
 .drug-info-wrapper {
     position: fixed;
+    overflow: hidden;
     width: 950px;
     height: 80%;
     left: 50%;
@@ -66,13 +67,19 @@
 .drug-desc-content {
     /*width: 100%;*/
     margin-left: 210px;
-    margin-right: 180px;
+    margin-right: 160px;
 }
 
-.content-menu {
+.content-menu-box {
     position: absolute;
     top: 50px;
-    right: 20px;
+    right: -20px;
+    width: 200px;
+    height: 80%;
+    overflow-y: auto;
+}
+.content-menu {
+    
     background: #eee;
     border: 1px solid #eee;
     width: 160px;

src/store/actions/diagnosticList.js

@@ -52,9 +52,12 @@ export const getDiagnosticStr = (state, action) => {
     const res = Object.assign({}, state)
     const diagnosticList = res.diagnosticList
     let diagnosticStr= '';
+    let diagnosticStrNoType = ''
     for (let i = 0; i < diagnosticList.length; i++) {
         diagnosticStr = diagnosticStr + diagnosticList[i].name + '(' + getDiagType(diagnosticList[i].type) + '); '
+        diagnosticStrNoType = diagnosticStrNoType + diagnosticList[i].name + ';'
     }
+    res.diagnosticStrNoType = diagnosticStrNoType
     res.diagnosticStr = diagnosticStr
     return res;
 }

src/store/async-actions/treat.js

@@ -103,7 +103,7 @@ export const getTreatResult = (item) =>{
         let diag = '';
         if(diagnosticList) {
             for (let i = 0; i < diagnosticList.length; i++ ) {
-                if(i ===0 ) {
+                if(i === 0 ) {
                     diag = diag + diagnosticList[i].name;
                 } else {
                     diag = diag + ',' + diagnosticList[i].name;

src/store/reducers/pushMessage.js

@@ -8,8 +8,6 @@ const initState = {
   assay: [],
   determine: [],
   check: [ //辅检
-    // {name: '胸部CT', id: 7, checked: false},
-    // {name: '心肌酶谱', id: 8, checked: false},
   ],
   tips: {},
   advice: {

src/utils/tools.js

@@ -605,7 +605,7 @@ function getEMRParams(){
     vital = filterDataArr(checkBody.saveText)||'',
     lis = inspect.pushItem,    //化验推送所需数据
     pacs = assistCheck.dataString||'',
-    dis=diagnosticList.diagnosticStr||'',
+    dis=diagnosticList.diagnosticStrNoType||'',
     advice = '',
     diseaeId = [];
   const age = message.patientAge;