Merge remote-tracking branch 'origin/dev5.4.1' into dev5.4.1

src/components/AddAssistCheck/index.jsx

@@ -59,7 +59,6 @@ class AddAssistCheck extends React.Component {
             })
           }
         }
-        
       }
     });
     const that = this;
@@ -203,12 +202,6 @@ class AddAssistCheck extends React.Component {
             {
               part.map((item, idx) => {
                 return (<li className={`${styles.assistLists} ${styles.clearfix}`}>
-                  {/* <span className={styles.assistName} style={{ width: winWidth<1200?'120px':'auto' }}>
-                    <span className={styles.tagSpan}>
-                      {item.name}：
-                      <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name: item.name, position: 1, type: 6})}></span>
-                    </span>
-                  </span> */}
                   <AssistName name={item.name} winWidth={winWidth} getInfomation={getInfomation} normal={true}></AssistName>
                   <div className={`${styles.textareaWrap} ${setFontColorSize(2,1)}`}>
                     <ScrollArea speed={0.8}

src/components/AddAssistCheck/index.less

@@ -55,7 +55,7 @@
       width: 260px;
       position: absolute;
       right: 0;
-      top: 10px;
+      bottom: 10px;
       p {
         font-size: unset;
         span {
@@ -72,40 +72,22 @@
         background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAAH6ji2bAAAABGdBTUEAALGPC/xhBQAAANtJREFUOBHFU90RwiAMDj3H8FV3KQ4AxwAO5QQwgbvoY90DQ+/gUpogXj3bF/L75ctXANj7c85pY0zMPKy1U7bLmQqG4hFjwPIL8UEp9aI+UOxFotcRZ3MALEmu8I+xWoGk2VpiQqhoWneSmoXZvfWehaubsVgBoGxdxb93EekhdbVyKjWh5iNSvcUYjxJIK57WxN5rCOE+13E/scWCy2WMzLC81haTTzlkOONtf6I4KTM8SFPTWqjLicujZk/v/ZnLdV9ZrpmLiQwlBhwIjWVAjStOG6+NpsA/s99BMkpktdAgdAAAAABJRU5ErkJggg==') no-repeat;
       }
 
-      /* a {
-                img {
-                  width: 13px;
-                  height: 13px;
-                  // margin-bottom: 11px;
-                  cursor: pointer;
-                  display: inline-block;
-                  position: absolute;
-                  // right: -4px;
-                  right: 3px;
-                  top: 2px;
-                }
-            } */
-
       p {
         display: inline-block;
         margin: 0 6px;
         vertical-align: top;
-
         span {
           border-bottom: 1px dashed #333;
           box-sizing: border-box;
           margin-right: 0;
           display: inline-block;
-          // width: 140px;
         }
       }
     }
 
     .assistName {
-      // height: 20px;
-      // line-height: 20px;
       box-sizing: border-box;
-      float: left;
+      // float: left;
       position: relative;
       span {
         font-size: unset;

src/components/AddInspect/InspectName/index.jsx

@@ -0,0 +1,72 @@
+import React, { Component } from "react";
+import styles from "./index.less";
+import edit1 from "@common/images/edit1.png";
+import edit2 from "@common/images/edit2.png";
+import { normalVal, timestampToTime, getStatusImg,setFontColorSize } from '@utils/tools';
+class InspectName extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isEdit: false,
+      value:''
+    };
+    this.handleInput = this.handleInput.bind(this)
+    this.handleBlur = this.handleBlur.bind(this)
+    this.handleEdit = this.handleEdit.bind(this)
+  }
+  componentDidMount(){
+    const {item} = this.props
+    this.setState({
+      value:item.inpValue
+    })
+    this.refs.iptTip.getDOMNode().value = item.inpValue
+  }
+  handleEdit(){
+    this.setState({
+      isEdit:true
+    },()=>{
+      this.refs.iptTip.getDOMNode().focus()
+    })
+  }
+  handleBlur(){
+    let val = this.state.value
+    if (val) return
+    this.setState({
+      isEdit:false
+    })
+  }
+  handleInput(e){
+    const {setTipValue,idx} = this.props
+    this.setState({
+      value:e.target.value
+    })
+    this.props.setTipValue(idx,e.target.value)
+  }
+  render(){
+    const {item,getInfomation,idx,handleLabelSub} = this.props
+    return item.show ? <p className={styles.staticTagActive}>
+        <span className={`${styles.tagSpan} ${styles.selectTagSpan} ${setFontColorSize(2,6)}`} data-flg="current" onClick={(e)=>handleLabelSub(e,item.questionId,idx)}>
+          {item.name}
+          <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
+        </span>
+        {
+          item.inpValue||this.state.isEdit?<div className={styles.iptTipWrap}>
+            <input 
+            ref="iptTip"
+            onBlur={this.handleBlur}
+            onInput={this.handleInput}
+            className={styles.iptValue}
+            type="text"/>
+            <i></i>
+          </div>:<span className={styles.iptValueBtn} onClick={this.handleEdit}>点击备注</span>
+        }
+    </p>:
+    <p >
+        <i className={`${styles.tagSpan} ${styles.tagSpanS} ${setFontColorSize(2)}`} data-flg="current" onClick={(e)=>handleLabelSub(e,item.questionId,idx)}>
+          {item.name}
+          <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
+        </i>
+    </p>
+  }
+}
+export default InspectName;

src/components/AddInspect/InspectName/index.less

@@ -0,0 +1,246 @@
+@import "~@less/variables.less";
+.slideLi {
+    // cursor: pointer;
+    // color: #767676;
+    position: relative;
+    padding: 10px 0px 10px 0;
+    border-bottom:1px dashed #989DA3;
+    margin-top: 5px;
+    i {
+        font-style: normal;
+        display: inline-block;
+        vertical-align: top;
+        padding-top: 3px;
+        &:before {
+            content: '\300C';
+        }
+        &:after {
+            content: '\300D';
+        }
+    }  
+    &>p {
+        cursor: pointer;
+        color: #767676;
+        display: inline-block;
+        position: relative;
+        vertical-align: top;
+    } 
+    .partDel {
+        width: 15px;
+        height: 15px;
+        margin-bottom: 11px;
+        cursor: pointer;
+        display: inline-block;
+        position: absolute;
+        right: -4px;
+        top: 0px;
+        background: @closeIcon;
+        background-color: #fff;
+        background-size: 100% 100%;
+    }
+}
+.slideLi:hover{
+    background:#F2F2F2;
+    border-radius: 4px;
+       .partDel{
+        background: @closeHor;
+        background-color: #fff;
+        background-size: 100% 100%;
+      } 
+}
+.staticTagActive {
+    cursor: pointer;
+    color: #333;
+    // display: inline-block;
+    position: relative;
+    vertical-align: top;
+    padding: 2px 10px 10px 10px;
+    box-sizing: border-box;
+    width: 100%;
+    float: left;
+    span {
+        border-bottom: 1px solid #666666 ;
+    }
+}
+
+.staticTag {
+    cursor: pointer;
+    // color: #767676;
+    color: @blue;
+    padding-top: 10px;
+    display: inline-block;
+    position: relative;
+    /* &:before {
+        content: '\300C';
+    }
+    &:after {
+        content: '\300D';
+    } */
+}
+.table {
+    color: #000;
+    width: 100%;
+    tr {
+        line-height: 18px;
+        height: 18px;
+        width: 100%;
+        font-size: unset;
+        td {
+          cursor: default;
+          padding-top: 3px;
+          font-size: unset;
+          span {
+              font-size: unset;
+          }
+        }
+    }
+    tr > td {
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
+}
+
+.searchResult {
+    .searchResultT {
+        img {
+            float: right;
+        }
+    }
+}
+
+.excelDataLists {
+    position: relative;
+    background-color: #f1f1f1;
+    border: 1px solid #ccc;
+    .close {
+        width: 13px;
+        height: 13px;
+        position: absolute;
+        top: -5px;
+        right: -5px;
+        z-index: 30;
+        background-color: #fff;
+        border-radius: 50%;
+    }
+    .excelDataLis {
+        padding: 2px 0px;
+        border-bottom: 1px dashed #989DA3;
+        .excelDataTitle {
+            display: inline-block;
+            width: 20%;
+            vertical-align: top;
+            padding-left: 10px;
+            float: left;
+        }
+        table {
+            width: 80%;
+            tr {
+                height: 16px;
+                line-height: 16px;
+                width: 100%;
+            }
+            td {
+                text-align: left;
+                padding-top: 6px;
+                cursor: default;
+            }
+            .excelUnit {
+                width: auto;
+                margin-left: 5px;
+            }
+        }
+    }
+}
+.center {
+    text-align: center;
+    font-size: 16px;
+    padding-top: 10px;
+    padding-bottom: 50px;
+}
+.slides {
+  background-color: #EDEDED;
+  text-align: center;
+  height: 28px;
+  line-height: 28px;
+  margin: 10px 0 8px 0;
+  cursor: pointer;
+  span {
+    color:#7d7d7d;
+  }
+  img{
+    vertical-align: middle;
+  }
+  .num {
+    color: @blue;
+  }
+}
+.imgInfo {
+  position: relative;
+}
+.imgInfo, .imgInfo1 {
+  width: 15px;
+  height: 17px;
+  border-bottom: 0 none !important;
+  background: url('../img/info2.png') no-repeat center center;
+  background-size: 100% auto; 
+  position: absolute;
+  top: -10px;
+  left: 50%;
+  margin-left: -8px;
+  display: none;
+  cursor: pointer;
+}
+.imgInfo1 {
+    top: -13px;
+  }
+  .imgInfo:hover, .imgInfo1:hover {
+    background: url('../img/info3.png') no-repeat center center;
+    background-size: 100% auto; 
+  }
+.tagSpan {
+  display: inline-block;
+  position: relative;
+}
+.tagSpanS {
+    font-weight: bold;
+    color: #000;
+}
+.selectTagSpan {
+  color: #000;
+  font-weight: bold;
+}
+.tagSpan:hover {
+    .imgInfo, .imgInfo1 {
+        display: block;
+      }
+}
+.iptValue {
+    width: 60px;
+    color: #3B9ED0;
+    font-size: 12px;
+    margin-left: 10px;
+    background-color: #EDF8FF;
+    padding: 0 3px;
+}
+.iptValueBtn {
+    color: #3B9ED0;
+    width: 60px;
+    height: 22px;
+    line-height: 22px;
+    background-color: #EDF8FF;
+    text-align: center;
+    display: inline-block;
+    font-size: 12px;
+    border-radius: 4px;
+    border-bottom: 0 !important;
+    margin-left: 10px;
+}
+.iptTipWrap {
+    display: inline-block;
+    i {
+        display: inline-block;
+        width: 10px;
+        height: 10px;
+        background: url('../../../common/images/edit1.png') no-repeat;
+    }
+}

src/components/AddInspect/SlideExcel/index.less

@@ -41,7 +41,7 @@
 
 .table {
   color: #000;
-  width: 80%;
+  width: 100%;
   // display: inline-block;
   tr {
     line-height: 18px;
@@ -102,15 +102,14 @@
     padding: 2px 0px;
     border-bottom: 1px dashed #989DA3;
     .excelDataTitle {
-        display: inline-block;
-        width: 20%;
+        width: 100%;
         vertical-align: top;
         padding-left: 10px;
         float: left;
         color: #000;
     }
     table {
-        width: 80%;
+        width: 100%;
         tr {
             height: 16px;
             line-height: 16px;
@@ -119,6 +118,7 @@
         td {
             text-align: left;
             padding-top: 6px;
+            padding-left: 10px;
             cursor: default;
         }
         .excelUnit {

src/components/AddInspect/SlideSelect/index.jsx

@@ -7,6 +7,7 @@ import slideDown from "@common/images/slide-down.png";
 import $ from 'jquery';
 import date1 from '../img/date1.png';
 import ScrollArea from 'react-scrollbar';
+import InspectName from '../InspectName';
 
 class SlideSelect extends Component {
   constructor(props) {
@@ -94,7 +95,7 @@ class SlideSelect extends Component {
     })*/
   }
   render() {
-    const {windowWidth,getInfomation,handleConfirm,changeActivePart,getItemList,date,item,idx,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,showToast} = this.props;
+    const {windowWidth,handleFillShow,setTipValue,setHighter,refreshScroller,getInfomation,handleConfirm,changeActivePart,getItemList,date,item,idx,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,showToast} = this.props;
     const {show,activeInd,activeName} = this.state;
     let numPlus = 0,numPlus1 = 0;
     let staticTime = {}
@@ -122,7 +123,16 @@ class SlideSelect extends Component {
     const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (
       <li key={item.questionId} className={`${styles.slideLi} clearfix`}> 
-        {
+        <InspectName 
+          item={item} 
+          handleLabelSub={this.handleLabelSub} 
+          idx={idx} 
+          getInfomation={getInfomation} 
+          refreshScroller={refreshScroller} 
+          setHighter={setHighter} 
+          setTipValue={setTipValue}
+          handleFillShow={handleFillShow}></InspectName>
+        {/* {
             // 标签，血常规。。
             item.show ?
             <p className={styles.staticTagActive}>
@@ -130,6 +140,9 @@ class SlideSelect extends Component {
                   {item.name}
                   <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </span>
+                {
+                  item.inpValue?<input className={styles.iptValue} type="text"/>:<span className={styles.iptValueBtn}>点击备注</span>
+                }
             </p>:
             <p >
                 <i className={`${styles.tagSpan} ${styles.tagSpanS} ${setFontColorSize(2)}`} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
@@ -137,7 +150,7 @@ class SlideSelect extends Component {
                   <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </i>
             </p>
-        }
+        } */}
 
         {
           item.details && item.details.map((val)=>{

src/components/AddInspect/SlideSelect/index.less

@@ -51,12 +51,12 @@
 .staticTagActive {
     cursor: pointer;
     color: #333;
-    display: inline-block;
+    // display: inline-block;
     position: relative;
     vertical-align: top;
-    padding: 2px 10px;
+    padding: 2px 10px 10px 10px;
     box-sizing: border-box;
-    width: 20%;
+    width: 100%;
     float: left;
     span {
         border-bottom: 1px solid #666666 ;
@@ -79,7 +79,7 @@
 }
 .table {
     color: #000;
-    width: 80%;
+    width: 100%;
     tr {
         line-height: 18px;
         height: 18px;
@@ -94,6 +94,10 @@
           }
         }
     }
+    tr > td {
+        padding: 0 10px;
+        box-sizing: border-box;
+    }
 }
 
 .searchResult {
@@ -209,4 +213,22 @@
     .imgInfo, .imgInfo1 {
         display: block;
       }
+}
+.iptValue {
+    width: 60px;
+    color: #3B9ED0;
+    font-size: 12px;
+}
+.iptValueBtn {
+    color: #3B9ED0;
+    width: 60px;
+    height: 22px;
+    line-height: 22px;
+    background-color: #EDF8FF;
+    text-align: center;
+    display: inline-block;
+    font-size: 12px;
+    border-radius: 4px;
+    border-bottom: 0 !important;
+    margin-left: 10px;
 }

src/components/AddInspect/index.jsx

@@ -330,7 +330,7 @@ class Inspect extends React.Component {
     }
   }
   render() {
-    const {setHighter,refreshScroller, getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, windowWidth,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const {setHighter,refreshScroller, getInfomation,setTipValue, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, windowWidth,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { tmpId, tmpIdx, id, pageTop, impId } = this.state;
 
     const contStyle={
@@ -403,6 +403,7 @@ class Inspect extends React.Component {
                   handleConfirm={handleConfirm}
                   getInfomation={getInfomation}
                   setHighter={setHighter}
+                  setTipValue={setTipValue}
                 ></SlideSelect>
               })
             }

src/components/Banner/ModeChange/index.jsx

@@ -85,8 +85,8 @@ class ModeChange extends Component {
                     <p>2、慢病模式下，该模版智能推送的设置功能不可用；</p>
                     <p>3、一般情况默认值：神清、精神可、胃纳可、睡眠可、二遍无殊、体重无明显减轻；</p>
                     <p>4、其他史默认值：既往史无殊、过敏史无殊、个人史无殊；</p>
-                    <p>5、标准字号：「字号」 展示例子；增大字号：<span className='middleFontSize simpleColor'>「字号」</span>展示例子；</p>
-                    <p>6、标准字体颜色：「颜色」 展示例子；增黑字体颜色：<span className='simpleColor'>「颜色」</span>展示例子。</p>
+                    <p>5、病历书写模块，字体大小标准为14px，增大为18px；</p>
+                    <p>6、病历书写模块，字体颜色标准为灰黑色，增黑为全黑色；</p>
                 </div>
                 {hideBtn?<div className={style['btn']} onClick={confirmType}><button>保存修改</button></div>:<div className={style['btn']} onClick={closeConfigModal}><button>&nbsp;&nbsp;关闭&nbsp;&nbsp;</button></div>}
             </div>

src/components/Banner/index.jsx

@@ -3,14 +3,18 @@ import { connect } from "react-redux";
 import style from "./index.less";
 import ReactDom from "react-dom";
 import logo from "../../common/images/logoa.png";
+import prec from "../../common/images/prec.png";
 import setup from "../../common/images/setup.png";
 import emergIcon from '../../common/images/emergency.png'
 import {Notify} from '@commonComp';
 import Emergency from '@containers/Emergency';
+import PreInIcss from '@containers/PreInIcss';
 import {getAllHis} from '@store/async-actions/fetchModules.js';
 import {timestampToTime,getCurrentDate} from '@utils/tools.js';
 import {dragBox} from '@utils/drag';
 import {CLEAR_COMSYMPTOMS} from '@store/types/mainSuit';
+import { GET_PREC_LIST,SET_PREC_SHOW } from "@store/types/preIcss";
+import {getPreMsg} from '@store/async-actions/preIcss';
 import ModeChange from './ModeChange'
 
 class Banner extends Component {
@@ -103,7 +107,7 @@ class Banner extends Component {
     dragBox('previewWrapper','previewStatic','del')    
   }
   render() {
-    const {visible,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther} = this.props;
+    const {visible,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show} = this.props;
     const {emergencyBox} = this.state;
     const {showConfigModal, changeType, confirmType} = this;
     const domNode = document.getElementById('root');
@@ -117,9 +121,13 @@ class Banner extends Component {
                       <img className={`${style["st"]} ${style["his"]}`} src={emergIcon} />
                       本科室近期全部病历
                     </div>:''}
+          <div className={style.prec} onClick={()=>preShow(show)}>
+            <img className={style["st"]} src={prec} alt="预问诊"/>
+            <i> 预问诊信息</i>
+          </div>
           <div className={style["buon1"]} onClick={showConfigModal}>
             <img className={style["st"]} src={setup} />
-            设置
+            <i> 设置</i>
           </div>
         </div>
         {visible&& <ModeChange
@@ -137,7 +145,7 @@ class Banner extends Component {
             </div>
           </React.Fragment>
           , domNode):''}
-        
+        {show?<PreInIcss></PreInIcss>:null}
       </div>
     );
   }
@@ -148,7 +156,8 @@ const mapStateToProps = function(state){
   const {message} = state.patInfo;
   return {
     ifShow:sysConfig.general_show,
-    deptName:message.selfDeptName
+    deptName:message.selfDeptName,
+    show:state.preIcss.preShow
   }
 }
 
@@ -162,7 +171,9 @@ const mapDispatchToProps = function(dispatch){
         type: CLEAR_COMSYMPTOMS
       })
     },
+    preShow(show){
+      show?dispatch({type:SET_PREC_SHOW}):getPreMsg()
+    }
   }
 }
-// export default Banner;
 export default connect(mapStateToProps,mapDispatchToProps)(Banner);

src/components/Banner/index.less

@@ -35,6 +35,16 @@
           cursor: pointer;
           margin-left: 10px;
         }
+        .prec {
+          display: inline-block;
+          margin-right: 20px;
+          cursor: pointer;
+        }
+        i {
+          position: relative;
+          top: 1px;
+          font-weight: bold;
+        }
     }
     .st{
         margin: 9px 2px 10px 10px;

src/components/InfoTitle/index.jsx

@@ -3,7 +3,7 @@ import PatInfoContainer from '@containers/PatInfoContainer.js';
 import style from "./index.less";
 import { connect } from 'react-redux';
 import historyCase from '@common/images/history.png';
-import health from '@common/images/prec.png'
+import health from '@common/images/health.png'
 import store from '@store';
 import { showHistory } from '@store/actions/historyTemplates';
 import { initItemList,setInitHistory } from '@store/async-actions/historyTemplates';
@@ -59,7 +59,7 @@ class InfoTitle extends Component {
                     <span><img src={historyCase} />&nbsp;历史病历</span>
                 </div>
                 <div className={style["health"]} >
-                    <span><img src={health} />&nbsp;预问诊信息</span>
+                    <span><img src={health} />&nbsp;健康档案</span>
                 </div>
             </div>
             <HistoryCases></HistoryCases>

src/components/InfoTitle/index.less

@@ -43,10 +43,10 @@
   }
 }
 .health{
-    // opacity: 0.3;
-    // color: rgba(0,0,0,0.6);
-    // filter:alpha(opacity=30);
-    // -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
+    opacity: 0.3;
+    color: rgba(0,0,0,0.6);
+    filter:alpha(opacity=30);
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
 }
 .font{
   font-size: 13px;

src/components/Inspect/index.jsx

@@ -208,7 +208,7 @@ class Inspect extends React.Component {
 
   }
   render() {
-    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
+    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth,setTipValue, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
     const { ieVersion, isIE, hide,importLis } = this.state;
     const { checkSystemIpt, onClose,handleBindFileApi,closeInIcss,showSlideImport } = this;
     if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
@@ -286,6 +286,7 @@ class Inspect extends React.Component {
               inspectVal={inspectVal}
               windowHeight={windowHeight}
               windowWidth={windowWidth}
+              setTipValue={setTipValue}
             >
             </AddInspect>
           </div>

src/components/PreInIcss/RotateImg/index.jsx

@@ -0,0 +1,40 @@
+import React, { Component } from "react";
+import style from "../index.less";
+import down from "@common/images/show.png";
+import ReactDom from "react-dom";
+
+class RotateImg extends Component {
+  constructor(props){
+    super(props);
+    this.state={
+      de:0
+    }
+  }
+  componentDidMount() {
+    setTimeout(() => {
+
+    }, 0);
+  }
+  xunzhaun(flg){
+    console.log(this.refs.rotateImg.getDOMNode())
+    let de = this.state.de;
+    if(flg){
+        de = de-90
+    }else{
+        de = de-0+90
+    }
+    de=parseInt(de)
+    // $("#img_id").css("transform", "translateX(-50%) translateY(-50%) rotate(" + de + "deg)" );
+    // $("#img_id").attr("de", de);
+  }
+  render() {
+    const { src } = this.props;
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(<div className={style.preImgWrap}>
+      <img className={style.rotateImg} src={src} ref="rotateImg" alt=""/>
+      <img className={style.rotate} src={down} alt="图片旋转"/>
+    </div>,domNode)
+  }
+}
+
+export default RotateImg;

src/components/PreInIcss/SliddleTgl/index.jsx

@@ -0,0 +1,76 @@
+import React, { Component } from "react";
+import RotateImg from "../RotateImg";
+import style from "../index.less";
+import mimi from '@common/images/mimi.png';
+import down from "@common/images/show.png";
+import up from "@common/images/close.png";
+
+class SlideTgl extends Component {
+  constructor(props){
+    super(props);
+    this.state={
+      height:"",
+      slide:false,//展开收起显示隐藏
+      slideToggle:false,
+      text:'展开',
+      tgl:true,//展开收起文本设置
+      src:''
+    }
+    this.slideDown = this.slideDown.bind(this)
+    this.prePrecImg = this.prePrecImg .bind(this)
+  }
+  componentDidMount() {
+    setTimeout(() => {
+      let height = this.refs.current.getDOMNode().offsetHeight;
+      this.setState({
+        height:height,
+        slide:height>24?true:false,
+        slideToggle:height>24?true:false,
+      })
+    }, 0);
+  }
+  slideDown(flg){
+    this.setState({
+      tgl:flg,
+      slide:flg
+    })
+  }
+  prePrecImg(src){
+    this.setState({
+      src
+    })
+  }
+  render() {
+    const { item,showPre } = this.props;
+    return <li>
+    <div className={style.current} ref="current" style={{height:this.state.slide?'18px':'auto'}}>
+      <p className={style.curStyle}><span>现病史：</span>{item.detail.xbs}</p>
+      {item.detail.qts?<div className={style.slideTgl}><span>其他史：</span>{item.detail.qts}</div>:null}
+      {item.detail.supplement?<div className={style.slideTgl}><span>补充内容：</span>{item.detail.supplement}</div>:null}
+      {item.detail.imageList?<p className={style.last}>最近一次报告：</p>:null}
+      {item.detail.imageList?<div className={`${style.preImg} clearfix`}>
+        {
+          item.detail.imageList.map((part,idx)=>{
+            return <div className={style.img}>
+              <img className={style.report} src={part.originalImage} alt=""/>
+              <img className={style.mimi} onClick={()=>this.prePrecImg(part.originalImage)} src={mimi} alt=""/>
+            </div>
+          })
+        }
+      </div>:null}
+      {this.state.slideToggle&&!this.state.slide?<p className={style.slidesx} onClick={()=>this.slideDown(true)}>
+        收起
+        <img src={up} alt="收起"/>  
+      </p>:null}
+    </div>
+      {this.state.slideToggle&&this.state.slide?<p className={style.slidesx} onClick={()=>{this.slideDown(false)}}>
+        展开
+        <img src={down} alt="展开"/>
+      </p>:null}
+      <div className={style.pushPre} onClick={()=>showPre(item.detail)}>引用</div>
+      {/* {this.state.src?<RotateImg src={this.state.src}></RotateImg>:null} */}
+  </li>
+  }
+}
+
+export default SlideTgl;

src/components/PreInIcss/index.jsx

@@ -0,0 +1,38 @@
+import React, { Component } from "react";
+import ReactDom from "react-dom";
+import style from "./index.less";
+import close from '@common/images/icon_close.png';
+import SlideTgl from "./SliddleTgl";
+
+class PreIcss extends Component {
+  constructor(props){
+    super(props)
+  }
+  render() {
+    const { show,data,windowHeight,showPreModal,showPre } = this.props;
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(<div className={style['preInIcss']}>
+      <div className={style.title}>
+          <span>患者预问诊信息</span>
+          <img src={close} alt="关闭" onClick={showPreModal}/>
+        </div>
+      <div className={style.scrollWrap} style={{height:windowHeight-100+'px'}}>
+        {
+          data.map((item,index)=>{
+            return <div className={style.mainPre}>
+              <ul>
+                <li><span>预问诊录入时间：</span>{item.gmtCreate}</li>
+                <li><span>录入选择医院：</span>{item.sonHospitalName?item.sonHospitalName:item.hospitalName}</li>
+                <li><span>科室：</span>{item.hospitalDeptName}</li>
+                <li><span>主诉：</span>{item.detail.chiefComplaint}</li>
+                <SlideTgl showPre={showPre} item={item}></SlideTgl>
+              </ul>
+            </div>
+          })
+        }
+      </div>
+    </div>,domNode)
+  }
+}
+
+export default PreIcss;

src/components/PreInIcss/index.less

@@ -0,0 +1,126 @@
+.preInIcss {
+  z-index: 20;
+  position: fixed;
+  top: 50px;
+  bottom: 10px;
+  width: 450px;
+  right: 10px;
+  background-color: #fff;
+  overflow: hidden;
+  .scrollWrap {
+    overflow: auto;
+    height: 100%;
+    padding-bottom: 30px;
+  }
+  .title {
+    height: 40px;
+    line-height: 40px;
+    position: relative;
+    padding-left: 20px;
+    border-bottom: 1px solid #979797;
+    span {
+      font-size: 16px;
+    }
+    img {
+      position: absolute;
+      right: 10px;
+      top: 8px;
+      cursor: pointer;
+    }
+  }
+  .mainPre {
+    padding: 15px 20px 15px 20px;
+    font-size: 14px;
+    border-bottom: 5px solid #f5f5f5;
+    li {
+      // line-height: 18px;
+      padding: 5px 0;
+      span {
+        color: #000;
+        font-weight: bold;
+      }
+      .current {
+        // height: 24px;
+        overflow: hidden;
+      }
+      .curStyle {
+        padding: 0 0 5px 0;
+      }
+      .slideTgl {
+        line-height: 18px;
+        padding: 5px 0;
+      }
+      .last {
+        font-weight: bold;
+        line-height: 18px;
+        padding: 5px 0;
+      }
+      .preImg {
+        .img {
+          width: 120px;
+          height: 145px;
+          float: left;
+          margin-right: 10px;
+          margin-top: 10px;
+          border: 1px solid #ccc;
+          overflow: hidden;
+          position: relative;
+          .report {
+            width: 100%;
+          }
+          .mimi {
+            position: absolute;
+            bottom: 8px;
+            right: 8px;
+            width: 15px;
+            cursor: pointer;
+          }
+        }
+        .img:nth-child(3n+3){
+          margin-right: 0;
+        }
+      }
+    }
+  }
+  .slidesx {
+    cursor: pointer;
+    color: #58ACD7;
+    text-align: right;
+    img {
+      width: 15px;
+      height: 15px;
+      position: relative;
+      top: 2px;
+    }
+  }
+  .pushPre {
+    width: 50px;
+    height: 26px;
+    line-height: 26px;
+    background-color: #3B9ED0;
+    border-radius: 4px;
+    color: #fff;
+    text-align: center;
+    font-size: 12px;
+    margin-top: 15px;
+    cursor: pointer;
+  }
+}
+.rotateImg {
+  
+}
+.rotate{
+
+}
+.preImgWrap {
+  z-index: 100;
+  position: fixed;
+  margin-left: -500px;
+  left: 50%;
+  width: 1000px;
+  top: 7%;
+  bottom: 7%;
+  height: 86%;
+  background-color: #fff;
+  overflow: hidden;
+}

src/containers/Inspect.js

@@ -15,7 +15,8 @@ import {
   delExcelLis,
   clearLabel,
   delPartItem,
-  setContext
+  setContext,
+  setTip
 } from '@store/actions/inspect';
 import {
   billing,
@@ -75,6 +76,9 @@ function mapDispatchToProps(dispatch, store) {
     delPartItem(idx) {
       dispatch(delPartItem(idx))
     },
+    setTipValue(idx,value) {
+      dispatch(setTip(idx,value))
+    },
     //右侧推送
     fetchPushInfos() {
       //调右侧推送

src/containers/PreInIcss.js

@@ -0,0 +1,39 @@
+import {connect} from 'react-redux';
+import PreInIcss from '@components/PreInIcss';
+import {getPreMsg} from '@store/async-actions/preIcss';
+import { GET_PREC_LIST,SET_PREC_SHOW } from "@store/types/preIcss";
+import {SETPRE,SETPREDATA} from "@store/types/homePage";
+
+const mapStateToProps = function(state){//console.log(state)
+  return {
+    data:state.preIcss.preData,
+    show:state.preIcss.preShow,
+    windowHeight:state.homePage.windowHeight,
+  }
+}
+
+const mapDispatchToProps = function(dispatch){
+  return {
+    showPreModal(){
+      dispatch({type:SET_PREC_SHOW})
+    },
+    showPre(detail){
+      let preIcss = {}
+      if(detail){
+        preIcss = {
+          chief:detail.chiefComplaint?new Array(detail.chiefComplaint):[],
+          current:detail.xbs?new Array(detail.xbs):[],
+          other:detail.qts?new Array(detail.qts):[],
+          checkBody:detail.supplement?detail.supplement:''
+        }
+      }
+      dispatch({type:SETPREDATA,preData:preIcss});
+      dispatch({type:SETPRE,show:true});
+    },
+    setPreData(){
+      getPreMsg()
+    }
+  }
+}
+
+export default connect(mapStateToProps,mapDispatchToProps)(PreInIcss);

src/store/actions/inspect.js

@@ -1,4 +1,4 @@
-import {SET_CONTEXT,ADD_LABEL,SEARCH_LIST,SET_LABEL,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST} from '../types/inspect';
+import {SET_CONTEXT,ADD_LABEL,SEARCH_LIST,SET_LABEL,SET_TIP,FILL_ACTIVE,FILL_ACTIVE_DETAIL,GET_EXCEL,CHECK_VALUE_IS_CHANGE,CLEAR_LABEL,RESET_LABEL,CLEAR_ALL_LABEL,DEL_PART_ITEM,DEL_EXCEL_LIST} from '../types/inspect';
 
 export const setLabel = (idx,sign) => ({          //搜索后点击选中的结果
     type:SET_LABEL,
@@ -63,3 +63,8 @@ export const setContext = (obj) => ({
     type:SET_CONTEXT,
     obj
 })
+export const setTip = (idx,value) => ({
+    type:SET_TIP,
+    idx,
+    value
+})

src/store/actions/preIcss.js

@@ -0,0 +1,12 @@
+export const getPrecList=(state,action)=>{
+  const res=Object.assign({},state);
+  res.preData = action.preData
+  return res;
+};
+
+export const setPrecShow=(state,action)=>{
+  const res=Object.assign({},state);
+  const show = res.preShow
+  res.preShow = action.preShow?action.preShow:!show
+  return res;
+};

src/store/async-actions/inspect.js

@@ -36,15 +36,11 @@ export const getSublableList = (id,idx) => {
             const data = res.data.data;
             if (data.controlType == 0) {
                 dispatch(resetLabel(data.questionMapping,data.uniqueName||''));
-            }else if(data.controlType == 1){
+            }else if(data.controlType == 1||data.controlType == 6){
                 let arr = [];
                 arr[0] = data;
                 dispatch(resetLabel(arr));
-            }else if(data.controlType == 6) {
-                let arr =[];
-                arr[0] = data;
-                dispatch(resetLabel(arr));
-            } 
+            }
         })
     }
 };

src/store/async-actions/patInfo.js

@@ -27,13 +27,13 @@ export const getPreMsg = (dispatch, getState) => {
     json(api.getPreMsgLis, {
         "hospitalCode": getUrlArgObject('hospitalId'),
         "inquiryCode":inCode,
+        "isHaveDetail":1,
         "patientCode": getUrlArgObject("patientNo"),
         "dayLimit":config.preIcss.deadline===-1?undefined:config.preIcss.deadline
     },true).then((res) => {
         const data = res.data;
         if (data.code == 0) {
             let result = data.data;
-            console.log(result)
             let preIcss = {
               chief:result.chiefComplaint?new Array(result.chiefComplaint):[],
               current:result.xbs?new Array(result.xbs):[],
@@ -95,7 +95,6 @@ export const initHistoryDetails = (dispatch) => {
         }).then((res) => {
             const data = res.data;
             let pre = baseList.homePage.sysConfig.connect_prec;
-            (pre==1)&&getPreMsg(dispatch)
             if (data.code == 0) {
                 const detail = data.data;
                 if(detail.dataJson){

src/store/async-actions/preIcss.js

@@ -0,0 +1,31 @@
+import {json} from '@utils/ajax';
+import store from '@store';
+import {getUrlArgObject} from '@utils/tools';
+import { GET_PREC_LIST,SET_PREC_SHOW } from "../types/preIcss";
+import config from '@config/index';
+
+export const getPreMsg = () => {
+  // return (dispatch) => {
+    // let baseList = getState();
+    // let state = baseList.patInfo.message;
+    const inCode = config.preIcss.recordIdVal===-1?getUrlArgObject("recordId"):config.preIcss.recordIdVal;
+    json('/api/prec/inquiryInfo/hisInquirys', {
+        "hospitalCode": getUrlArgObject('hospitalId'),
+        "inquiryCode":inCode,
+        "isHaveDetail":1,
+        "patientCode": getUrlArgObject("patientNo"),
+        "dayLimit":config.preIcss.deadline===-1?undefined:config.preIcss.deadline
+    },true).then((res) => {
+        const data = res.data;
+        if (data.code == 0) {
+            let result = data.data;
+            if(result.length > 0){
+              store.dispatch({type:SET_PREC_SHOW})
+            }
+            store.dispatch({type:GET_PREC_LIST,preData:result});
+        } else {
+            // console.log(res)
+        }
+    })
+  // }
+}

src/store/index.js

@@ -32,6 +32,7 @@ import scaleSearch from './reducers/scaleSearch';
 import emergencyHis from './reducers/emergencyHis';
 import wrapModalBody from './reducers/wrapModalBody';
 import wrapModalBodyPac from './reducers/wrapModalBodyPac';
+import preIcss from './reducers/preIcss';
 
 
 const composeEnhancers =
@@ -70,6 +71,7 @@ const rootReducer = combineReducers({
     emergencyHis,
     wrapModalBody,
     wrapModalBodyPac,
+    preIcss,
 });
 
 export default createStore(rootReducer, enhancer);

src/store/reducers/homePage.js

@@ -77,8 +77,10 @@ export default function (state=initState,action) {
       return res;
     case SETPRE:
       res.showPre = action.show;
+      return res;
     case SETPREDATA:
       res.preData = action.preData;
+      return res;
     default:
       return res;
   }

src/store/reducers/inspect.js

@@ -10,7 +10,8 @@ import {
     DEL_PART_ITEM,
     DEL_EXCEL_LIST,
     ADD_LABEL,
-    SET_CONTEXT
+    SET_CONTEXT,
+    SET_TIP
 } from '../types/inspect';
 import store from '@store';
 import { getStringPlus,  getPushLists,  getPushList} from '@utils/tools.js';
@@ -66,6 +67,7 @@ export default (state = initSearchList, action) => {
         const tempArr = newState.labelList;
         tempArr[tempArr.length-1].details = action.list;
         tempArr[tempArr.length-1].uniqueName = action.uniqueName;
+        tempArr[tempArr.length-1].inpValue = '';
         return newState;
     } 
     if (action.type == ADD_LABEL) {             //右侧推送的化验辅检项，点击开单放到左侧化验辅检的位置上
@@ -175,6 +177,16 @@ export default (state = initSearchList, action) => {
         newState.context = action.obj
         return newState;
     }
+    if (action.type == SET_TIP) {    
+        const newState = Object.assign({}, state);
+        const tempArr = newState.labelList;
+        for(let i = 0;i < tempArr.length;i++){
+            if(action.idx == i){
+                tempArr[i].inpValue=action.value
+            }
+        }
+        return newState;
+    }
     return state;
 }
 

src/store/reducers/preIcss.js

@@ -0,0 +1,17 @@
+import { GET_PREC_LIST,SET_PREC_SHOW } from "../types/preIcss";
+import {getPrecList,setPrecShow} from "../actions/preIcss";
+
+const initState = {
+  preData: [],
+  preShow: false
+};
+export default function(state = initState, action) {
+  switch (action.type) {
+    case GET_PREC_LIST:
+      return getPrecList(state, action);
+    case SET_PREC_SHOW:
+      return setPrecShow(state, action);
+    default:
+      return state;
+  }
+}

src/store/types/inspect.js

@@ -12,3 +12,4 @@ export const DEL_PART_ITEM = 'DEL_PART_ITEM';
 export const DEL_EXCEL_LIST = 'DEL_EXCEL_LIST';
 export const ADD_LABEL = 'ADD_LABEL';
 export const SET_CONTEXT = 'SET_CONTEXT';
+export const SET_TIP = 'SET_TIP';

src/store/types/preIcss.js

@@ -0,0 +1,2 @@
+export const GET_PREC_LIST = 'GET_PREC_LIST';
+export const SET_PREC_SHOW = 'SET_PREC_SHOW';

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
-const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚