Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

# Conflicts:
#	src/utils/config.js

src/store/actions/otherHistory.js

@@ -274,12 +274,20 @@ export function changeTextLabel(state,action) {
   if(labText.trim()){
     if(item){
       item.value = newVal;
+      //月经史特殊处理
+      if(item.formulaCode){
+        res[item.formulaCode] = newVal;
+      }
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
       res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     const num = nextIsDot?2:1;
+    //月经史特殊处理
+    if(res.data[index].formulaCode){
+      res[res.data[index].formulaCode]=undefined;
+    }
     res.data.splice(index,num);
     res.selecteds.splice(index,num);//杂音类样式选中状态对应
     res.saveText = fullfillText(res.data).saveText;
@@ -368,6 +376,10 @@ export function backspaceText(state,action){
     res.saveText.splice(delIndex,1);
   }
   else{
+    //月经史删除处理
+    if(data[delIndex-1].formulaCode){
+      res[data[delIndex-1].formulaCode]=undefined;
+    }
     data.splice(delIndex-1,2);
     res.saveText.splice(delIndex-1,2);
   }

src/store/actions/patInfo.js

@@ -26,8 +26,8 @@ export const updatePatientMessage=(state,action)=>{
       // sex: 2
     // };
     res.message = action.data;
-    if(!action.data.selfDeptId){    //selfDeptId这个参数是跟外部对接用的
-        res.message = mock;
-    }
+    /*if(!action.data.selfDeptId){    //selfDeptId这个参数是跟外部对接用的
+        res.message = {};
+    }*/
     return res;
 };