主诉现病史慢病处理

src/components/CurrentIll/index.jsx

@@ -153,7 +153,7 @@ class CurrentIll extends Component{
       <ItemBox title='现病史' 
       editable={editClear||data.length==0?true:false} 
       handleFocus={this.handleFocus} 
-      onchange={forbidInput?(e)=>{this.onchange(e)}:''} 
+      onchange={forbidInput?this.onchange:''} 
       handleClick={this.handleClick}
       handleBlur={this.handleBlur}>
         {data.length>0?this.getInlineTag():(saveText[0]?saveText[0]:'')}

src/components/MainSuit/index.jsx

@@ -261,7 +261,7 @@ class MainSuit extends Component{
       editable={editClear||datas.length==0?true:false} 
       boxLineHeight="24px"
       handleFocus={this.handleFocus} 
-      onchange={(e)=>{this.handleChange(e)}} 
+      onchange={this.handleChange} 
       handleClick={this.handleClick} 
       handleBlur={this.handleBlur}
       data={datas}

src/containers/CurrentIll.js

@@ -12,35 +12,35 @@ import {didPushParamChange} from '@utils/tools.js';
 
 
 function mapStateToProps(state) { //console.log(111,state);
-  const {homePage} = state;
+  const {homePage,currentIll,mainSuit,diagnosticList} = state;
     return {
-        data:state.currentIll.data,//主诉模板
-        emptyData:state.currentIll.emptyData,//空模板
-        searchData:state.currentIll.searchDatas,//搜索结果
-        focusIndex:state.currentIll.focusIndex,
-        processModule:state.currentIll.processModule,//病程变化模板
+        data:currentIll.data,//主诉模板
+        emptyData:currentIll.emptyData,//空模板
+        searchData:currentIll.searchDatas,//搜索结果
+        focusIndex:currentIll.focusIndex,
+        processModule:currentIll.processModule,//病程变化模板
         showArr:homePage.showDrop,
-        span:state.currentIll.span,
-        update:state.currentIll.update,//用于更新
-        mainText:state.mainSuit.saveText,//主诉选中的数据
-        mainData:state.mainSuit.data,//主诉使用的模板
-        symptomFeature:state.mainSuit.symptomFeature,//主诉分词数据
-        moduleNum:state.mainSuit.moduleNum,//主诉使用的模板
+        span:currentIll.span,
+        update:currentIll.update,//用于更新
+        mainText:mainSuit.saveText,//主诉选中的数据
+        mainData:mainSuit.data,//主诉使用的模板
+        symptomFeature:mainSuit.symptomFeature,//主诉分词数据
+        moduleNum:mainSuit.moduleNum,//主诉使用的模板
         type: state.typeConfig.typeConfig,
-        mainIds:state.mainSuit.mainIds,//主诉症状选中的id(去重用)
+        mainIds:mainSuit.mainIds,//主诉症状选中的id(去重用)
         showArr:homePage.showDrop,
         totalHide: homePage.totalHide,
-        saveText:state.currentIll.saveText,
-        selecteds:state.currentIll.selecteds,       //普通多选选中状态
-        editClear:state.currentIll.editClear,
-        symptomIds:state.currentIll.symptomIds,//症状id，去重用
-        isRead:state.homePage.isRead,
-        fuzhen:state.diagnosticList.mainSuitStr,//诊断第一个复诊值
-        boxTop:state.homePage.boxTop,
-        boxLeft:state.homePage.boxLeft,
-        allModules:state.homePage.allModules,
-        // isChronic:!!state.diagnosticList.chronicMagItem,
-        isChronic:state.mainSuit.chronicDesease||state.diagnosticList.chronicMagItem,
+        saveText:currentIll.saveText,
+        selecteds:currentIll.selecteds,       //普通多选选中状态
+        editClear:currentIll.editClear,
+        symptomIds:currentIll.symptomIds,//症状id，去重用
+        isRead:homePage.isRead,
+        fuzhen:diagnosticList.mainSuitStr,//诊断第一个复诊值
+        boxTop:homePage.boxTop,
+        boxLeft:homePage.boxLeft,
+        allModules:homePage.allModules,
+        // isChronic:!!diagnosticList.chronicMagItem,
+        isChronic:mainSuit.chronicDesease&&mainSuit.chronicDesease.name?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
 
     }
 }

src/containers/DiagnosticList.js

@@ -12,15 +12,17 @@ import {autoFillModules} from '@store/async-actions/fetchModules';
 import { initItemList } from '@store/async-actions/historyTemplates';
 
 function mapStateToProps(state) {
+    const {diagnosticList} = state;
+    let diagnC = diagnosticList.chronicMagItem;
     return {
-        list: state.diagnosticList.diagnosticList,
+        list: diagnosticList.diagnosticList,
         treatment: state.treat.show,
-        isFirst: state.diagnosticList.isFirst,
-        diagnosticStr: state.diagnosticList.diagnosticStr,
-        showReferRecord: state.diagnosticList.showReferRecord,
-        showHistoryCase: state.diagnosticList.showHistoryCase,
+        isFirst: diagnosticList.isFirst,
+        diagnosticStr: diagnosticList.diagnosticStr,
+        showReferRecord: diagnosticList.showReferRecord,
+        showHistoryCase: diagnosticList.showHistoryCase,
         items:state.historyTemplates.items,
-        chronicMagItem: state.diagnosticList.chronicMagItem,
+        chronicMagItem: diagnC&&diagnC.name?diagnC:state.mainSuit.chronicDesease,
         typeConfig: state.typeConfig.typeConfig,
     }
 }

src/containers/MainSuit.js

@@ -14,30 +14,31 @@ import {getInitModules} from '@store/async-actions/homePage.js';
 import {SHOW_REFER_RECORD} from '@store/types/diagnosticList';
 
 function mapStateToProps(state) {
+  const {mainSuit,diagnosticList,homePage} = state;
   return {
-    showDrop:state.mainSuit.showDrop,//用于更新
-    update:state.mainSuit.update,
-    CommonSymptoms:state.mainSuit.CommonSymptoms,//常见症状
-    datas:state.mainSuit.data,//数据源
-    selecteds:state.mainSuit.selecteds,//数据源
-    saveText:state.mainSuit.saveText,
-	  searchData:state.mainSuit.searchDatas,//搜索结果
+    showDrop:mainSuit.showDrop,//用于更新
+    update:mainSuit.update,
+    CommonSymptoms:mainSuit.CommonSymptoms,//常见症状
+    datas:mainSuit.data,//数据源
+    selecteds:mainSuit.selecteds,//数据源
+    saveText:mainSuit.saveText,
+	  searchData:mainSuit.searchDatas,//搜索结果
     type: state.typeConfig.typeConfig,
-    showArr:state.homePage.showDrop,
-    totalHide:state.homePage.totalHide,
-    focusIndex:state.mainSuit.focusIndex,
-    fuzhen:state.diagnosticList.mainSuitStr,//诊断第一个复诊值
-    span:state.mainSuit.span,
-    editClear:state.mainSuit.editClear,
-    clearAction:state.mainSuit.clearAction,//清除
-    mainIds:state.mainSuit.mainIds,//选中症状的id，搜索去重用
-    isRead:state.homePage.isRead,
-    commSymHide:state.homePage.commSymHide,
-    boxTop:state.homePage.boxTop,
-    boxLeft:state.homePage.boxLeft,
+    showArr:homePage.showDrop,
+    totalHide:homePage.totalHide,
+    focusIndex:mainSuit.focusIndex,
+    fuzhen:diagnosticList.mainSuitStr,//诊断第一个复诊值
+    span:mainSuit.span,
+    editClear:mainSuit.editClear,
+    clearAction:mainSuit.clearAction,//清除
+    mainIds:mainSuit.mainIds,//选中症状的id，搜索去重用
+    isRead:homePage.isRead,
+    commSymHide:homePage.commSymHide,
+    boxTop:homePage.boxTop,
+    boxLeft:homePage.boxLeft,
     currentData:state.currentIll.data,
-    allModules:state.homePage.allModules,
-    chronicDesease:state.mainSuit.chronicDesease||state.diagnosticList.chronicMagItem,
+    allModules:homePage.allModules,
+    chronicDesease:mainSuit.chronicDesease&&mainSuit.chronicDesease.name?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
   }
 }