فهرست منبع

Squashed commit of the following:

commit 15882ad4de52fefdf508591d0d96ea87a30d024c
Author: liucf <liucf@zjlantone.com>
Date:   Thu Aug 29 10:20:00 2019 +0800

    删除控制台打印

commit d908f9c07e9f752e479e77fcc17c9d0e8e3937ca
Author: liucf <liucf@zjlantone.com>
Date:   Thu Aug 29 10:16:59 2019 +0800

    慢病引用历史病历修改

commit c5b58521077bccbf4652fc479ba7f48bca3d9191
Merge: b0c9723e b1ed55a1
Author: luolei <16657115156@163.com>
Date:   Thu Aug 29 09:51:52 2019 +0800

    Merge branch 'dev/new1' into dev5.3.1

commit b0c9723ed256b17c2c4fe167100604133ec08baf
Merge: 4aa679e2 86dbd8a3
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Aug 29 09:49:27 2019 +0800

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

commit 4aa679e23fdcd699454173112de1c09c0fc6caa8
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Aug 29 09:49:07 2019 +0800

    修改静态知识样式(2146)
liucf 5 سال پیش
والد
کامیت
cc3257f141

+ 7 - 1
src/common/less/base.less

@@ -49,7 +49,7 @@ button + button {
 
 html,body {
     font-size: @font-size-base; 
-    color: @B800;
+    // color: @B800;
     background: @body-bg;
 }
 :global(#root) {
@@ -64,3 +64,9 @@ html,body {
 :global(.mainsuit-box) {
     
 }
+:global(.ql-align-center) {
+    text-align: center;
+}
+:global(.ql-align-right) {
+    text-align: right;
+}

+ 16 - 11
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>)

+ 12 - 0
src/components/PushItems/TipsMsg/index.less

@@ -1,5 +1,17 @@
 @import "~@less/variables.less";
+@import "~@less/base.less";
+
 .tips{
+   ul, ol {
+     padding: 0 0 0 15px;
+   }
+   ul li {
+     list-style: disc;
+   }
+   ol li{
+    list-style: decimal;
+  }
+  
     border:1px solid #EAEDF1;
     .tips-title,h1{
       font-size: 14px;

+ 1 - 1
src/store/async-actions/pushMessage.js

@@ -5,7 +5,7 @@ import { SET_CLICK_DIAG } from '../types/diagnosticList';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import {SET_IMPORT_CHECKBODY_LABEL,PRESET} from "../types/checkBody";
 import dataLis from '@components/EmergencyProcedure/emergency';
-import { Notify} from '@commonComp';
+import  Notify from '@commonComp/Notify';
 import {pregetCheckbodyData} from '@store/async-actions/fetchModules';
 import {tabChange} from '@store/actions/tabTemplate';
 const api={

+ 1 - 1
src/utils/tools.js

@@ -289,7 +289,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
        // Notify.success('页面已清空')
     }else{
         //回读/引用设置回读模式值(主诉-其他史使用)
-        store.dispatch({type: SET_READ_MODE, readMode: whichSign});console.log(999,whichSign)
+        store.dispatch({type: SET_READ_MODE, readMode: whichSign});
         if (whichSign == 0) {
           let dataJson = JSON.parse(reData.dataJson);
           //其他史data