Luolei 6 年之前
父節點
當前提交
c6d4ec0ba6

+ 0 - 1
src/components/AddAssistCheck/Textarea/index.jsx

@@ -15,7 +15,6 @@ class Textarea extends Component {
     const {handleChangeAssistValue,idx,handlePush} = this.props;
     const text = e.target.innerText;
     const stimer = this.state.timer;
-    console.log(text)
     handleChangeAssistValue&&handleChangeAssistValue(text,idx);
     //右侧推送--延时推送
     clearTimeout(stimer);

+ 9 - 9
src/components/AddInspect/index.jsx

@@ -235,11 +235,11 @@ class Inspect extends React.Component {
         if(val.questionDetailList.length > 0){
             return val.questionDetailList.map((item)=>{
                 if(val.value == item.name){
-                    return <td className={item.abnormal != '0' ?"red":'' }>{val.value}</td>
+                    return <td style={{width:'20%'}} className={item.abnormal != '0' ?"red":'' }>{val.value}</td>
                 }
             })
         }else{
-            return <td><span className={(val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue?"red":''):''}>{val.value}</span> { val.labelSuffix}</td>
+            return <td style={{width:'20%'}}><span className={(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue) ? (val.value > val.maxValue || val.value < val.minValue?"red":''):''}>{val.value}</span> { val.labelSuffix}</td>
         }
     }
     render() {
@@ -264,12 +264,12 @@ class Inspect extends React.Component {
                                                     {
                                                         item.lisExcelItem && item.lisExcelItem.map((value)=>{
                                                             return <tr>
-                                                                <td>{value.itemName}</td>
-                                                                <td><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
-                                                                <td>
+                                                                <td style={{width:'30%'}}>{value.itemName}</td>
+                                                                <td style={{width:'20%'}}><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
+                                                                <td style={{width:'25%'}}>
                                                                     {normalVal(value.min,value.max)}
                                                                 </td>
-                                                                <td>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
+                                                                <td style={{width:'25%'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
                                                             </tr>
                                                         })
                                                     }
@@ -303,12 +303,12 @@ class Inspect extends React.Component {
                                                     item.details.map((val)=>{
                                                         if(val.value && val.value != ''){
                                                             return <tr>
-                                                                <td>{val.name}</td>
+                                                                <td style={{width:'30%'}}>{val.name}</td>
                                                                 {this.showDetails(val)}
-                                                                <td>
+                                                                <td style={{width:'25%'}}>
                                                                     {normalVal(val.minValue,val.maxValue)}
                                                                 </td>
-                                                                <td>{'化验时间:'+item.time}</td>
+                                                                <td style={{width:'25%'}}>{'化验时间:'+item.time}</td>
                                                             </tr>
                                                         }
                                                     })

+ 11 - 11
src/components/AddInspect/index.less

@@ -43,8 +43,9 @@
     position: relative;
     vertical-align: top;
     padding: 2px 10px;
-    margin-right: 10px;
-    width: 180px;
+    box-sizing: border-box;
+    width: 20%;
+    float: left;
     span {
         border-bottom: 1px solid #666666 ;
     }
@@ -66,13 +67,13 @@
 }
 .labelWrap {
     .table {
-        display: inline-block;
         color: #000;
+        width: 80%;
         tr {
             line-height: 18px;
             height: 18px;
+            width: 100%;
             td {
-                width: 180px;
                 padding-top: 3px;
             }
         }
@@ -122,17 +123,14 @@
     // line-height: 28px;
     overflow: hidden;
     padding-top: 0 !important;
-    // width: 292px;
     width: 290px;
     float: left;
     padding: 0 15px;
     box-sizing: border-box;
-    // border-bottom: 1px solid #000;
     span {
         display: inline-block;
     }
     .itemPartL {
-        // width: 100px;
         max-width: 180px;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -173,21 +171,23 @@
         border-radius: 50%;
     }
     .excelDataLis {
-        padding: 2px 10px;
+        padding: 2px 0px;
         border-bottom: 1px dashed #989DA3;
         .excelDataTitle {
             display: inline-block;
-            width: 180px;
+            width: 20%;
             vertical-align: top;
+            padding-left: 10px;
+            float: left;
         }
         table {
-            display: inline-block;
+            width: 80%;
             tr {
                 height: 16px;
                 line-height: 16px;
+                width: 100%;
             }
             td {
-                width: 180px;
                 text-align: left;
                 padding-top: 3px;
             }

+ 1 - 1
src/components/EMRContainer/index.less

@@ -6,7 +6,7 @@
   padding: 0px 0 10px 0 ;
   box-sizing: border-box;
   position: absolute;
-  min-width: 700px;
+  // min-width: 700px;
   float: left;
   overflow-y:auto;
   overflow-x: hidden;

+ 4 - 1
src/components/Operation/index.jsx

@@ -242,7 +242,8 @@ class Operation extends Component {
       />
       <div className={style['line']}></div>
       <div className={style['iptWrap']}>
-        <span id="commonSex" onClick={this.changeRadio.bind(this,1)}><img src={check_right} alt=""/>通用</span>
+        <p>请选择模板性别归属(错误引用页面显示可能有误)</p>
+        <span className={style['commonSex']} id="commonSex" onClick={this.changeRadio.bind(this,1)}><img src={check_right} alt=""/>通用</span>
         <span id="maleSex" onClick={this.changeRadio.bind(this,2)}><img src={check_circle} alt=""/>男</span>
         <span id="femaleSex" onClick={this.changeRadio.bind(this,3)}><img src={check_circle} alt=""/>女</span>
       </div>
@@ -314,6 +315,8 @@ class Operation extends Component {
         close={() => { this.closeDiagBox()}}
         cancel={() => {this.closeDiagBox()}}
         okText={this.state.okText}
+        height={228}
+        width={400}
         okBorderColor={this.state.borderColor}
         okColor={this.state.okColor}
         oKBg={this.state.oKBg}

+ 11 - 8
src/components/Operation/index.less

@@ -6,7 +6,7 @@
     bottom: 0;
     left: 10px;
     right: 470px;
-    min-width: 720px;
+    // min-width: 720px;
     background-color: #fff;
     // z-index: 240;
     padding-bottom: 10px;
@@ -109,14 +109,17 @@
     }
 }
 .iptWrap {
-  width: 190px;
-  height: 20px;
+  width: 320px;
   line-height: 18px;
-  margin: 5px auto;
+  margin: 10px auto;
+  text-align: center;
+  p {
+    text-align: left;
+  }
   span {
     display: inline-block;
     cursor: pointer;
-    padding-right: 12px;
+    padding-right: 24px;
     font-size: 14px;
     img {
       vertical-align: middle;
@@ -134,11 +137,11 @@
 .box {
     padding-top: 10px;
     box-sizing: border-box;
-    height: 86px;
+    height: 110px;
 }
 .ipt {
     font-size: 16px;
-    width: 170px;
+    width: 320px;
     height: 20px;
     line-height: 18px;
     display: block;
@@ -146,7 +149,7 @@
     text-align: left;
 }
 .line {
-    width: 182px;
+    width: 332px;
     height: 1px;
     margin: 8px auto 0 auto;
     background: #D8D8D8;

+ 50 - 52
src/components/PreviewBody/index.jsx

@@ -98,80 +98,79 @@ class PreviewBody extends Component {
         if(val.questionDetailList.length > 0){
             return val.questionDetailList.map((item)=>{
                 if(val.value == item.name){
-                    return <td style={{width:'23%'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
+                    return <td style={{width:'20%',fontSize:'12px'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
                 }
             })
         }else{ 
-            return <td style={{width:'23%'}}><span style={{color:(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
+            return <td style={{width:'20%',fontSize:'12px'}}><span style={{color:(val.value - 0).toString() == 'NaN'?"red":(val.maxValue || val.minValue)?(val.value > val.maxValue || val.value < val.minValue?"red":null):null}}>{val.value}</span> { val.labelSuffix}</td>
         }
     }
     render() {
         const { show, preInfo, dataJson, dataStr,baseObj } = this.props;
 
         return <div className={style['content']}>
-            <div className={style['contents']} id="content" style={{margin:"0 auto"}}>
+            <div className={style['contents']} id="content" style={{margin:"0 auto",maxWidth:"600px"}}>
                 <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
                 <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>卡号:{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>姓名:{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>年龄:{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>性别:{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>卡号:{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>姓名:{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>年龄:{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>性别:{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
                     </tr>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>就诊时间:{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>科室:{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>医生:{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>门诊号:{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>就诊时间:{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>科室:{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>医生:{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
+                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%',fontSize:"14px" }}>门诊号:{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
                     </tr>
                 </table>
-                <table style={{width:"100%"}}>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>主诉:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                <table style={{width:"100%", borderCollapse: 'collapse'}}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>主诉:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
                             {
                                 filterDataArr(JSON.parse(dataStr.chief))
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>现病史:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>现病史:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
                             {
                                 filterDataArr(JSON.parse(dataStr.present))
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>其他史:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>其他史:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px'  }}>
                             {
                                 filterDataArr(JSON.parse(dataStr.other))
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>查体:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>查体:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px'  }}>
                             {
                                 filterDataArr(JSON.parse(dataStr.vital))
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top',width:'100%',overflow:"hidden" }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>化验:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',maxWidth:'650px'}}>
-                            {/* <table style={{ width: '100%' }}> */}
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>化验:</td>
+                        <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px',lineHeight:'20px',maxWidth:'650px'}}>
                                 {
                                     dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items)=>{
                                         return items.lisExcelRes && items.lisExcelRes.map((item)=>{
-                                            return <table style={{margin:'8px 0',width:'100%',fontSize:'12px'}}>
-                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.menus}</tr>
+                                            return <table style={{marginBottom:'10px',width:'100%',fontSize:'12px'}}>
+                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}><td><span style={{borderBottom:'1px solid #666666'}}>{item.menus}</span></td></tr>
                                                 {
                                                     item.lisExcelItem && item.lisExcelItem.map((value)=>{
                                                         return <tr style={{lineHeight:'1.5',maxWidth:'650px'}}>
-                                                            <td style={{width:'25%',fontSize:'12px'}}>{value.itemName}</td>
-                                                            <td style={{width:'23%',fontSize:'12px'}}><span style={{fontSize:'12px',color:value.type == 1?"red":null}}>{value.value}</span> {value.unit}</td>
+                                                            <td style={{width:'32%',fontSize:'12px'}}>{value.itemName}</td>
+                                                            <td style={{width:'16%',fontSize:'12px'}}><span style={{fontSize:'12px',color:value.type == 1?"red":null}}>{value.value}</span> {value.unit}</td>
                                                             <td style={{width:'24%',fontSize:'12px'}}>
                                                                 {normalVal(value.min,value.max)}
                                                             </td>
@@ -187,18 +186,18 @@ class PreviewBody extends Component {
                                     dataJson.lis.labelList && dataJson.lis.labelList.map((item,idx) => {
                                         if(item.show){
                                             return <table style={{margin:'8px 0',width:'100%'}}>
-                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.name}</tr>
+                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}><td><span style={{borderBottom:'1px solid #666666'}}>{item.name}</span></td></tr>
                                                 {
                                                     item.details.map((val)=>{
                                                         if(val.value && val.value != ''){
                                                             return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
-                                                                <td style={{width:'25%'}}>{val.name}</td>
+                                                                <td style={{width:'32%',fontSize:'12px'}}>{val.name}</td>
                                                                 {this.showDetails(val)}
                                                                 
-                                                                <td style={{width:'24%'}}>
+                                                                <td style={{width:'24%',fontSize:'12px'}}>
                                                                     {normalVal(val.minValue,val.maxValue)}
                                                                 </td>
-                                                                <td style={{width:'28%'}}>{'化验时间:'+item.time}</td>
+                                                                <td style={{width:'28%',fontSize:'12px'}}>{'化验时间:'+item.time}</td>
                                                             </tr>
                                                         }
                                                     })
@@ -207,12 +206,11 @@ class PreviewBody extends Component {
                                         }
                                     })
                                 }
-                            {/* </table> */}
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>辅检:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>辅检:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
                             {
                                 dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
                                     return <div style={{ fontSize: '14px' }}>{item}</div>
@@ -220,9 +218,9 @@ class PreviewBody extends Component {
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>诊断:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>诊断:</td>
+                        <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px',lineHeight:'20px' }}>
                             {
                                 dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item)=>{
                                     return <div style={{ fontSize: '14px'}}>{item}</div>
@@ -230,31 +228,31 @@ class PreviewBody extends Component {
                             }
                         </td>
                     </tr>
-                    <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>医嘱:</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px' }}>
+                    <tr style={{ verticalAlign:'top',borderBottom:"1px solid #e2e4e6" }}>
+                        <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>医嘱:</td>
+                        <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px',lineHeight:'20px' }}>
                             {
-                                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}>开单项目</p> : ''
+                                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}><span>开单项目</span></p> : ''
                             }
                             {
-                                dataJson.advice.assay && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
+                                dataJson.advice.assay && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
                             }
                             {
-                                dataJson.advice.check && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
+                                dataJson.advice.check && <div style={{ padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
                             }
-                            {dataJson.advice.scheme && dataJson.advice.scheme.length > 0  && <p style={{fontSize:'14px', marginBottom: '8px',marginTop:'8px'}}>治疗方案</p>}
+                            {dataJson.advice.scheme && dataJson.advice.scheme.length > 0  && <p style={{fontSize:'14px', marginBottom: '8px',marginTop:'8px'}}><span>治疗方案</span></p>}
                             {
                                 dataJson.advice.scheme && dataJson.advice.scheme.map((item, index) => {
                                     return <p>{item.treatment.map((it,ii) =>{
                                       return(it.treatmentStr && it.treatmentStr.length > 0 ? 
-                                        <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{ it.treatmentStr }</div>: '')
+                                        <div style={{ padding: '0px 0px 5px 0px' }}>{ it.treatmentStr }</div>: '')
                                     })}</p>
                                   })
                             }
                         </td>
                     </tr>
                 </table>
-                <table style={{ marginTop: '10px',marginBottom:'30px',display: show ? 'block' : 'none' }}>
+                <table style={{ marginTop: '10px',marginBottom:'30px',position:'relative',display: show ? 'block' : 'none' }}>
                     <tr style={{position:'absolute',right:'0px',verticalAlign: 'top'}}>
                         <td>医生签名:</td>
                         <td style={{

+ 7 - 2
src/components/TemplateItems/TemplateItem/index.jsx

@@ -10,6 +10,7 @@ import edit_icon from './img/edit_grey.png';
 import editing_icon from './img/edit_blue.png';
 import check_circle from './img/check-circle.png';
 import check_right from './img/check-right.png';
+import Notify from '@commonComp/Notify';
 import store from '@store'
 import {checkItems} from '@store/actions/tabTemplate';
 import $ from 'jquery';
@@ -57,8 +58,12 @@ class TemplateItem extends React.Component {
         }
     }
 
-    handleContentClick(e) {
+    handleContentClick(e,sex) {
         e.stopPropagation();
+        let baseSex = store.getState().patInfo.message.sex
+        if(sex != 3 && sex != baseSex){
+          Notify.info('引用该模版可能显示有误');
+        }
         this.props.handleContentClick(this.props.id);
     }
 
@@ -190,7 +195,7 @@ class TemplateItem extends React.Component {
                         onMouseLeave={() => this.handleDelIconMouseLeave()}
                         onClick={(e) => this.handleTemplateDel(e)} 
                     />
-                    <span className={style.quote} onClick={(e) => this.handleContentClick(e)}>引用</span>
+                    <span className={style.quote} onClick={(e) => this.handleContentClick(e,sex)}>引用</span>
                     <img title={'修改模板标题'}
                         className={style.edit}
                         src={this.getEditIcon()}

+ 2 - 2
src/components/TemplateItems/index.jsx

@@ -16,10 +16,10 @@ class TemplateItems extends React.Component {
         this.genItems = this.genItems.bind(this);
     }  
     componentDidMount(){
-        const height = getWindowInnerHeight()-216;
+        const height = getWindowInnerHeight()-206;
         this.$cont.current.style.height = height+"px";
         windowEventHandler('resize', ()=>{
-            const height = getWindowInnerHeight()-216;
+            const height = getWindowInnerHeight()-206;
             this.$cont.current.style.height = height+"px";
         });
     }