Squashed commit of the following:

commit 2ee6ba8b86b835e759429f811ca4d7ee7c073f26
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 17:07:34 2019 +0800

    右侧推送放开

commit 65f81b639d8581348d50885584197e18f643536f
Merge: 4011f28 a2f09ac
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 17:05:06 2019 +0800

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

commit 4011f28c7f66f79d14ace47ce32e459bb7edde64
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 17:04:57 2019 +0800

    计算按钮显示字段修改

commit a2f09ac4de68c23433a43db3dda66e489f7b555c
Merge: 74e4f37 50a207d
Author: Luolei <16657115156@163.com>
Date:   Mon May 6 17:03:14 2019 +0800

    Merge branch 'Chronic-ll' into ChronicMag

commit 50a207dc27beb237197ca553421b4f44e377ee68
Author: Luolei <16657115156@163.com>
Date:   Mon May 6 17:02:36 2019 +0800

    保存日期修改

commit 74e4f373155c043eccd0b142a1c1039a38e2a254
Merge: 4d13996 af6ea4c
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon May 6 16:49:28 2019 +0800

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

commit 4d13996993605eea3f5e7638c58acf9085645293
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon May 6 16:49:09 2019 +0800

    修改慢病用药和普通病用药顺序

src/components/PushItems/index.jsx

@@ -410,7 +410,8 @@ class PushItems extends Component {
                 )}
               </div>
             </div>
-            {chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}
+            {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
+            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
             <div className={style["tips"]}>
               <h1>
                 <img src={tipsImg} />

src/components/ScaleTable/index.jsx

@@ -294,7 +294,7 @@ class ScaleTable extends React.Component{
               }else{
                 return <div className={style['textContent']}>
                   {this.getContent()}
-                  {datas&&datas.noCalc==0?<div className={style['total']}>
+                  {datas&&datas.Calc==1?<div className={style['total']}>
                     <span>总分：</span>
                     <span>{scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ scaleResult.calcalculate.result.text||''}</span>
                     <span className={style['totalBtn']} onClick={this.handleFormula}>得分</span>

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

@@ -16,7 +16,6 @@ class LastDrug extends Component {
     }
     handleMouseEnterDrug(index, item) {
         const drugNameWidth = parseInt($('#'+item.id)[0].offsetWidth)
-        console.log(drugNameWidth,'drugNameWidth')
         const imgLeft = drugNameWidth/2-8
         $('#'+item.id).find('img').css('left', imgLeft)
         this.setState({

src/components/Treat/DrugHistory/index.jsx

@@ -21,8 +21,8 @@ class DrugHistory extends Component {
             <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>
-                {drugHistory['慢病用药内容'] && drugHistory['慢病用药内容'].length > 0 && <LastDrug title='普通病用药内容' lastDrugList = {drugHistory['慢病用药内容']}  showDrugInfo={showDrugInfo} setDrugInfo={setDrugInfo}></LastDrug>}
-                {drugHistory['普通病用药内容'] &&drugHistory['普通病用药内容'].length > 0 && <LastDrug title='慢病用药内容' lastDrugList = {drugHistory['普通病用药内容']}  showDrugInfo={showDrugInfo} setDrugInfo={setDrugInfo}></LastDrug>}
+                {drugHistory['普通病用药内容'] && drugHistory['普通病用药内容'].length > 0 && <LastDrug title='普通病用药内容' lastDrugList = {drugHistory['普通病用药内容']}  showDrugInfo={showDrugInfo} setDrugInfo={setDrugInfo}></LastDrug>}
+                {drugHistory['慢病用药内容'] &&drugHistory['慢病用药内容'].length > 0 && <LastDrug title='慢病用药内容' lastDrugList = {drugHistory['慢病用药内容']}  showDrugInfo={showDrugInfo} setDrugInfo={setDrugInfo}></LastDrug>}
             </div>
         )
     }

src/components/Treat/index.jsx

@@ -83,7 +83,6 @@ class Treat extends Component {
                                     onInput = {this.handleInputFollowUp}>
                                 {followUp}</span>后回访，不适随诊
                         </div>} */}
-                        {console.log('222222', drugHistory)}
                         { drugHistory && (drugHistory['慢病用药内容'] && drugHistory['慢病用药内容'].length > 0 || drugHistory['普通病用药内容'] && drugHistory['普通病用药内容'].length > 0) &&<DrugHistory icon={drugIcon} 
                             titleStyle={{background:'#EAF7FA',opacity:'1', filter:'alpha(opacity=100);',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=100);'}}
                             title='上次用药情况' 

src/store/async-actions/print.js

@@ -122,7 +122,7 @@ function transferIndexData(data) {
    data.map((it)=>{
        if(it.uniqueName&&it.value!=''){
            arr.push({
-             creatTime:it.time,
+             creatTime:it.time+':00',
              indexUnique:it.uniqueName,
              indexUnit:it.units,
              indexValue:it.value,