|
@@ -101,8 +101,17 @@ class PreviewBody extends Component {
|
|
|
}
|
|
|
}
|
|
|
render() {
|
|
|
- const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn,showHistoryCases} = this.props;
|
|
|
- const other_yjs = dataStr.other?filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other):'';
|
|
|
+ const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;
|
|
|
+ let other_data={},lis_data={},pas_data={},other_yjs='';
|
|
|
+ if(!come){
|
|
|
+ other_data = JSON.parse(baseObj.detailList[2].contentJson)
|
|
|
+ lis_data = JSON.parse(baseObj.detailList[4].contentJson)
|
|
|
+ pas_data = JSON.parse(baseObj.detailList[5].contentJson)
|
|
|
+ other_yjs = other_data.pfix;
|
|
|
+ }else{
|
|
|
+ other_yjs = dataStr.other?filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other):'';
|
|
|
+ }
|
|
|
+ console.log(dataStr,dataJson,33333333333)
|
|
|
//const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
|
|
|
const noData = JSON.stringify(preInfo) == '{}';
|
|
|
return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
|
|
@@ -111,12 +120,12 @@ class PreviewBody extends Component {
|
|
|
<table className={style['infos']}>
|
|
|
<ItemPart dataStr={dataStr.chief} title={'主诉:'} type={1}></ItemPart>
|
|
|
<ItemPart dataStr={dataStr.present} title={'现病史:'} type={1}></ItemPart>
|
|
|
- <ItemPart dataStr={dataStr.present} title={'其他史:'} dataJson={dataJson} other_yjs={other_yjs} type={3}></ItemPart>
|
|
|
+ <ItemPart dataStr={dataStr.present} title={'其他史:'} dataJson={come?dataJson:other_data} other_yjs={other_yjs} type={3}></ItemPart>
|
|
|
<ItemPart dataStr={dataStr.vital} title={'查体:'} type={1}></ItemPart>
|
|
|
- <PreviewInspect dataJson={dataJson} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect>
|
|
|
+ <PreviewInspect dataJson={come?dataJson.lis:lis_data} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect>
|
|
|
<ItemPart dataStr={dataStr.pacs} title={'辅检:'} type={2}></ItemPart>
|
|
|
<ItemPart dataStr={dataStr.diag} title={'诊断:'} type={2}></ItemPart>
|
|
|
- <tr className={style['patInfoFst']}>
|
|
|
+ {/* <tr className={style['patInfoFst']}>
|
|
|
<td className={style['patInfoSec']}>医嘱:</td>
|
|
|
<td className={`${style['patInfoSec']} ${style['pushMessage']} ${style['font14']}`}>
|
|
|
{((dataJson.advice.assay && dataJson.advice.assay.length > 0) || (dataJson.advice.check && dataJson.advice.assay.check > 0)) && <p className={style.pushMessageTitle}><span>开单项目</span></p>}
|
|
@@ -141,7 +150,7 @@ class PreviewBody extends Component {
|
|
|
dataJson.advice.adviceInput && <div className={style.pushMessageDes}>{dataJson.advice.adviceInput}</div>
|
|
|
}
|
|
|
</td>
|
|
|
- </tr>
|
|
|
+ </tr> */}
|
|
|
</table>
|
|
|
<p className={style.docName}>医生签名:<span>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
|
|
|
{showAssessBtn&&dataJson.haveAssess?<AssessResultHis showHistoryCases={showHistoryCases} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
|