|
@@ -7,6 +7,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
|
|
|
import {billing} from '@store/async-actions/pushMessage';
|
|
|
import {fullfillText} from '@common/js/func';
|
|
|
import {didPushParamChange,filterDataArr} from '@utils/tools.js';
|
|
|
+import config from '@config/index.js';
|
|
|
|
|
|
function mapStateToProps(state){
|
|
|
const {otherHistory,homePage,typeConfig,mainSuit} = state;
|
|
@@ -41,7 +42,8 @@ function mapDispatchToProps(dispatch,store){
|
|
|
const state = getStore();
|
|
|
const initData = state.homePage.initData;
|
|
|
const mode = state.typeConfig.typeConfig;
|
|
|
- const model = JSON.parse(JSON.stringify(initData.otherHisModel)); //查体模板
|
|
|
+ const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
|
+ const model = JSON.parse(JSON.stringify(initData.otherHisModel||null))||block; //查体模板
|
|
|
const arr = JSON.parse(JSON.stringify(initData.otherHis||null)); //最近其他史数据
|
|
|
const arrSave = JSON.parse(JSON.stringify(initData.otherHisSave||null)); //最近其他史saveText
|
|
|
const selects = JSON.parse(JSON.stringify(initData.otherSelecteds||null)); //其他史杂音类选中项
|