Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

#	src/components/AddAssistCheck/index.jsx
#	src/components/AddInspect/SlidePic/index.jsx
#	src/components/AddNewInspect/SlideIpt/index.jsx

src/common/components/Textarea/index.jsx

@@ -73,7 +73,7 @@ class Textarea extends Component {
   handleInput(e){
     const {handleInput,boxMark,handlePush,value} = this.props;
     const {inpText,overFlag,editable} = this.state;
-    const text = e.target.innerText || e.target.innerHTML.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
+    const text = e.target.innerHTML.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
     const stimer = this.state.timer;//console.log(e.target,text)
     if(!editable){
       e.target.innerText='';

src/components/AddAssistCheck/Textarea/index.jsx

@@ -95,11 +95,13 @@ class Textarea extends Component {
     $(this.$dom.current).off("paste");
   }
   handleFocus(){     //ie8下提示语挡住输入框，导致输入框无法聚焦
+    this.textInput.current.previousSibling.focus();
+    console.log(111111111111, this.textInput.current);
     store.dispatch(embedPush({
       action: "pacs",
       mode: 1
     }))
-    this.textInput.current.previousSibling.focus();
+    // this.textInput.current.previousSibling.focus();
   }
   render() {
     const {idx,disabled} = this.props;

src/components/AddAssistCheck/index.less

@@ -60,6 +60,7 @@
     border-radius: 4px;
     color: #000;
     .pointerFinger {
+       border-bottom: 1px dashed #333;
       width: 260px;
       position: absolute;
       right: 0;
@@ -85,7 +86,7 @@
         margin: 0 6px;
         vertical-align: top;
         span {
-          border-bottom: 1px dashed #333;
+          // border-bottom: 1px dashed #333;
           box-sizing: border-box;
           margin-right: 0;
           display: inline-block;

src/components/AddInspect/SlidePic/index.jsx

@@ -150,7 +150,12 @@ class SlideSelect extends Component {
     //   mode: 1
     // }))
     // $('.canEdit').blur().attr('disabled','disabled')
+
     $(e.target).removeAttr('disabled').focus()
+    store.dispatch(embedPush({
+      action: "lis",
+      mode: 1
+    }))
   }
   render() {
     const {item,idx,activeIdx,activeSign} = this.props;

src/components/PatInfo/index.jsx

@@ -145,7 +145,7 @@ class PatInfo extends Component {
   // 获取焦点推送
   inputOnFocus(){
     store.dispatch(embedPush({
-      action: "patientia",
+      action: "info",
       mode: 1
     }))
   }

src/components/PreviewBody/Inspect/index.jsx

@@ -3,6 +3,7 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
+  // console.log(dataJson.labelListSmall,'dataJson.labelListSmall');
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
@@ -29,7 +30,8 @@ const PreviewInspect = (props) => {
                       {normalVal(item.minValue, item.maxValue)}
                       {/* {normalVal(3.9, 6.1)} */}
                     </td>
-                    <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time)
+                    {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
+                  <td className={style.assistTableTdFor}>{item.time == '' ?  + dateTime  :  item.time
                     }</td>
                   </tr>
                 // </table>

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -9,6 +9,7 @@ class MedicalAdvice extends Component {
     const {advice} = this.props
     // console.log(advice,'===========');
     const {labelListBig,labelListSmall,labelListBlood} = advice
+    // console.log(advice, 'advice');
     return ( 
         <tr className={style['patInfoFst']}>
           <td className={style['patInfoSec']}>医嘱：</td>

src/components/PushData/index.jsx

@@ -4,6 +4,7 @@ import arrowIcon from '@images/arrowIcon.png';
 import pushEmpty from '@images/pushEmpty.png';
 import {pushPage2} from '@utils/config';
 import {dragBox} from '@utils/drag';
+import hideConfirm from '@images/hideConfirm.png';
 
 class PushData extends Component{
     constructor(props){
@@ -46,7 +47,7 @@ class PushData extends Component{
             </div>}
             {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+20+'px'}}>
                 {/* <div id="dragModalTitle"  className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div> */}
-                <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div>
+                <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
                 {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="348" height="507"></iframe>}
                 {!hospitalId&&<div className={style['pushEmpty']}>
                         <div className={style['pushEmptyBox']}>

src/components/PushData/index.less

@@ -64,6 +64,9 @@
     height: 40px;
     padding: 0 10px;
     font-size:16px;
-    right: 10px;
+    right: 0px;
     cursor: pointer;
+}
+.hideConfirm{
+    width: 15px;
 }

src/containers/OperationContainer.js

@@ -103,6 +103,7 @@ function mapDispatchToProps(dispatch) {
     },
     clear: (flag) => {
       clearMessages();
+      // console.log('清除数据');
       // dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
       // 清除时如果是慢病模板则重新获取模板
       if (flag) {

src/store/actions/print.js

@@ -56,7 +56,7 @@ export const clearMrId = (state, action) => {
   res.mrInfo = {
     update: 0,
     mrId: '',
-    mode: '',
+    mode: 'patientia',
   };
   return res;
 };

src/store/async-actions/print.js

@@ -16,6 +16,7 @@ import {
   formatTextInfo,
   delHistoryDataList,
 } from '@utils/tools';
+import { embedPush } from '@store/async-actions/pushMessage'
 export const getConceptDetails = (bool) => {
     let baseList = store.getState();
     let isPreIcss = baseList.typeConfig.isPreIcss;
@@ -370,4 +371,9 @@ export const clearMessages = () => {
     // let whichSign = baseList.typeConfig.mode;
     // pushAllDataList(whichSign,'clear');
     delHistoryDataList()
+    // store.dispatch(embedPush({
+    //   action: "patientia",
+    //   mode: 1
+    // }))
+
 };

src/store/reducers/newAdvice.js

@@ -123,46 +123,55 @@ export default (state = initSearchList, action) => {
         return newState;
     }
 
-    if (action.type == SET_TIP_ADVICE) {    
+    if (action.type == SET_TIP_ADVICE) {   
+        console.log(action,'action'); 
         const newState = Object.assign({}, state);
         let tempArr = newState.labelListBig;
         let tempArrs = newState.labelListSmall;
         let tmpArr = newState.labelListBlood;
         let tmpLis = action.item
-        // console.log(action,1111111)
+        console.log(tmpLis,1111111)
         if(tmpLis.flg == 5){//药品
             for(let i= 0;i < tempArr.length;i++){
-                if(action.tip == i){
-                    if(action.sign == 1){//时间
-                        tempArr[i].time = action.value
-                        tempArr[i].dateValue = action.value
-                    }else{
-                        tempArr[i].value = action.value
-                    }
-                }
+                // 2020/9/9 解决医嘱时间修改 历史病历显示错误的bug,
+                // if(action.tip == i){
+                //     if(action.sign == 1){//时间
+                //         tempArr[i].time = action.value
+                //         tempArr[i].dateValue = action.value
+                //     }else{
+                //         tempArr[i].value = action.value
+                //     }
+                // }
+                tempArr[i].time = action.value
+                tempArr[i].dateValue = action.value
             }
             newState.labelListBig = [...tempArr]
         }else if(tmpLis.flg == 6){//手术
             for(let i= 0;i < tempArrs.length;i++){
-                if(action.tip == i){
-                    tempArrs[i].time = action.value
-                    tempArrs[i].dateValue = action.value
-                }
+                // if(action.tip == i){
+                //     tempArrs[i].time = action.value
+                //     tempArrs[i].dateValue = action.value
+                // }
+                tempArrs[i].time = action.value
+                tempArrs[i].dateValue = action.value
             }
             newState.labelListSmall = [...tempArrs]
         }if(tmpLis.flg == 8){//输血
             for(let i= 0;i < tmpArr.length;i++){
-                if(action.tip == i){
-                    if(action.sign == 1){
-                        tmpArr[i].time = action.value
-                        tmpArr[i].dateValue = action.value
-                    }else{
-                        tmpArr[i].value = action.value
-                    }
-                }
+                // if(action.tip == i){
+                //     if(action.sign == 1){
+                //         tmpArr[i].time = action.value
+                //         tmpArr[i].dateValue = action.value
+                //     }else{
+                //         tmpArr[i].value = action.value
+                //     }
+                // }
+                tmpArr[i].time = action.value
+                tmpArr[i].dateValue = action.value
             }
             newState.labelListBlood = [...tmpArr]
         }
+        console.log(newState,'newState');
         return newState;
     }
     if (action.type == SEARCH_TYPE_NEW) {

src/store/reducers/print.js

@@ -12,7 +12,7 @@ const initState = {
   mrInfo:{
     update:0,
     mrId:'',
-    mode: 'plan_default'
+    mode: 'patientia'
   }
 };
 export default function(state = initState, action) {

src/store/types/print.js

@@ -6,4 +6,4 @@ export const CLOSE_PREVIEW = 'CLOSE_PREVIEW';
 export const DIAG_SHOW = 'DIAG_SHOW';
 export const CLEAR_SEARCH_PARAM='CLEAR_SEARCH_PARAM';
 export const SET_MR_INFO='SET_MR_INFO';
-export const CLEAR_MR_INFO = 'CLEAR_MR_INFO';
+export const CLEAR_MR_INFO = 'CLEAR_MR_INFO';

src/utils/tools.js

@@ -38,7 +38,7 @@ import down from '@images/down.png';
 import $ from 'jquery';
 import {CLEAR_SEARCH_PARAM} from "../store/types/print";
 
-
+// import { embedPush } from '@store/async-actions/pushMessage'
 /***
  * 工具函数
  *
@@ -344,13 +344,11 @@ const delHistoryDataList = () =>{
   store.dispatch({
     type: CLEAR_MR_INFO,
   });
-
-
-
-
   store.dispatch({
     type: ISREAD,
   });
+  
+
 }