历史病例

src/components/Preview/index.jsx

@@ -28,6 +28,7 @@ class Preview extends Component {
             dataJson={dataJson}
             dataStr={dataStr}
             show={false}
+            come={'preview'}
         ></PreviewBody>
       </div>
     </div>

src/components/PreviewBody/Inspect/index.jsx

@@ -7,7 +7,7 @@ const PreviewInspect = (props) => {
       <td className={style['patInfoSec']}>化验：</td>
       <td className={style['patInfoSec']}>
         {
-          dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
+          dataJson&&dataJson.getExcelDataList && dataJson.getExcelDataList.map((items) => {
             return items.lisExcelRes && items.lisExcelRes.map((item) => {
               return <table style={style.assistTable}>
                 <tr style={style.assistTableTrFst}><td><span>{item.menus}</span></td></tr>
@@ -32,7 +32,7 @@ const PreviewInspect = (props) => {
           })
         }
         {
-          dataJson.lis.labelList && dataJson.lis.labelList.map((item, idx) => {
+          dataJson&&dataJson.labelList && dataJson.labelList.map((item, idx) => {
             return <table style={{ margin: '8px 0', width: '100%' }}>
               {
                 item.show?<tr className={style.assistTableTrFst}><td><span> {item.name} </span></td></tr>:

src/components/PreviewBody/index.jsx

@@ -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>:""}

src/components/PrintPreview/index.jsx

@@ -33,6 +33,7 @@ class PrintPreview extends Component {
                       show={true}
                       onClose={onClose}
                       save={save}
+                      come={'preview'}
                   ></PreviewBody>
             </div>
         </div>

src/store/async-actions/print.js

@@ -7,7 +7,8 @@ import {
     getAllDataList,
     getAllDataStringList,
     pushAllDataList,
-    filterDataArr
+    filterDataArr,
+    filterOtherDataArr
 } from '@utils/tools';
 
 export const saveMessage = (bool) => {
@@ -20,19 +21,23 @@ export const saveMessage = (bool) => {
     const lisData = baseList.inspect.pushItem;
     const lisArr = transferIndexData(lisData);
     const haveAssess = Object.keys(baseList.assessResult.data).length>0;
-    let otherData = {}
+    let otherData = {},pacsData={};
     const evaluation={
       htmlContent:haveAssess?JSON.stringify(getEvaluations(baseList.assessResult,pushMessage)):'{}',
       //scaleList:[]
     };//getEvaluation();
     //console.log(baseList)
     // console.log(jsonStr.diag,'保存历史病历')
-    otherData['yjs_1']=jsonData['yjs_1']
-    otherData['yjs_2']=jsonData['yjs_2']
-    otherData['yjs_3']=jsonData['yjs_3']
-    otherData['yjs_4']=jsonData['yjs_4']
+    otherData['yjs_1']=jsonData['yjs_1']||''
+    otherData['yjs_2']=jsonData['yjs_2']||''
+    otherData['yjs_3']=jsonData['yjs_3']||''
+    otherData['yjs_4']=jsonData['yjs_4']||''
     otherData['haveAssess']=haveAssess
-    console.log(otherData,787878787)
+    otherData['pfix']=jsonStr.other?filterOtherDataArr(JSON.parse(jsonStr.other),jsonData.other):''
+    pacsData.pacs = jsonData.pacs
+    pacsData.checkedListImport = jsonData.checkedListImport
+    console.log(jsonData,787878787)
+    // return
     json('/inquiryInfo/saveInquiry', {
         "doctorId": state.doctorId,
         "hospitalDeptId": state.hospitalDeptId,
@@ -64,12 +69,12 @@ export const saveMessage = (bool) => {
         }, {
             "content": jsonStr.lis,
             "contentValue":jsonStr.lis,
-            "contentJson":'',
+            "contentJson":JSON.stringify(jsonData.lis),
             "type": 5
         }, {
             "content": jsonStr.pacs,
             "contentValue":jsonStr.pacs,
-            "contentJson":'',
+            "contentJson":JSON.stringify(pacsData),
             "type": 6
         }, {
             "content": jsonStr.diag,

src/utils/tools.js

@@ -568,6 +568,7 @@ function filterDataArr(arrTmp){   //数据处理
 //其他史预览数据处理-月经史
 function filterOtherDataArr(arrTmp,jsonArr){
   let tmpArr = [];
+  console.log(jsonArr,11111111)
   let index1 = jsonArr.findIndex((item)=>{
     return item.formulaCode=='yjs_1';
   });