v6

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -279,11 +279,8 @@ class HistoryCaseContainer extends React.Component {
 
     render(){
         const { items,handleSortClick,showHistoryBox,preInfo } = this.props;
-      const { activeHis, visible, dataJson, dataStr, delVisible, editVisible, historyCase, currentIndex, activeIndex } = this.state;
-
-     
+        const { activeHis, visible, dataJson, dataStr, delVisible, editVisible, historyCase, currentIndex, activeIndex } = this.state;     
         const getAllDataStringList = (dataStr) =>{           //获取所有模块文本的数据
-            console.log(dataStr,'==============');
             let jsonDataString = {};
             jsonDataString.lis = {};
             jsonDataString.chief = dataStr[0] && dataStr[0].content || '';      //主诉

src/components/PreviewBody/Inspect/index.jsx

@@ -3,12 +3,57 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
-  console.log(props,'===props');
-  console.log(dataJson,'===dataJson==_');
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>化验：</td>
       <td className={style['patInfoSec']}>
+        <table style={style.assistTable}>
+        <tr style={{lineHeight: '36px'}}>化验结果数据</tr>
         {
+          dataJson && dataJson.labelListSmall && dataJson.labelListSmall.map((item) => {
+            // console.log(item, item,'=====');
+              return (
+                
+                  <tr className={style.assistTableTrSec}>
+                    <td className={style.assistTableTdFst}>{item.uniqueName}</td>
+                    <td className={style.assistTableTdSec}>
+                      {/* {getStatusImg(value.type, value.value, 1)}
+                      {value.unit} */}
+                      {/* {getStatusImg(2, item.value, 1)}
+                      {item.units} */}
+                      {getStatusImg(2, 9.8, 1)}
+                      {'mmol/L'}
+                    </td>
+                    {/* {showDetails(item)} */}
+                    <td className={style.assistTableTdTrd}>
+                      {/* {normalVal(item.minValue, item.maxValue)} */}
+                      {normalVal(3.9, 6.1)}
+                    </td>
+                    <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '化验时间：' + toTime(item.time)
+                    }</td>
+                  </tr>
+                // </table>
+              )
+          })
+        }
+
+        {
+          dataJson && dataJson.labelListBig && dataJson.labelListBig.map((item) => {
+            return (
+              // <table style={style.assistTable}>
+                <tr className={style.assistTableTrSec}>
+                  <td className={style.assistTableTdFst}>{item.uniqueName}</td>  
+                  <td className={style.assistTableTdSec}></td>
+                  <td className={style.assistTableTdTrd}></td>                                             
+                  <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '化验时间：' + toTime(item.time)
+                  }</td>
+                </tr>
+              // </table>
+            )
+          })
+        }
+
+        </table>
+        {/* {
           dataJson&&dataJson.getExcelDataList && dataJson.getExcelDataList.map((items) => {
             return items.lisExcelRes && items.lisExcelRes.map((item) => {
               return <table style={style.assistTable}>
@@ -32,8 +77,8 @@ const PreviewInspect = (props) => {
               </table>
             })
           })
-        }
-        {
+        } */}
+        {/* {
           dataJson&&dataJson.labelList && dataJson.labelList.map((item, idx) => {
             return <table style={{ margin: '8px 0', width: '100%' }}>
               {
@@ -64,7 +109,7 @@ const PreviewInspect = (props) => {
               }
             </table>
           })
-        }
+        } */}
       </td>
     </tr>
 }

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -7,23 +7,37 @@ class MedicalAdvice extends Component {
   }
   render() { 
     const {advice} = this.props
+    // console.log(advice,'===========');
+    const {labelListBig,labelListSmall} = advice
     return ( 
         <tr className={style['patInfoFst']}>
           <td className={style['patInfoSec']}>医嘱：</td>
           <td className={style['patInfoSec']}>
             <table style={style.assistTable}>
               {
-              advice && advice.map((item,index)=>{
+              labelListBig && labelListBig.map((item,index)=>{
                 return (
                   <tr>
-                    <td className={style.assistTableTdFst}>{item.name}</td>
-                    <td className={style.assistTableTdSec}>{item.uniqueName}</td>
-                    <td className={style.assistTableTdTrd}>{item.value}</td>
+                    <td className={style.adviceTableTdFst}>{item.name}</td>
+                    {/* <td className={style.assistTableTdSec}></td> */}
+                    <td className={style.assistTableTdTrd}>药品</td>
                     <td className={style.assistTableTdFor}>{item.time}</td>
                   </tr>
                 )
               })
               }
+              {
+              labelListSmall && labelListSmall.map((item, index) => {
+                  return (
+                    <tr>
+                      <td className={style.adviceTableTdFst}>{item.name}</td>
+                      {/* <td className={style.assistTableTdSec}></td> */}
+                      <td className={style.assistTableTdTrd}>手术/操作</td>
+                      <td className={style.assistTableTdFor}>{item.time}</td>
+                    </tr>
+                  )
+                })
+              }
             </table>
           </td>
         </tr>

src/components/PreviewBody/index.jsx

@@ -56,7 +56,7 @@ class PreviewBody extends Component {
   showDetails(val) {
     let min = val.minValue, max = val.maxValue, value = val.value, dom = '';
     dom = getDomUpDown(min,max,value)
-    if (val.questionDetailList.length > 0) {
+    if (val.questionDetailList && val.questionDetailList.length > 0) {
       return val.questionDetailList.map((item) => {
         if (val.value == item.name) {
           return <td className={style.assistTableTdSec}><span style={{ color: item.abnormal != '0' ? "red" : null }}>{val.value}</span> {val.labelSuffix}</td>
@@ -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.lis,'=======-=-=-=-=');
+    // console.log(dataStr,'=======-=-=-=-=');
     // if(!come){
     //   other_data = JSON.parse(baseObj.detailList[2].contentJson)
     //   lis_data = JSON.parse(baseObj.detailList[4].contentJson)
@@ -109,7 +109,7 @@ class PreviewBody extends Component {
           <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.showDetails}></PreviewInspect>
+          <PreviewInspect dataJson={dataStr.lis} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetailsCopy}></PreviewInspect>
           <ItemPart dataStr={dataStr.pacs} title={'辅检：'} type={2}></ItemPart>
           <ItemPart dataStr={dataStr.diag} title={'诊断：'} type={2} lastDot={true}></ItemPart>
           <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>

src/components/PreviewBody/index.less

@@ -103,6 +103,9 @@ table{
 .assistTableTdFst {
   width: 32%;
 }
+.adviceTableTdFst {
+  width: 60%;
+}
 .assistTableTdSec {
   width: 16%;
   position: relative;

src/store/async-actions/historyTemplates.js

@@ -1,5 +1,5 @@
 import axios from '@utils/ajax';
-import { pushAllDataList,didPushParamChange } from '@utils/tools';
+import { pushAllDataList, didPushParamChange, pushHistoryDataList } from '@utils/tools';
 import { initHistory } from '@store/actions/historyTemplates';
 import { HISTORY_GETHOSPITALINFO } from '@store/types/historyTemplates';
 import Notify from '@commonComp/Notify';
@@ -35,7 +35,9 @@ export const getHistempDetail = (item) => {
             const data =res.data;
             if(data.code == 0){
                 let tmpData = data.data
+                console.log(tmpData,'============');
                 // pushAllDataList(item.sign,'push',tmpData,'history')       //引用
+                pushHistoryDataList(tmpData);       //引用
                 // if(didPushParamChange()) {
                 //   dispatch(billing());
                 // }

src/store/async-actions/print.js

@@ -157,8 +157,6 @@ export const saveMedicalData = () =>{
         "preview": JSON.stringify(preview),  // 左侧病历预览信息
         "sex": formatFormParmas('patientSex', patInfoData),
     }
-
-    console.log(params,'保存病历时发送的params--------------------');
     json('/demo/templateInfo/saveTemplateInfo', params).then(res=>{
         let data = res.data
         if (data.code == 0) {            

src/utils/tools.js

@@ -164,14 +164,21 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 
  // 返回文本信息 转换preview 数据  转为json
 const formatTextInfo = (baseList) =>{
-  console.log(baseList,'=========baseList==========');
-  let labelList = {
+  // console.log(baseList,'=========baseList==========');
+  // 化验数据
+  let inspectLabelList = {
     labelListSmall: [],
     labelListBig: [],
   };
-  labelList.labelListSmall = baseList.inspect.labelListSmall;
-  labelList.labelListBig = baseList.inspect.labelListBig;
-  console.log(labelList, 'labelList========');
+  inspectLabelList.labelListSmall = baseList.inspect.labelListSmall;
+  inspectLabelList.labelListBig = baseList.inspect.labelListBig;
+  // 医嘱数据
+  let newAdviceLabelList = {
+    labelListSmall: [],
+    labelListBig: [],
+  };
+  newAdviceLabelList.labelListSmall = baseList.newAdvice.labelListSmall;
+  newAdviceLabelList.labelListBig = baseList.newAdvice.labelListBig;
 
   return {
     chief: JSON.stringify(baseList.mainSuit.saveText),
@@ -183,13 +190,25 @@ const formatTextInfo = (baseList) =>{
     menstruationHistory: JSON.stringify(baseList.menstruationHistory.saveText),
     vital: JSON.stringify(baseList.checkBody.saveText),
     //  'lis': baseList.inspect.labelListSmall,  // 化验
-    lis: labelList, // 化验
+    lis: inspectLabelList, // 化验
     pacs: baseList.assistCheck.dataString,
     diag: baseList.diagnosticList.diagnosticStr,
-    advice: baseList.newAdvice.labelListSmall,
+    advice: newAdviceLabelList,
   };
 }
 
+// 回读数据_lcq_2020.08.17
+const pushHistoryDataList = (reData) =>{
+ store.getState().inspect.context.scrollArea&&store.getState().inspect.context.scrollArea.scrollTop()
+ let dataJson = JSON.parse(reData.preview)
+ console.log(dataJson, '=dataJson');
+ // 清空头部表单数据 
+
+}
+
+
+
+
 
 /**
  * 
@@ -1829,63 +1848,64 @@ function checkDeptContent(jsonStr,tmpLis){
 }
 
 module.exports = {
-    getIds,
-    getWindowInnerWidth,
-    getWindowInnerHeight,
-    getLabelIndex,
-    fullfillText,
-    checkFullfillText,
-    dateParser,
-    isNotNull,
-    isNull,
-    deepClone,
-    isIE,
-    storageLocal,
-    getUrlArgObject,
-    getAllDataList,
-    getAllDataStringList,
-    pushAllDataList,
-    filterArr,
-    filterDataArr,
-    filterOtherDataArr,
-    preventDefault,
-    handleEnter,
-    didPushParamChange,
-    getEMRParams,
-    getMRInfo,
-    windowEventHandler,
-    isAllClear,
-    normalVal,
-    getPageCoordinate,
-    windowRemoveEventHandler,
-    timestampToTime,
-    formatContinueDots,
-    inspectAndAssist,
-    getCurrentDate,
-    ifOtherClear,
-    readyKeepHistory,
-    parseChartData,
-    getCalendarDate,
-    downloadExportedData,
-    getStatusImg,
-    parseNameVal,
-    getStringPlus,
-    getPushLists,
-    getPushList,
-    getAllString,
-    resetTagtype,
-    handleLocalDelTag,
-    shiftLocalDelTag,
-    setPosition,
-    isAllPartClear,
-    getDomUpDown,
-    setFontColorSize,
-    moveEnd,
-    getLifeLabels,
-    getValuedLabels,
-    removeRepeat,
-    handleMouseUp,
-    checkDeptContent,
-    formatTextInfo,
-    getArrow,
+  getIds,
+  getWindowInnerWidth,
+  getWindowInnerHeight,
+  getLabelIndex,
+  fullfillText,
+  checkFullfillText,
+  dateParser,
+  isNotNull,
+  isNull,
+  deepClone,
+  isIE,
+  storageLocal,
+  getUrlArgObject,
+  getAllDataList,
+  getAllDataStringList,
+  pushAllDataList,
+  filterArr,
+  filterDataArr,
+  filterOtherDataArr,
+  preventDefault,
+  handleEnter,
+  didPushParamChange,
+  getEMRParams,
+  getMRInfo,
+  windowEventHandler,
+  isAllClear,
+  normalVal,
+  getPageCoordinate,
+  windowRemoveEventHandler,
+  timestampToTime,
+  formatContinueDots,
+  inspectAndAssist,
+  getCurrentDate,
+  ifOtherClear,
+  readyKeepHistory,
+  parseChartData,
+  getCalendarDate,
+  downloadExportedData,
+  getStatusImg,
+  parseNameVal,
+  getStringPlus,
+  getPushLists,
+  getPushList,
+  getAllString,
+  resetTagtype,
+  handleLocalDelTag,
+  shiftLocalDelTag,
+  setPosition,
+  isAllPartClear,
+  getDomUpDown,
+  setFontColorSize,
+  moveEnd,
+  getLifeLabels,
+  getValuedLabels,
+  removeRepeat,
+  handleMouseUp,
+  checkDeptContent,
+  formatTextInfo,
+  getArrow,
+  pushHistoryDataList,
 };