소스 검색

Squashed commit of the following:

commit 59fb1802ec9957217dae1ba02cde6f2f3b273f88
Merge: 0e26d29f ae46804d
Author: liucf <liucf@zjlantone.com>
Date:   Mon Aug 12 15:09:38 2019 +0800

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

commit 0e26d29f316fbb379c0fca04d3615c1dc001d1a2
Author: liucf <liucf@zjlantone.com>
Date:   Mon Aug 12 15:09:27 2019 +0800

    时间单位组件1886,现病史子模板保存2010
liucf 5 년 전
부모
커밋
a62701df76
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/common/components/NumberUnitPan/index.jsx
  2. 1 1
      src/utils/tools.js

+ 1 - 1
src/common/components/NumberUnitPan/index.jsx

@@ -77,7 +77,7 @@ class NumberUnitPan extends Component{
   render(){
     const domNode = document.getElementById('root');
     return ReactDom.createPortal( 
-      <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} style={this.getStyle()}>
+      <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} onDoubleClick={(e)=>e.stopPropagation()} style={this.getStyle()}>
         <table className={style['pan']} >
         <tr>
           <td><span onClick={this.handleSelect}>1</span></td>

+ 1 - 1
src/utils/tools.js

@@ -182,7 +182,7 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
     jsonData.isFirstMainDiag = baseList.treat.isFirstMainDiag;      //治疗方案
     jsonData.mainReadSonM = baseList.mainSuit.addSmoduleData;      //主诉-子模板
-    jsonData.currReadSonM = baseList.currentIll.currReadSonM;      //现病史-子模板
+    jsonData.currReadSonM = baseList.currentIll.processModule;      //现病史-子模板
     // console.log(jsonData,'结构化数据获取')
     return jsonData;
 }