Jelajahi Sumber

Squashed commit of the following:

commit 735ceb5b6e41f5d9827d00c1614cc789337c0856
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 17:34:06 2019 +0800

    时间单位组件调整;互斥项字数限制放开

commit e324be3ce5df64ecfa5d27ac4f04bba1c22daf09
Merge: eb0c3bd 4ed0ac1
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 17:28:13 2019 +0800

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

commit eb0c3bd779ac70caf4add125c98d129559c33ced
Merge: ae5da2b c854616
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 14:52:58 2019 +0800

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

commit ae5da2b44f4e3fa24aa7d8d3cd727139c00eb6e6
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 14:52:48 2019 +0800

    引用历史病历时切换相应模式
liucf 6 tahun lalu
induk
melakukan
b484b89ad7

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

@@ -108,7 +108,7 @@ class NumberUnitPan extends Component{
           <td><span onClick={this.handleSelect}>0</span></td>
           <td><span onClick={this.handleSelect}>0</span></td>
           <td><span onClick={this.handleSelect}>~</span></td>
           <td><span onClick={this.handleSelect}>~</span></td>
           <td><span onClick={this.handleSelect}>/</span></td>
           <td><span onClick={this.handleSelect}>/</span></td>
-          <td><span onClick={this.handleSelect}>日</span></td>
+          <td onClick={(e)=>e.stopPropagation()}></td>
           <td className={style['imgN']}><img src={backspace} onClick={this.handleBack.bind(this)} /></td>
           <td className={style['imgN']}><img src={backspace} onClick={this.handleBack.bind(this)} /></td>
         </tr>
         </tr>
         <tr>
         <tr>

+ 14 - 6
src/components/DiagnosticList/index.jsx

@@ -13,6 +13,7 @@ import iconRadioDefault from '@common/images/icon-radio-default.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
 import tableIcon from '@common/images/table.png';
 import tableIcon from '@common/images/table.png';
 import { delFollowUp } from '../../store/actions/treat';
 import { delFollowUp } from '../../store/actions/treat';
+import { CONFIRM_TYPE } from "@store/types/typeConfig";
 
 
 class DiagnosticList extends Component {
 class DiagnosticList extends Component {
     constructor(props) {
     constructor(props) {
@@ -21,7 +22,8 @@ class DiagnosticList extends Component {
             visible: false,
             visible: false,
             delItem: {},
             delItem: {},
             treatTitle: '',
             treatTitle: '',
-            activeHistory: -1
+            activeHistory: -1,
+            sign:-1
         }
         }
         this.deleteItem = this.deleteItem.bind(this);
         this.deleteItem = this.deleteItem.bind(this);
         this.cancel = this.cancel.bind(this);
         this.cancel = this.cancel.bind(this);
@@ -122,6 +124,7 @@ class DiagnosticList extends Component {
     }
     }
     referCase() {
     referCase() {
         const { hideHistoryCaseModal, items ,autoFillModules,typeConfig} = this.props
         const { hideHistoryCaseModal, items ,autoFillModules,typeConfig} = this.props
+        const {sign} = this.state;
         hideHistoryCaseModal && hideHistoryCaseModal()
         hideHistoryCaseModal && hideHistoryCaseModal()
         if (this.state.activeHistory === -1 && typeConfig==0) {//没有选择历史病例直接点确定
         if (this.state.activeHistory === -1 && typeConfig==0) {//没有选择历史病例直接点确定
             Notify.info("未选择历史病历,已默认展示慢病相关内容");
             Notify.info("未选择历史病历,已默认展示慢病相关内容");
@@ -134,18 +137,22 @@ class DiagnosticList extends Component {
         let baseList = store.getState();
         let baseList = store.getState();
         
         
         let baseObj = items[this.state.activeHistory];
         let baseObj = items[this.state.activeHistory];
-  
-        // store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
+        // 切换模式
+        if(sign != typeConfig){
+          store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
+        }
         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
         this.props.getBilling();
         this.props.getBilling();
         this.setState({
         this.setState({
-            activeHistory: -1
+            activeHistory: -1,
+            sign:-1
         })
         })
     }
     }
     closeHistoryCaseModal() {
     closeHistoryCaseModal() {
         const { hideHistoryCaseModal ,autoFillModules,typeConfig} = this.props
         const { hideHistoryCaseModal ,autoFillModules,typeConfig} = this.props
         this.setState({
         this.setState({
-            activeHistory: -1
+            activeHistory: -1,
+            sign:-1
         })
         })
         hideHistoryCaseModal && hideHistoryCaseModal()
         hideHistoryCaseModal && hideHistoryCaseModal()
         if(typeConfig==0){//智能推送模式才自动填充
         if(typeConfig==0){//智能推送模式才自动填充
@@ -156,7 +163,8 @@ class DiagnosticList extends Component {
         const { handleQuoteClick } = this.props
         const { handleQuoteClick } = this.props
         // handleQuoteClick && handleQuoteClick(item)
         // handleQuoteClick && handleQuoteClick(item)
         this.setState({
         this.setState({
-            activeHistory: index
+            activeHistory: index,
+            sign:item.sign
         })
         })
     }
     }
     getHistoryCase() {
     getHistoryCase() {

+ 4 - 3
src/components/SpreadDrop/index.jsx

@@ -468,9 +468,10 @@ class ListItem extends Component{
     const pos = isSpecialPos?style['independent']:'';
     const pos = isSpecialPos?style['independent']:'';
     return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
     return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
       {datas&&datas.map((it,i)=>{
       {datas&&datas.map((it,i)=>{
-        /*return <li onClick={(e)=>this.handleClick(e,it,i)}
-                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>*/
-          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
+        if(isSpecialPos){
+          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)}>{it.name}</li>
+        }
+        return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
       })}
       })}
     </ul>;
     </ul>;
   }
   }