历史病例优化

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -54,7 +54,7 @@ class HistoryCaseContainer extends React.Component {
         activeId:idx,
         activeHis:tmpItems,
         dataStr:tmpItems.detailList||[],
-        dataJson:JSON.parse(tmpItems.dataJson)||{},
+        // dataJson:JSON.parse(tmpItems.dataJson)||{},
       })
     }
     makeSure(){

src/containers/PushItemsContainer.js

@@ -17,7 +17,7 @@ function mapStateToProps(state) {//console.log(state)
         tableList: pushMessage.tableList,
         showList: pushMessage.showList,
         chronicPushItems: pushMessage.chronicPushItems,
-        setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',  
+        setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',
         sysConfig:state.homePage.sysConfig,
         windowHeight:state.homePage.windowHeight,
     }

src/store/async-actions/print.js

@@ -20,12 +20,19 @@ export const saveMessage = (bool) => {
     const lisData = baseList.inspect.pushItem;
     const lisArr = transferIndexData(lisData);
     const haveAssess = Object.keys(baseList.assessResult.data).length>0;
+    let otherData = {}
     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['haveAssess']=haveAssess
+    console.log(otherData,787878787)
     json('/inquiryInfo/saveInquiry', {
         "doctorId": state.doctorId,
         "hospitalDeptId": state.hospitalDeptId,
@@ -37,34 +44,42 @@ export const saveMessage = (bool) => {
         "detailList": [{
             "content": jsonStr.chief,
             "contentValue":filterDataArr(JSON.parse(jsonStr.chief)),
+            "contentJson":'',
             "type": 1
         }, {
             "content": jsonStr.present,
             "contentValue":filterDataArr(JSON.parse(jsonStr.present)),
+            "contentJson":'',
             "type": 2
         }, {
             "content": jsonStr.other,
             "contentValue":filterDataArr(JSON.parse(jsonStr.other)),
+            "contentJson":JSON.stringify(otherData),
             "type": 3
         }, {
             "content": jsonStr.vital,
             "contentValue":filterDataArr(JSON.parse(jsonStr.vital)),
+            "contentJson":'',
             "type": 4
         }, {
             "content": jsonStr.lis,
             "contentValue":jsonStr.lis,
+            "contentJson":'',
             "type": 5
         }, {
             "content": jsonStr.pacs,
             "contentValue":jsonStr.pacs,
+            "contentJson":'',
             "type": 6
         }, {
             "content": jsonStr.diag,
             "contentValue":jsonStr.diag,
+            "contentJson":'',
             "type": 7
         }, {
             "content": jsonStr.advice,
             "contentValue":jsonStr.advice,
+            "contentJson":'',
             "type": 8
         }],
         "sign": whichSign, //类型0结构化 1文本