Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

src/components/InfoTitle/index.jsx

@@ -23,6 +23,8 @@ class InfoTitle extends Component {
     showHistoryBox(){
         const {showLoading,hideLoading}=this.props;
         showLoading();
+        // document.body.style.overflow = 'hidden';
+        // document.body.style.position = 'fixed';
         // store.dispatch(initItemList());
         // store.dispatch(showHistory(true))
         // initItemList().then((res)=>{

src/containers/BlockInpContainer.js

@@ -77,7 +77,8 @@ function mapDispatchToProps(dispatch){
       //   dispatch(embedPush({ mode: +boxMark + 1, action: formatMode(boxMark) }));
       //   return;
       // }
-      if (isFocus && !notClear) {
+      // if (isFocus && !notClear) {
+      if (isFocus) {
         // dispatch(embedPush({mode:+boxMark+1}));
         dispatch(embedPush({ mode: +boxMark + 1, action: formatMode(boxMark) }));
         return;

src/utils/tools.js

@@ -961,10 +961,6 @@ function getEMRParams(){
     "operation": tempoperation,
     "allergy": "",
     "vaccination": "",
-    "personal": "",
-    "marital": "",
-    "family": "",
-    "menstrual": "",
     "other": filterDataArr(otherHistory.saveText)||'',
     "lisString": "",
     "pacsString": "",
@@ -981,7 +977,6 @@ function getEMRParams(){
     "otherOrder": [],
     "patientId": message.patientId,
     "drug": tempdrug,
-    "marriage": "",
     "hospitalId": id || ''
   }
   return obj;