v6

src/components/BlockEmrCont/index.jsx

@@ -23,6 +23,9 @@ import store from '@store';
 class BlockEMRCont extends Component {
   constructor(props){
     super(props);
+    this.state = {
+      isShowSexInput : true
+    }
     this.$cont = React.createRef();
     this.$div = React.createRef();
     this.setHighter = this.setHighter.bind(this);
@@ -42,6 +45,18 @@ class BlockEMRCont extends Component {
     });
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.patInfoData.patInfoData[3].value === 1){
+      this.setState({
+        isShowSexInput : false
+      })
+    }else {
+      this.setState({
+        isShowSexInput: true
+      })
+    }
+  }
+
   setHighter(ht){
     // console.log(this.$div.current.scrollHeight,ht,'-=-=-=-------');
     if(this.$div.current){
@@ -49,6 +64,7 @@ class BlockEMRCont extends Component {
     }
   }
   render() {
+    const { isShowSexInput} = this.state
     const contStyle={
       opacity:'0.4',
       top:'1px',
@@ -78,8 +94,8 @@ class BlockEMRCont extends Component {
           {/* 婚育史 */}
           <MarriageHistory></MarriageHistory>
           {/* 月经史 */}
-
-          <MenstruationHistory></MenstruationHistory>
+          {isShowSexInput && <MenstruationHistory></MenstruationHistory>}
+          
           {/* <OtherHistory></OtherHistory> */}
           <CheckBody></CheckBody>
           {/* 检验 */}

src/components/BodyContainer/index.jsx

@@ -1,5 +1,6 @@
 import EMRContainer from "../EMRContainer";
-import BlockEMRCont from "../BlockEmrCont/index.jsx";
+// import BlockEMRCont from "../BlockEmrCont/index.jsx";
+import BlockEMRCont from "../../containers/BlockEMRContanier";
 import PushContainer from '../PushContainer';
 
 import style from './index.less';

src/components/PatInfo/index.less

@@ -28,7 +28,10 @@
       overflow: hidden;
     }
     select {
-
+      // appearance:none;
+      // -moz-appearance:none;
+      // -webkit-appearance:none;
+      background:#fff;
       height: 28px;
       flex:1;
       border: none;

src/components/PreviewBody/index.jsx

@@ -82,7 +82,7 @@ class PreviewBody extends Component {
   render() {
     const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;
     let other_data={},lis_data={},pas_data={},other_yjs='',access='',adviceData={};
-    // console.log(dataStr,'=======-=-=-=-=');
+    let isShowSex = baseObj.sex ? false : true
     // if(!come){
     //   other_data = JSON.parse(baseObj.detailList[2].contentJson)
     //   lis_data = JSON.parse(baseObj.detailList[4].contentJson)
@@ -106,7 +106,8 @@ class PreviewBody extends Component {
           <ItemPart dataStr={dataStr.personalHistory} title={'个人史：'} type={1}></ItemPart>
           <ItemPart dataStr={dataStr.familyHistory} title={'家族史：'} type={1}></ItemPart>
           <ItemPart dataStr={dataStr.marriageHistory} title={'婚育史：'} type={1}></ItemPart>
-          <ItemPart dataStr={dataStr.menstruationHistory} title={'月经史：'} type={1}></ItemPart>
+          {isShowSex && <ItemPart dataStr={dataStr.menstruationHistory} title={'月经史：'} type={1}></ItemPart>}
+          
           <ItemPart dataStr={dataStr.vital} title={'查体：'} type={1}></ItemPart>
           {/* <PreviewInspect dataJson={come?dataJson.lis:lis_data} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect> */}
           <PreviewInspect dataJson={dataStr.lis} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetailsCopy}></PreviewInspect>

src/containers/BlockEMRContanier.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { connect } from 'react-redux';
+
+import BlockEMRCont from '../components/BlockEmrCont/index.jsx';
+
+function mapStateToProps(state) {
+  return {
+    patInfoData: state.patInfo
+  };
+}
+function mapDispatchToProps(dispatch) {
+  return {}
+}
+
+
+const BlockEMRContanier = connect(mapStateToProps, mapDispatchToProps)(BlockEMRCont);
+
+export default BlockEMRContanier;

src/utils/tools.js

@@ -230,7 +230,6 @@ const formatTextInfo = (baseList) =>{
 const pushHistoryDataList = (reData) =>{
  store.getState().inspect.context.scrollArea&&store.getState().inspect.context.scrollArea.scrollTop()
  let dataJson = JSON.parse(reData.preview)
-  // console.log(dataJson, '=dataJson');
   // 回显头部表单数据 
  store.dispatch({
    type: REINITPATINFO,
@@ -265,6 +264,7 @@ const pushHistoryDataList = (reData) =>{
     type: REMARRIAGETEXTDATA,
     params: dataJson,
   }); 
+  // 月经史
   store.dispatch({
     type: REMENSTRUATIONTEXTDATA,
     params: dataJson,