Merge branch 'lcq' into newVersion6.0

src/components/BlockEmrCont/index.jsx

@@ -33,6 +33,11 @@ class BlockEMRCont extends Component {
     this.setHighter = this.setHighter.bind(this);
   }
   componentDidMount(){
+    setTimeout(() => {
+      // document.body.scrollIntoView()
+      document.body.scrollTop = document.documentElement.scrollTop = 0
+    }, 300);
+    
     // const height = getWindowInnerHeight() - 175;
     // const width = getWindowInnerWidth() - 20;
     // this.$cont.current.style.height = height+"px";

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -427,7 +427,7 @@ class HistoryCaseContainer extends React.Component {
                     okColor={'#fff'}
                     oKBg={'#3B9ED0'}
                 >
-                    <p className={styles['center']}>确认引用该病历？</p>
+                    <p className={styles['center']}>确定引用该病历？</p>
                 </ConfirmModal>
 
                 <ConfirmModal

src/components/InfoTitle/index.jsx

@@ -22,7 +22,7 @@ class InfoTitle extends Component {
     }
     showHistoryBox(){
 
-        console.log('关闭');
+        // console.log('关闭');
         const {showLoading,hideLoading}=this.props;
         showLoading();
         // 底部页面禁止滚动

src/components/Operation/index.jsx

@@ -181,6 +181,11 @@ class Operation extends Component {
       return;
     }   
 
+    if (keepState == 8) {
+      Notify.info('年龄不能超过200');
+      return;
+    }  
+
     // this.setState({            
     //   type: type,
     //   okText: '保存',

src/components/PatInfo/index.jsx

@@ -105,9 +105,10 @@ class PatInfo extends Component {
     } else {
       patientItem.value = e.target.value;
     }
-    if (patientItem.id === 'patientAge' && patientItem.value > 200) {
+    // console.log(typeof patientItem.value, patientItem.value,'patientItem.value');
+    if (patientItem.id === 'patientAge' && +patientItem.value > 200) {
       Notify.info('年龄不能超过200')
-      return 
+      // return false
     }
     this.setState({
       patientInfo: newInfo

src/store/actions/diagnosticList.js

@@ -58,7 +58,10 @@ export const getDiagnosticStr = (state, action) => {
         diagnosticStrNoType = diagnosticStrNoType + diagnosticList[i].name + ','
     }
     res.diagnosticStrNoType = diagnosticStrNoType
-    res.diagnosticStr = diagnosticStr
+    // res.diagnosticStr = diagnosticStr
+    // 2020/09/07 lcq 本次版本没有初诊复诊字样
+    res.diagnosticStr = diagnosticStrNoType
+
     return res;
 }
 

src/utils/tools.js

@@ -1242,7 +1242,7 @@ function readyKeepHistory(){
   let hospitalDeptName = formatFormParmas('hospitalDeptName', patInfoData);  // 科室
   let doctorName = formatFormParmas('doctorName', patInfoData);  // 医生
   let recordId = formatFormParmas('recordId', patInfoData);  // 门诊号
-
+  // console.log(patientAge, typeof patientAge,'patientAge================');
   if(filterDataArr(JSON.parse(jsonStr.chief)) == ''){
       return 1;//主诉不能为空
   }
@@ -1265,7 +1265,9 @@ function readyKeepHistory(){
     return 7;
   }
 
-
+  if (+patientAge > 200) {
+    return 8;
+  }
   // }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
   //     return 2;//诊断不能为空
   // }else{