Squashed commit of the following:

commit 29169ab80ae62aae61d7081a615691ba25999a31
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 30 11:03:41 2019 +0800

    慢病bug修改

commit 757123ddc349b5857e812c358913517c4ae1a2f4
Merge: 05acdd4 7534d10
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 29 15:00:48 2019 +0800

    Merge branch 'Chronic-ll' into ChronicMag

commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 29 14:57:13 2019 +0800

    彈窗可移動添加

commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 14:44:50 2019 +0800

    量表计算无结果提示

commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
Merge: 09481b6 dd9204c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:47:46 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:47:19 2019 +0800

    评估容错

commit dd9204c919b350dbd69f437dfc404b3edbdf9117
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:31:49 2019 +0800

    治疗方案是否存在判断条件

commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
Merge: 0fcb618 6b6ff32
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:22:24 2019 +0800

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

commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
Merge: 6a23ae1 d3f6e01
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:22:06 2019 +0800

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

commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
Merge: a3fb1eb 19fbb89
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:21:58 2019 +0800

    Merge branch 'dev/new1' into ChronicMag

commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:21:55 2019 +0800

    不良反应静态知识

commit a3fb1eba78caa297475c85f948326dc0d0d88c88
Merge: 7bcef57 6b6ff32
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:18:17 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 7bcef571328c906461251340e933ecef9bea2a7a
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:18:07 2019 +0800

    查体无模板报错bug修改

commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
Author: liucf <liucf@zjlantone.com>
Date:   Mon Apr 29 11:35:58 2019 +0800

    Squashed commit of the following:

    commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Apr 29 11:27:20 2019 +0800

        历史病例接口无数据时逻辑处理

    commit bf091afd13dc29e7d123357f81dd23adfb141d97
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun Apr 28 13:37:18 2019 +0800

        合并chronicMag分支

    commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun Apr 28 13:19:13 2019 +0800

        合并远程分支

    commit 1a61bc8860afd4be87a796593aa98daf25f38021
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 15:34:04 2019 +0800

        右侧推送量表根据id展示结果，去掉index

    commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 14:21:35 2019 +0800

        合并远程分支

    commit 2b2d2395be20378bd90ece24d9364985a8ae4444
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 14:06:36 2019 +0800

        量表容错处理

    commit ac70fb283eec5b0601898a419eea43e07053be3d
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 13:25:44 2019 +0800

        合并远程分支

    commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 11:42:05 2019 +0800

        解决量表计算时页面更新问题

    commit 269d9cfbed90b980935e3f949a2e75246308519e
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 09:57:50 2019 +0800

        合并远程分支

    commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Apr 25 20:19:19 2019 +0800

        慢病诊断入口

    commit a5cb935038e2e63699d1f2f250322b759635eb82
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Apr 25 16:50:03 2019 +0800

        分组小计结果处理

    # Conflicts:
    #	src/components/DiagnosticList/index.jsx
    #	src/components/ScaleTable/index.jsx
    #	src/containers/AssessResult.js
    #	src/containers/DiagnosticList.js
    #	src/containers/MainSuit.js

commit 082b60e12126a46c18d088188c87e308061064d7
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Sun Apr 28 17:22:07 2019 +0800

    修改右侧推送滚动条

src/common/components/ComplexModal/index.jsx

@@ -3,6 +3,8 @@ import ReactDom from "react-dom";
 import style from "./index.less";
 import Notify from '@commonComp/Notify';
 import close from '@common/images/icon_close.png';
+import { dragBox } from '@utils/tools';
+
 /**
  * title:标题
  * children：弹窗内容
@@ -19,6 +21,9 @@ class ComplexModal extends Component {
   constructor(props) {
     super(props);
   }
+  componentDidMount(){
+    dragBox('complexModalWrap','complexModalTitle')
+  }
 
   render() {
     const { onclose,title,children,footer,shadeClose,icon,width,top,bottom} = this.props;
@@ -27,8 +32,8 @@ class ComplexModal extends Component {
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(<div className={style['container']}>
       <div className={style['shade']} onClick={shadeClose===false?'':onclose}></div>
-      <div className={style['modal']} style={{width: width?width:'auto', marginLeft:marginLeft, top:top?top+'px':'',bottom:bottom?bottom+'px':''}}>
-        <div className={style['close']}>
+      <div id="complexModalWrap" className={style['modal']} style={{width: width?width:'auto', marginLeft:marginLeft, top:top?top+'px':'',bottom:bottom?bottom+'px':''}}>
+        <div className={`${style['close']} drag-title`} id="complexModalTitle">
           {icon?<img src={icon} />:''}
           {title}
           <img src={close} onClick={onclose} className={style['closeIcon']} />

src/common/components/ComplexModal/index.less

@@ -1,18 +1,23 @@
 .container {
   position: relative;
   z-index: 2000;
+  padding-top: 40px;
   .content{
     overflow: auto;
-    position: fixed;
-    bottom: 70px;
-    top: 70px;
+    position: relative;
+    height: 100%;
+    padding-bottom: 30px;
+    // bottom: 70px;
+    // top: 70px;
     // width: 820px;
   }
   .footer{
     // width: 820px;
-    position: fixed;
-    bottom:30px;
+    position: relative;
+    padding:15px 0px;
+    bottom: 0;
     text-align: right;
+    background-color: #fff;
   }
   // @media print {
   //   .close{
@@ -41,15 +46,20 @@
     background: #fff;
     position: fixed;
     left: 50%;
-    //top: 50%;
-    // margin-left: -410px;
-    top: 65px;
-    bottom: 65px;
+    top: 3%;
+    bottom: 3%;
+    height: 94%;
+    overflow: hidden;
+    padding-top: 50px;
+    padding-bottom: 64px;
   }
   .close {
     padding:  15px 15px 15px 20px;
     border-bottom: 1px solid #EAEDF1;
     background: #e5eefe;
+    position: absolute;
+    top:0;
+    width: 100%;
     img{
       vertical-align: text-top;
     }

src/common/less/variables.less

@@ -184,3 +184,13 @@
   border:1px solid @import-color;
   //color: @import-color!important;
 }
+:global(.drag-title) {
+  cursor: move;
+  moz-user-select: -moz-none;
+  -moz-user-select: none;
+  -o-user-select: none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}

src/components/AssessResult/ChooseItem/index.jsx

@@ -55,7 +55,7 @@ class ChooseItem extends Component {
                                           value={i.detailName}
                                           label={i.detailName}
                                           disabled={disabled}
-                                          isSelect={selecteds[it.name]&&selecteds[it.name].includes(i.detailName)}
+                                          isSelect={selecteds&&selecteds[it.name]&&selecteds[it.name].includes(i.detailName)}
                                           handleClick={this.handleCheckbox.bind(this,it.name,i.detailName)}/>
                                 {i.state?<i>（智能推荐）</i>:''}
                               </div>;

src/components/AssessResult/index.jsx

@@ -106,7 +106,7 @@ class AssessResult extends Component {
         return <ChooseItem title={name}
                            data={list}
                            handleChange={this.handleChooseChange.bind(this,i)}
-                           selecteds={chooseSelecteds[i]} ></ChooseItem>;
+                           selecteds={chooseSelecteds[i]||{}} ></ChooseItem>;
       case 10:   //数据来源于后台
         return <ChartItem title={name}
                           data={chartData||{}}

src/components/CheckBody/index.jsx

@@ -34,9 +34,9 @@ class CheckBody extends Component{
     let arr = [],list=[];//console.log(data,saveText)
     const {boxMark,showAll} = this.state;
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
-    const moreText = filterDataArr([...saveText].splice(moreNum+1));      //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
+    const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
-    const showMoreBtn = data.length>moreNum&&!moreText;
+    const showMoreBtn = (data.length>moreNum&&!data[0].full)&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;

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>
                         })}
@@ -526,8 +526,8 @@ class ChronicInfo extends React.Component{
               {showAssess?<ComplexModal onclose={this.showAssessFn} footer={footer}
                       title='管理和评估'
                       icon={manageIcon}
-                      top={20}
-                      bottom={20}
+                      top={'3%'}
+                      bottom={'3%'}
                       width={820}>
                 <AssessResult handleSave={saveAssessInfos}
                               handleSaveCalcu={this.handleSaveCalcu}

src/components/ChronicInfo/index.less

@@ -14,7 +14,7 @@
   }
   .tips-title{
     .tips-name{
-      width: 255px;
+      width: 238px;
       display: inline-block;
     }
     h2{
@@ -217,7 +217,7 @@
         margin-top: 10px;
         cursor: pointer;
       }
-      i{
+      .res{
         color:#3B9ED0;
         margin-left: 10px;
       }
@@ -267,7 +267,7 @@
     text-align: center;
     color: #fff;
     // background: #DBDBDB;
-    background: #DFEAFE;
+    background: #3B9ED0;
     border-radius: 4px;
     cursor: auto;
     margin-top: 15px;

src/components/CopyRight/CopyModalSon/index.jsx

@@ -0,0 +1,34 @@
+import React, { Component } from "react";
+import style from "../index.less";
+import close from '../../../common/images/icon_close.png'
+import { dragBox } from '@utils/tools';
+
+class DiscontentSon extends Component {
+  constructor(props) {
+    super(props);
+  }
+  componentDidMount(){
+    dragBox('CopyModalWrap','CopyModalTitle')
+  }
+
+  render() {
+    const { closeCopyModal,copyVisible,date,copyContent,number } = this.props;
+
+    return <div
+        className={style["copyModal"]}
+        style={copyVisible ? { display: "block" } : { display: "none" }}
+      >
+        <div className={style["shade"]} onClick={closeCopyModal}/>
+        <div className={style["copyContent"]} id="CopyModalWrap">
+          <div className={`${style["header"]} drag-title`} id="CopyModalTitle">版本信息<img src={close} onClick={closeCopyModal} /></div>
+          <div className={style["now"]}>
+            当前版本：{number}
+            <span>{date && date.substring(0, 10)}</span>
+          </div>
+          <div className={style["content"]}>{copyContent}</div>
+        </div>
+      </div>
+  }
+}
+
+export default DiscontentSon;

src/components/CopyRight/DiscontentSon/index.jsx

@@ -0,0 +1,31 @@
+import React, { Component } from "react";
+import style from "../index.less";
+import close from '../../../common/images/icon_close.png'
+import { dragBox } from '@utils/tools';
+
+class DiscontentSon extends Component {
+  constructor(props) {
+    super(props);
+  }
+  componentDidMount(){
+    dragBox('disContentWrap','DisclatmerTitle')
+  }
+
+  render() {
+    const { closeDisclatmerModal,disVisible,disclatmerContent } = this.props;
+
+    return <div
+          className={style["disModal"]}
+          style={disVisible ? { display: "block" } : { display: "none" }}
+        >
+          <div className={style["shade"]} onClick={closeDisclatmerModal}/>
+          <div className={style["disContent"]} id="disContentWrap">
+            <div className={`${style["header"]} drag-title`} id="DisclatmerTitle">免责声明<img src={close} onClick={closeDisclatmerModal} /></div>
+            <div className={style["content"]}>{disclatmerContent}</div>
+            <div className={style["btnBox"]}><span  className={style["btn"]} onClick={closeDisclatmerModal}>确定</span></div>
+          </div>
+      </div>
+  }
+}
+
+export default DiscontentSon;

src/components/CopyRight/index.jsx

@@ -2,6 +2,8 @@ import React, { Component } from "react";
 import style from "./index.less";
 import close from '../../common/images/icon_close.png'
 import { storageLocal } from "../../utils/tools"
+import DiscontentSon from "./DiscontentSon"
+import CopyModalSon from "./CopyModalSon"
 
 class CopyRight extends Component {
   constructor(props) {
@@ -16,7 +18,6 @@ class CopyRight extends Component {
   }
   componentWillMount() {
     this.props.getDisMessage()
-
   }
   componentDidMount() {
     this.props.getMessage()
@@ -59,6 +60,7 @@ class CopyRight extends Component {
   render() {
     const { number, date, content, copyVisible, disVisible, disContent, hasNewVersion } = this.props.copyRight;
     const { showCopyModal, closeCopyModal, showDisclatmerModal, closeDisclatmerModal } = this;
+    console.log(disVisible,77777)
     const copyContent = content&&content.map(item => {
       return (
         <div className={style['message']}>
@@ -68,15 +70,6 @@ class CopyRight extends Component {
       );
     });
 
-    // const disclatmerContent = disContent.map(item => {
-    //   return (
-    //     <div className={style['message']}>
-    //       {item.title}
-    //       <div dangerouslySetInnerHTML={{__html: item.description}}></div>
-    //     </div>
-    //   );
-    // })
-
     return (
       <div className={style["container"]}>
         <div className={style["copy"]}>
@@ -87,11 +80,11 @@ class CopyRight extends Component {
           {hasNewVersion && <span>new</span>} &copy;<b>朗通医疗</b>
           <div className={style['disclaimer']} onClick={showDisclatmerModal}>免责声明</div>
         </div>
-        {copyVisible && <div
+        {/* {copyVisible && <div
           className={style["copyModal"]}
           style={copyVisible ? { display: "block" } : { display: "none" }}
         >
-          <div className={style["shade"]}  onClick={closeCopyModal}/>
+          <div className={style["shade"]} onClick={closeCopyModal}/>
           <div className={style["copyContent"]}>
             <div className={style["header"]}>版本信息<img src={close} onClick={closeCopyModal} /></div>
             <div className={style["now"]}>
@@ -100,18 +93,9 @@ class CopyRight extends Component {
             </div>
             <div className={style["content"]}>{copyContent}</div>
           </div>
-        </div>}
-       {disVisible && <div
-          className={style["disModal"]}
-          style={disVisible ? { display: "block" } : { display: "none" }}
-        >
-          <div className={style["shade"]} onClick={closeDisclatmerModal}/>
-          <div className={style["disContent"]}>
-            <div className={style["header"]}>免责声明<img src={close} onClick={closeDisclatmerModal} /></div>
-            <div className={style["content"]}>{this.disclatmerContent()}</div>
-            <div className={style["btnBox"]}><span  className={style["btn"]} onClick={closeDisclatmerModal}>确定</span></div>
-          </div>
-        </div>}
+        </div>} */}
+        {copyVisible && <CopyModalSon copyVisible={copyVisible} date={date} closeCopyModal={closeCopyModal} copyContent={copyContent} number={number}></CopyModalSon>}
+        {disVisible && <DiscontentSon closeDisclatmerModal={closeDisclatmerModal} disVisible={disVisible} disclatmerContent={this.disclatmerContent()}></DiscontentSon>}
       </div>
     );
   }

src/components/CopyRight/index.less

@@ -95,9 +95,10 @@
         position: fixed;  
         width: 50%;
         height: 60%;
-        left: 20%;
+        left: 25%;
         background: #fff;
         top: 20%;
+        padding: 40px 0 60px 0;
         img{
           float: right;
           margin: -5px 5px 0px 0px;
@@ -105,7 +106,8 @@
         }
         .header {
           position: absolute;
-          top: -40px;
+          top: 0px;
+          width: 100%;
           height: 40px;
           font-size: 14px;
           padding: 10px 0px 10px 20px;
@@ -129,8 +131,8 @@
           overflow: auto;
         }
         .btnBox {
-          position: absolute;
-          bottom: -60px;
+          position: relative;
+          // bottom: -60px;
           width: 100%;
           height: 60px;
           background: #fff;

src/components/DiagnosticList/index.jsx

@@ -168,7 +168,8 @@ class DiagnosticList extends Component {
         return(
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
-                        const hasTreat = item.treat && (item.treat.commonTreatment.content || item.treat.surgeryTreatment.content || item.treat.treatment.length>0)
+                        const hasTreat = item.treat && (item.treat.commonTreatment.content || item.treat.surgeryTreatment.content || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
+                           || (item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow) 
                         // const hasTreat= true;
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -6,13 +6,16 @@ import sort from "./img/sort.png"
 import close from "./img/close.png";
 import PreviewBody from '@components/PreviewBody';
 import Empty from '@components/Empty'
-
+import { dragBox } from '@utils/tools';
 
 
 class HistoryCaseContainer extends React.Component {
     constructor(props){
         super(props);
     }
+    componentDidMount(){
+      dragBox('hisWrapMove','closeHis')
+    }
     render(){
         const { items,handleCaseClick,handleQuoteClick,handleSortClick,showHistoryBox,activeHistory,preInfo } = this.props;
         let baseList = store.getState();
@@ -36,8 +39,10 @@ class HistoryCaseContainer extends React.Component {
             return jsonDataString;
         }
         return (
-            <div className={styles.mainHistory}>
-                <img className={styles.close} src={close} alt="关闭历史病历" onClick={showHistoryBox}/>
+            <div className={styles.mainHistory} id="hisWrapMove">
+                <div className={`${styles.closeHis} drag-title`} id="closeHis">
+                    <img className={styles.close} src={close} alt="关闭历史病历" onClick={showHistoryBox}/>
+                </div>
                 <div className={styles.mainHistoryLeft}>
                     <div className={styles.title}>
                         <span className={styles.his}>历史病历</span>
@@ -46,7 +51,7 @@ class HistoryCaseContainer extends React.Component {
                     <div className={styles.lists}>
                         <ul>
                             {
-                                items && items.length > 0? items.map((val,idx)=>{
+                                (items && items.length > 0)? items.map((val,idx)=>{
                                     return <li key={val.id} className={val.id == activeHistory.id?styles.bgc:''} onClick={(e)=>{handleCaseClick(e,idx)}}>
                                         <span title={val.diagnose}>{val.diagnose}</span>
                                         {/* <span className={val.id == activeHistory.id?`${styles.time} ${styles.quoteHide}`:styles.time}>{val.inquiryDate}</span>

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -1,26 +1,27 @@
 @import "~@less/mixin.less";
 .mainHistory {
     position: fixed;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom:0;
-    margin: auto;
+    margin-left: -500px;
+    left: 50%;
     width: 1000px;
-    top: 70px;
-    bottom: 70px;
+    top: 7%;  
+    bottom: 7%;
+    height: 86%;
     background-color: #fff;
     z-index: 242;
+    overflow: hidden;
     .close {
         position: absolute;
         top: 0;
         right: 0;
+        cursor: pointer;
     }
     .mainHistoryLeft {
         width: 300px;
         height: 100%;
         background: #d2d1d1;
         position: relative;
+        float: left;
         .title {
             height: 80px;
             line-height: 80px;
@@ -97,6 +98,21 @@
         }
     }
     .mainHistoryRight {
-        margin-left: 300px;
+        // margin-left: 300px;
+        // position: absolute;
+        overflow: auto;
+        height: 100%;
+        padding-top: 40px;
+        // top: 42px;
+
+        float: left;
+    }
+    .closeHis {
+      width: 700px;
+      height: 40px;
+      margin-left: 300px;
+      position: absolute;
+      z-index: 9999;
+      // border-bottom: 1px solid #EAEDF1;
     }
 }

src/components/Preview/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import {getAllDataList,getAllDataStringList} from '@utils/tools';
+import {getAllDataList,getAllDataStringList,dragBox} from '@utils/tools';
 import PreviewBody from '../PreviewBody';
 import store from '@store';
 import style from "./index.less";
@@ -9,7 +9,9 @@ class Preview extends Component {
   constructor(props) {
     super(props)
   }
-
+  componentDidMount(){
+    dragBox('previewWrapper','previewStatic')
+  }
   render() {
     const { onClose, visible,preInfo } = this.props;
     let baseList = store.getState();
@@ -18,8 +20,8 @@ class Preview extends Component {
 
     return <div className={style['container']} style={visible? {display: 'block'}: {display: 'none'}}>
       <div className={style['shade']} onClick={onClose}></div>
-      <div className={style['modal']}>
-        <div className={style['close']}>预览<img src={close} onClick={onClose} /></div>
+      <div className={style['modal']} id="previewWrapper">
+        <div id="previewStatic" className={`${style['close']} drag-title`}>预览<img src={close} onClick={onClose} /></div>
         <PreviewBody
             preInfo={preInfo}
             dataJson={dataJson}

src/components/Preview/index.less

@@ -18,8 +18,10 @@
     position: fixed;
     left: 50%;
     margin-left: -410px;
-    top: 65px;  
-    bottom: 65px;
+    top: 7%;  
+    bottom: 7%;
+    height: 86%;
+    overflow: hidden;
   }
   .close { 
     padding:  15px 15px 15px 20px;

src/components/PreviewBody/index.jsx

@@ -223,20 +223,21 @@ class PreviewBody extends Component {
         </table>
         <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
         {showAssessBtn?<AssessResultHis inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
+        
+        <div onClick={() => { this.surePrint(dataStr) }} style={{
+          display: show ? 'inline-block' : 'none',
+          padding: '10px 20px',
+          float: 'right',
+          marginTop: '22px',
+          background: '#3B9ED0',
+          color: '#fff',
+          borderRadius: '4px',
+          cursor: 'pointer',
+          position: 'absolute',
+          right: '-40px'
+        }}>打印</div>
       </div>
 
-      <div onClick={() => { this.surePrint(dataStr) }} style={{
-        display: show ? 'inline-block' : 'none',
-        padding: '10px 20px',
-        float: 'right',
-        marginTop: '15px',
-        background: '#3B9ED0',
-        color: '#fff',
-        borderRadius: '4px',
-        cursor: 'pointer',
-        position: 'absolute',
-        right: '40px'
-      }}>打印</div>
     </div>
   }
 }

src/components/PreviewBody/index.less

@@ -1,11 +1,12 @@
 @import "~@less/variables.less";
 .content {
-  position: fixed;
-  bottom: 70px;
+  position: relative;
   overflow: auto;
-  top:120px;
+  height: 100%;
+  top:0px;
   width: 820px;
-  padding: 0 0px 60px 0px;
+  padding: 15px 0px 100px 0px;
+  box-sizing: border-box;
   .contents {
     position: relative;
     padding-bottom: 26px;

src/components/PrintPreview/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { getAllDataList, getAllDataStringList,filterDataArr } from '@utils/tools';
+import { getAllDataList, getAllDataStringList,dragBox } from '@utils/tools';
 import style from "./index.less";
 import PreviewBody from "../PreviewBody";
 import store from '@store';
@@ -11,6 +11,9 @@ class PrintPreview extends Component {
     constructor(props) {
         super(props)
     }
+    componentDidMount(){
+      dragBox('previewPrintWrapper','previewPrintStatic')
+    }
     render() {
         const { onClose, visible, preInfo,save } = this.props;
         let baseList = store.getState();
@@ -19,8 +22,8 @@ class PrintPreview extends Component {
 
         return <div className={style['container']} style={visible ? { display: 'block' } : { display: 'none' }}>
             <div className={style['shade']} onClick={onClose}></div>
-            <div className={style['modal']}>
-                <div className={style['close']}>打印<img src={close} onClick={onClose} /></div>
+            <div className={style['modal']} id="previewPrintWrapper">
+                <div id="previewPrintStatic" className={`${style['close']} drag-title`}>打印<img src={close} onClick={onClose} /></div>
                   <PreviewBody
                       preInfo={preInfo}
                       dataJson={dataJson}

src/components/PrintPreview/index.less

@@ -18,8 +18,10 @@
       position: fixed;
       left: 50%;
       margin-left: -410px;
-      top: 65px;  
-      bottom: 65px;
+      top: 7%;  
+      bottom: 7%;
+      height: 86%;
+      overflow: hidden;
     }
     .close { 
       padding:  15px 15px 15px 20px;

src/components/PushItems/DetailsModal/index.jsx

@@ -4,6 +4,7 @@ import NewPortal from './NewPortal'
 import close from "./../img/close.png";
 import $ from "jquery";
 import { imageUrlPrefix } from '@utils/config.js';
+import { dragBox } from '@utils/tools';
 class DetailsModal extends Component {
     constructor(props) {
         super(props);
@@ -12,6 +13,9 @@ class DetailsModal extends Component {
         }
         this.hideTips = this.hideTips.bind(this)
     }
+    componentDidMount(){
+      dragBox('detailsContentWrap','detailsContentTitle')
+    }
     hideTips() {
         const { hideTips } = this.props;
         hideTips && hideTips();
@@ -46,15 +50,14 @@ class DetailsModal extends Component {
         }
     }
     
-    
-
     render() {
         const {showTipsDetails, tipsDetails} = this.props;
         const { currentIndex } = this.state
-        return (<NewPortal visible={showTipsDetails}>
-        <div className={styles['details-wrapper']}>
-           <div className={styles['details-content-wrapper']}>
-                <h1 className={styles['details-content-name']} >{tipsDetails && tipsDetails.tagName} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
+        const domNode = document.getElementById('root');
+        return showTipsDetails && ReactDOM.createPortal(
+          <div className={styles['details-wrapper']}>
+           <div className={styles['details-content-wrapper']} id="detailsContentWrap">
+                <h1 id="detailsContentTitle" className={`${styles['details-content-name']} drag-title`} >{tipsDetails && tipsDetails.tagName} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
                 <div className={styles['details-content']} id= 'detailsContent' onScroll={this.handleScrollModal.bind(this, tipsDetails)}>
                     {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
                         return (<div id={item.title}>
@@ -85,8 +88,9 @@ class DetailsModal extends Component {
            </div>
            <div className={styles['details-mask']} onClick={this.hideTips}>
            </div>
-        </div>
-    </NewPortal>)
+        </div>,
+          domNode
+      )
     }
 }
 

src/components/PushItems/index.jsx

@@ -162,9 +162,9 @@ class PushItems extends Component {
     let assayNum2 = 0; 
     let assayHide = assay.map((item, index) => {
       assayNum = assayNum + item.name.length + 2;
-      if (assayNum > 28) {
+      if (assayNum > 26) {
         assayNum2 = assayNum2 + item.name.length + 2; 
-        if(assayNum2 > 21) {
+        if(assayNum2 > 20) {
           return;
         } else {
           return (
@@ -214,9 +214,9 @@ class PushItems extends Component {
     let checkNum2 = 0;
     let checkHide = check.map((item, index) => {
       checkNum = checkNum + item.name.length + 2;
-      if (checkNum > 28) {
+      if (checkNum > 26) {
         checkNum2 = checkNum2 + item.name.length + 2; 
-        if(checkNum2 > 21) {
+        if(checkNum2 > 20) {
           return;
         }else {
           return (
@@ -270,7 +270,7 @@ class PushItems extends Component {
     return (
       <div className={style["push-content-wrapper"]}>
         <div className={style["push-content"]} ref={this.$cont}>
-          <div style = {{width: '420px'}}>
+          <div style = {{width: '410px'}}>
             {vigilant && vigilant.length > 0 && (
               <div className={style["vigilant"]}>
                 <div className={style["title"]}>
@@ -288,7 +288,7 @@ class PushItems extends Component {
                 icon={doubtImg}
                 title="疑似诊断"
                 diagList={doubt}
-                maxShowNum={26}
+                maxShowNum={24}
               />
             )}
             {possible && possible.length > 0 && (
@@ -297,7 +297,7 @@ class PushItems extends Component {
                 icon={possibleImg}
                 title="可能诊断"
                 diagList={possible}
-                maxShowNum={26}
+                maxShowNum={24}
               />
             )}
             <div className={style["diagnose"]}>

src/components/PushItems/index.less

@@ -6,8 +6,8 @@
   width: @push-width;
   overflow: hidden;
   .push-content {
-    width: 467px;
-    overflow-y: scroll;
+    width: 436px;
+    overflow-y: auto;
   }
   .vigilant{
     background: #FF8D54;
@@ -144,7 +144,7 @@
           }
           .content{
             float: left;
-            width: 359px;
+            width: 349px;
             line-height: 26px;
             padding: 0px 0px 0px 0px;
             span{

src/components/ScaleTable/index.jsx

@@ -153,6 +153,8 @@ class ScaleTable extends React.Component{
         that.setState({
           scaleResult1:res.data.data
         })
+      }else{
+        Notify.error(res.data.msg||'计算没有结果返回');
       }
     })
   }

src/components/Treat/AdverseReactions/index.jsx

@@ -7,21 +7,76 @@ import $ from "jquery";
 class AdverseReactions extends Component {
     constructor(props){
         super(props);
+        this.state = {
+            currentIndex: -1
+        }
+        this.handleMouseLeaveDrug = this.handleMouseLeaveDrug.bind(this);
+        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this);
+        this.setDrugInfo = this.setDrugInfo.bind(this);
       
     }
     changeReact(it, index) {
         this.props.changeReact(it, index);
     }
+    handleMouseEnterDrug(index, item) {
+        const drugNameWidth = parseInt($('#'+item.id)[0].offsetWidth)
+        const imgLeft = drugNameWidth/2-8
+        $('#'+item.id).find('img').css('left', imgLeft)
+        this.setState({
+            currentIndex: index,
+        })
+    }
+    handleMouseLeaveDrug() {
+        this.setState({
+            currentIndex: -1, 
+        })
+    }
+    handleMouseEnterImg() {
+        this.setState({
+            hasEnterImg: true
+        })
+    }
+    handleMouseLeaveImg() {
+        this.setState({
+            hasEnterImg: false
+        })
+    }
+    setDrugInfo(item) {
+        const { setDrugInfo } = this.props;
+        setDrugInfo && setDrugInfo(item, 10, 6);
+    }
 
 
     render() {
-        const { icon, titleStyle,titleBg, filter, title,  adversReactionList } = this.props
+        const { icon, titleStyle,titleBg, filter, title,  adversReactionList, showDrugInfo, setDrugInfo } = this.props
+        const  { currentIndex, hasEnterImg } = this.state
         return(
             <div className={style['last-treat-wrapper']}>
                 <div className={style['last-treat-title-box']} style={titleStyle}></div>
                 <div className={style['last-treat-title']} ><img className={style['last-treat-icon']} src={icon}/>{title}</div>
+                {/* {console.log('adversReactionList', adversReactionList)} */}
+
                 {adversReactionList.map((item, index) => {
-                    return (<div key={item.id}><span className={style['last-treat-name-box']}>{item.tagName}:</span>
+                    return (<div className={style['adverse-reactions-item']} key={item.id}>
+                    <span className={style['last-treat-name-box']}
+                        
+                    >   
+                        <span   id={item.id} 
+                                className={style['last-treat-big-name-box']} 
+                                onMouseEnter={this.handleMouseEnterDrug.bind(this, index, item)}
+                                onMouseLeave = {this.handleMouseLeaveDrug}
+                        >
+                            {item.tagName}:
+                            {<img className={style['info-img']}  
+                                style ={currentIndex === index  ? {display: "inline-block"} : {display: "none"}}
+                                src={currentIndex === index ?(hasEnterImg ? info3 : info2 ): info2} 
+                                onMouseEnter={this.handleMouseEnterImg.bind(this)}
+                                onMouseLeave = {this.handleMouseLeaveImg}
+                                onClick={() =>{this.setDrugInfo(item);showDrugInfo();}}/>}
+                        
+                        </span>
+                        
+                    </span>
                         {item.details.map((it, idx) => {
                             return <span key={item.id + it.name}>
                                 <input type="checkbox" checked={it.checked} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>

src/components/Treat/AdverseReactions/index.less

@@ -26,6 +26,20 @@
 .last-treat-name-box {
     display: inline-block;
     width: 150px;
+    position: relative;
+}
+.adverse-reactions-item{
+    border-bottom: 1px dotted #D2D2D2;
+    line-height: 36px;
+}
+.info-img {
+    position: absolute;
+    width: 15px;
+    position: absolute;
+    top: -8px;
+}
+.last-treat-big-name-box {
+    display: inline-block;
+    
 }
-
 

src/components/Treat/DrugHistory/LastDrug/index.jsx

@@ -15,9 +15,10 @@ class LastDrug extends Component {
         this.setDrugInfo = this.setDrugInfo.bind(this);
     }
     handleMouseEnterDrug(index, item) {
-        const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
+        const drugNameWidth = parseInt($('#'+item.id)[0].offsetWidth)
+        console.log(drugNameWidth,'drugNameWidth')
         const imgLeft = drugNameWidth/2-8
-        $('#'+item.medicitionName).find('img').css('left', imgLeft)
+        $('#'+item.id).find('img').css('left', imgLeft)
         this.setState({
             currentIndex: index,
         })
@@ -39,7 +40,7 @@ class LastDrug extends Component {
     }
     setDrugInfo(item) {
         const { setDrugInfo } = this.props;
-        setDrugInfo && setDrugInfo(item);
+        setDrugInfo && setDrugInfo(item,8,5);
     }
 
 
@@ -48,13 +49,13 @@ class LastDrug extends Component {
         const  { currentIndex, hasEnterImg } = this.state
         return(
              <div className={style['last-common-box']}>
-                <div className={style['last-common-title']}>{title}</div>
+                <div className={style['last-common-title']}>{title}:</div>
                 <div className={style['last-common-list']}>
                     {lastDrugList.map((item, index) => {
                         return<span
                             onMouseEnter={this.handleMouseEnterDrug.bind(this, index, item)}
                             onMouseLeave = {this.handleMouseLeaveDrug}
-                            id={item.medicitionName}
+                            id={item.id}
                             className={style['last-common-warpper']}
                             > 
                             {item.medicitionName} 

src/components/Treat/DrugHistory/LastDrug/index.less

@@ -1,14 +1,22 @@
+.last-common-box {
+    border-bottom: 1px dotted  #D2D2D2;
+    line-height: 36px;
+}
+
 .last-common-title {
-    height: 30px;
-    line-height: 30px;
+    height: 36px;
+    line-height: 36px;
+    float: left;
+    margin: 0 15px 0 0;
 }
 .last-common-warpper {
     position: relative;
-    margin: 0 20px 0 0
+    margin: 0 20px 0 0;
+    display: inline-block;
 }
 .info-img {
     position: absolute;
     width: 15px;
     position: absolute;
-    top: -15px;
+    top: -8px;
 }

src/components/Treat/DrugTreat/index.jsx

@@ -58,7 +58,7 @@ class DrugTreat extends Component {
     }
     setDrugInfo(item) {
         const { setDrugInfo } = this.props;
-        setDrugInfo && setDrugInfo(item);
+        setDrugInfo && setDrugInfo(item, 8, 5);
     }
     getImg() {
     }
@@ -74,16 +74,13 @@ class DrugTreat extends Component {
         const drugIdList = this.state.drugIdList.split(' ')
         setDrugInfoMore({drugIdList: drugIdList})
         showDrugInfo && showDrugInfo();
-
     }
+    
     showTreatDesc() {
         $('#treatDescBox').css({'display': 'block'});
         $('#treatWrapper').animate({'margin-left': '-471px','left':'50%'}, 300);
         $('#treatDescBox').animate({'width': '260px'}, 500);
-        
     }
-    
-
 
     render(){
         const { treatment,showDrugInfo } = this.props

src/components/Treat/DrugTreat/index.less

@@ -1,3 +1,6 @@
+.drug-box {
+    padding: 10px 0 0 0;
+}
 .drug-title{
     background: #EAF7FA;
     height: 36px;

src/components/Treat/FollowUp/Textarea/index.less

@@ -5,4 +5,5 @@
     min-width: 30px;
     text-align: center;
     margin-right: 5px;
+    line-height: 20px
 }

src/components/Treat/FollowUp/index.jsx

@@ -23,8 +23,7 @@ class FollowUp extends Component {
                     <div className={style['general-title-box']} style={titleStyle}></div>
                     <div className={style['general-title']} ><img className={style['general-icon']} src={icon}/>{title}</div>
                 </div>}
-                
-                <div style={textStyle}>
+                <div className={noHeader?'':style['follow-up-box']} style={textStyle}>
                     {noTitle?'': '回访时间：'}<Textarea value={followUp} handleInputFollowUp={this.handleInputFollowUp} isRead={isRead}></Textarea>后回访，不适随诊
                 </div>
             </div>

src/components/Treat/FollowUp/index.less

@@ -23,4 +23,7 @@
     float: left;
     margin: 10px;
 }
-
+.follow-up-box {
+    border-bottom: 1px dotted  #D2D2D2;
+    line-height: 36px;
+}

src/components/Treat/index.jsx

@@ -95,7 +95,9 @@ class Treat extends Component {
                             titleStyle={{background:'#C72F2F',opacity:'0.1', filter:'alpha(opacity=10);',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=10);'}} 
                             title='不良反应' 
                             adversReactionList = {adversReactionList} 
-                            changeReact = {changeReact}>
+                            changeReact = {changeReact}
+                            showDrugInfo = {showDrugInfo} 
+                            setDrugInfo={ setDrugInfo }>
                         </AdverseReactions>}
                         <DrugTreat treatment={ treatment } 
                                 selectDrug={selectDrug} 

src/components/TreatDesc/index.jsx

@@ -99,7 +99,7 @@ class TreatDesc extends Component {
                                 src={currentIndex === index ?  (hasEnterImg ? info3 : info2) : info2} 
                                 onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
                                 onMouseLeave = {this.handleMouseLeaveImg}
-                                onClick={() =>{setDrugInfo(item);showDrugInfo();}}
+                                onClick={() =>{setDrugInfo(item,8,5);showDrugInfo();}}
                                 />}
                         </span>              
                         
@@ -107,7 +107,7 @@ class TreatDesc extends Component {
                             src={currentIndex === index ? info1 : info} 
                             onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
                             onMouseLeave = {this.handleMouseLeaveImg}
-                            onClick={() =>{setDrugInfo(item);showDrugInfo();}}/>} */}
+                            onClick={() =>{setDrugInfo(item,8,5);showDrugInfo();}}/>} */}
                         {item.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: item.forbidden === '2' ? <span className={style['info-flag']} style={{opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)',border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''},
                         <span  style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=30)'} : ''}> 使用率{item.rate}</span>
                         

src/containers/Treat.js

@@ -50,8 +50,8 @@ function mapDispatchToProps(dispatch) {
             //推荐依据不展示
             // dispatch(getRecommendBasic(item))
         },
-        setDrugInfo: (item) => {
-            dispatch(getInstroduce(item));
+        setDrugInfo: (item, type, position) => {
+            dispatch(getInstroduce(item, type, position));
         },
         hideTreat: () => {
             dispatch({

src/store/async-actions/fetchModules.js

@@ -315,6 +315,8 @@ export function autoFillModules (){
   return (dispatch,getStore)=>{
     const state = getStore();
     const initData = state.homePage.initData;
+    const block = Object.assign(JSON.parse(config.textLabel),{full:true});
+    const cbody = initData.checkbody?[...initData.checkbody]:[block];
     dispatch({type: CURRENT_CHRONIC})//现病史
     //其他史模板填充-先去历史，无历史用模板
     inspectAndAssist()//化验辅检
@@ -322,7 +324,7 @@ export function autoFillModules (){
     //查体模板填充
     dispatch({
       type: SET,
-      data: [...initData.checkbody],
+      data: cbody,
       isEmpty:false
     });
   }

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)

src/store/async-actions/treat.js

@@ -299,14 +299,14 @@ export const setAllFollowUp = (item) => {
     }
 }
 
-export const getInstroduce = (item)=>{
+export const getInstroduce = (item, type, position)=>{
 
     return (dispatch, getState) =>{
         const url = '/introduceInfo/getByQuestionId';
         const params = {
             questionId: item.id,
-            type: 8,
-            position: 5
+            type: type,
+            position: position
         }
         json(url, params)
         .then((data)=>{
@@ -314,7 +314,7 @@ export const getInstroduce = (item)=>{
                     dispatch({
                         type: SET_DRUG_INFO,
                         instroduce: data.data.data.introduceDetailList,
-                        name: item.medicitionName
+                        name: type ==8 ?item.medicitionName : type == 10 ? item.tagName : ''
                     })
                 } else {
                     dispatch({

src/utils/tools.js

@@ -772,11 +772,11 @@ function getPageLength(event) {     //兼容ie8获取页面距离左和上的距
   return page;
 }
 function dragBox(domWrap,domDrag){
-  console.log(domWrap,domDrag,'拖拽')
+  // console.log(domWrap,domDrag,'拖拽')
   let drag = document.getElementById(domDrag);//拖拽区域
   let wrap = document.getElementById(domWrap);//被拖拽的元素
   let wrapHeight = wrap.offsetHeight;//被拖拽的元素高度
-  let wrapWidth = wrap.offsetWidth;//被拖拽的元素高度
+  let wrapWidth = wrap.offsetWidth;//被拖拽的元素宽度
   let width = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;//屏幕宽度
   let height = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;//屏幕高度
   let mouseX = 0,mouseY = 0,dragX = 0,dragY = 0,isDrag = false,isMove = false;
@@ -797,14 +797,15 @@ function dragBox(domWrap,domDrag){
     // }
     isDrag = false
     return false
-  },drag)
+  },document)
 
   function handleMove(event){      //移动的
     let dragDes = document.getElementById('treatDescBox');//展開区域
     let page = getPageLength(event);
     let maxDragX = 0,dragDesWidth = 0;
     let maxDragY = height - wrapHeight;//最大可拖拽y方向距离
-
+    wrapHeight = wrap.offsetHeight;
+    wrapWidth = wrap.offsetWidth;
     if(domDrag == 'dragTreatTitle'){//最大可推拽x方向距离
       if(dragDes != null){
         dragDesWidth = dragDes.offsetWidth
@@ -829,6 +830,7 @@ function dragBox(domWrap,domDrag){
           dragX = maxDragX
         }
       }else{
+        // console.log(width,dragX,maxDragX,wrapWidth)
         if(width-dragX < wrapWidth){    //不能超出右边界
           dragX = maxDragX
         }