Browse Source

现病史展开过滤连续标点880

zhouna 6 years ago
parent
commit
9a817c3a08
2 changed files with 6 additions and 5 deletions
  1. 3 2
      src/store/actions/currentIll.js
  2. 3 3
      src/store/async-actions/homePage.js

+ 3 - 2
src/store/actions/currentIll.js

@@ -1,6 +1,7 @@
 import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
 import config from '@config/index.js';
 import {getInitModules} from '@store/async-actions/homePage.js';
+import {formatContinueDots} from '@utils/tools';
 
 //插入病程变化模板
 function insertPro(data,processModule){
@@ -83,7 +84,7 @@ export const setData = (state,action) =>{
   let newMain = [];
   let mainLabelModule = res.mainLabelModule;//主诉选中的症状id获取到的模板
   let objToArr = [];
-  let keyArr = Object.keys(mainLabelModule); 
+  let keyArr = Object.keys(mainLabelModule);
   for(let i=0; i<keyArr.length; i++){
     objToArr.push(mainLabelModule[JSON.parse(keyArr[i])]);
   }
@@ -256,7 +257,7 @@ export const setData = (state,action) =>{
       }
       
       let symptomArr = newMainCopy.concat(manInput,newWiths,manWithInput);
-      let newSymptomArr = JSON.parse(JSON.stringify(symptomArr));  
+      let newSymptomArr = formatContinueDots(JSON.parse(JSON.stringify(symptomArr)));   //过来连续标点
       //组装好的主症状和伴随症状插入现病史模板(flag=4前)
       let insertIdx = null;
       for(let j=0; j<current.length; j++){

+ 3 - 3
src/store/async-actions/homePage.js

@@ -63,12 +63,12 @@ export const getInitModules= (dispatch,getStore)=>{
         });
         dispatch({
           type:SET_CURRENT,
-          data:initData.current,
+          data:formatContinueDots(initData.current),
           save:initSaveText.current,
-          processModule:initData.process,//病程变化
+          processModule:formatContinueDots(initData.process),//病程变化
           processModuleName:initModuleName.process,//病程变化模板名称
           saveProcess:initSaveText.process,
-          emptyData:initData.currentEmpty,//现病史空模板
+          emptyData:formatContinueDots(initData.currentEmpty),//现病史空模板
           saveEmpty:initSaveText.currentEmpty,
         });
         dispatch(getOtherHisRecord());          //获取其他史最近记录