Merge branch 'dev5.3.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.1

src/components/DiagnosticList/index.jsx

@@ -9,7 +9,7 @@ import {ConfirmModal, Message,ComplexModal,Footer,Loading} from '@commonComp';
 import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
 import store from '@store';
-import { initItemList ,setInitHistory} from '@store/async-actions/historyTemplates';
+import { initItemList ,setInitHistory,getHistempDetail} from '@store/async-actions/historyTemplates';
 import { pushAllDataList,inspectAndAssist ,deepClone} from '@utils/tools';
 import { dragBox } from '@utils/drag';
 import iconRadioDefault from '@common/images/icon-radio-default.png'
@@ -34,7 +34,8 @@ class DiagnosticList extends Component {
             disName:'',
             isAssessConfirm:false,
             hasOndel: false,
-            hasOnIndex: -1
+            hasOnIndex: -1,
+            activeItem:{}
         }
         this.deleteItem = this.deleteItem.bind(this);
         this.cancel = this.cancel.bind(this);
@@ -132,9 +133,9 @@ class DiagnosticList extends Component {
         autoFillModules&&autoFillModules();
 
     }
-    referCase() {
+    referCase() {//确定
         const { hideHistoryCaseModal, items ,autoFillModules,typeConfig} = this.props;
-        const {sign} = this.state;
+        const {sign,activeItem} = this.state;
         hideHistoryCaseModal && hideHistoryCaseModal()
         if (this.state.activeHistory === -1) {//没有选择历史病例直接点确定
             Notify.info("未选择历史病历，已默认展示慢病相关内容");
@@ -144,21 +145,24 @@ class DiagnosticList extends Component {
               },1000)
             return
         }
-        let baseList = store.getState();
+        // let baseList = store.getState();
         
-        let baseObj = items[this.state.activeHistory];
-        pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
+        // let baseObj = items[this.state.activeHistory];
+        // pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
+        store.dispatch(getHistempDetail(activeItem));
         this.props.getBilling();
         this.setState({
             activeHistory: -1,
-            sign:-1
+            sign:-1,
+            activeItem:{}
         })
     }
     closeHistoryCaseModal() {
         const { hideHistoryCaseModal ,autoFillModules,typeConfig} = this.props
         this.setState({
             activeHistory: -1,
-            sign:-1
+            sign:-1,
+            activeItem:{}
         })
         hideHistoryCaseModal && hideHistoryCaseModal()
         autoFillModules&&autoFillModules();
@@ -168,7 +172,8 @@ class DiagnosticList extends Component {
         // handleQuoteClick && handleQuoteClick(item)
         this.setState({
             activeHistory: index,
-            sign:item.sign
+            sign:item.sign,
+            activeItem:item
         })
     }
     getHistoryCase() {
@@ -176,7 +181,7 @@ class DiagnosticList extends Component {
         return (<div className={style['history-info']}>
             {items.map((item, index) => {
                 return<div onClick={this.handleQuoteClick.bind(this, item, index)} style={this.state.activeHistory === index ? {color: '#3B9ED0'} : ''}>
-                    <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose} {item.inquiryDate}{item.sign==0?'（智能模式）':'（文本模式）'}
+                    <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose} {item.inquiryDate}
                 </div>
             })}
         </div>)