11

src/components/BlockEmrCont/index.jsx

@@ -80,9 +80,13 @@ class BlockEMRCont extends Component {
           <MenstruationHistory></MenstruationHistory>
           {/* <OtherHistory></OtherHistory> */}
           <CheckBody></CheckBody>
+          {/* 化验 */}
           <Inspect setHighter={this.setHighter}></Inspect>
+          {/* 辅检 */}
           <AssistCheck setHighter={this.setHighter}></AssistCheck>
+          {/* 诊断 */}
           <Diagnosis setHighter={this.setHighter} hideChronic={true}></Diagnosis>
+          {/* 医嘱 */}
           <NewAdvice setHighter={this.setHighter}></NewAdvice>
           {/* <AdviceContainer></AdviceContainer> */}
         </div>

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -283,6 +283,7 @@ class HistoryCaseContainer extends React.Component {
 
      
         const getAllDataStringList = (dataStr) =>{           //获取所有模块文本的数据
+            console.log(dataStr,'==============');
             let jsonDataString = {};
             jsonDataString.lis = {};
             jsonDataString.chief = dataStr[0] && dataStr[0].content || '';      //主诉
@@ -293,10 +294,10 @@ class HistoryCaseContainer extends React.Component {
             jsonDataString.marriageHistory = dataStr[5] &&dataStr[5].content || '';   
             jsonDataString.menstruationHistory = dataStr[6] && dataStr[6].content || '';      
             jsonDataString.vital = dataStr[7] && dataStr[7].content || '';    //查体
-            // jsonDataString.lis = dataStr[4].content || '';      //化验导入填写
-            // jsonDataString.pacs = dataStr[5].content || '';     //辅检
-            // jsonDataString.diag = dataStr[6].content || '';      //诊断
-            // jsonDataString.advice = dataStr[7].content || '';       //医嘱
+            jsonDataString.lis = dataStr[8] && dataStr[8].content || '';      //化验导入填写
+            jsonDataString.pacs = dataStr[9] && dataStr[9].content || '';     //辅检
+            jsonDataString.diag = dataStr[10] &&dataStr[10].content || '';      //诊断
+            jsonDataString.advice = dataStr[11] && dataStr[11].content || '';       //医嘱
             return jsonDataString;
         }
         return (

src/components/Operation/index.jsx

@@ -97,10 +97,12 @@ class Operation extends Component {
   }
 
   saveAll(type) {
-    // let keepState = readyKeepHistory();
-    // if(keepState == 1){
-    //     Notify.info('主诉不能为空');
-    //     return;
+    let keepState = readyKeepHistory();
+    console.log(keepState,'keepState');
+    if(keepState == 1){
+        Notify.info('主诉不能为空');
+        return;
+    }
     // }else if(keepState == 2){
     //     Notify.info('诊断不能为空');
     //     return;

src/components/PatInfo/index.jsx

@@ -21,13 +21,13 @@ class PatInfo extends Component {
         {
           label: 'patientAge',
           id: 'patientAge',
-          value: '56',
+          value: '50',
           title: '年龄'
         },
         {
           label: 'patientSex',
           id: 'patientSex',
-          value: 1,
+          value: 0,
           title: '性别'
         },
         {

src/components/PreviewBody/Inspect/index.jsx

@@ -3,6 +3,8 @@ 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']}>

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -0,0 +1,35 @@
+import React, { Component } from 'react';
+import style from "../index.less";
+class MedicalAdvice extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {  }
+  }
+  render() { 
+    const {advice} = this.props
+    return ( 
+        <tr className={style['patInfoFst']}>
+          <td className={style['patInfoSec']}>医嘱：</td>
+          <td className={style['patInfoSec']}>
+            <table style={style.assistTable}>
+              {
+              advice && advice.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.assistTableTdFor}>{item.time}</td>
+                  </tr>
+                )
+              })
+              }
+            </table>
+          </td>
+        </tr>
+
+    );
+  }
+}
+ 
+export default MedicalAdvice;

src/components/PreviewBody/index.jsx

@@ -3,6 +3,7 @@ import style from "./index.less";
 import { getStatusImg,getDomUpDown, filterDataArr, filterOtherDataArr,timestampToTime } from '@utils/tools';
 import Notify from '@commonComp/Notify';
 import Information from '../Information';
+import MedicalAdvice from './MedicalAdvice';
 import PreviewInspect from './Inspect';
 import ItemPart from './ItemPart';
 import $ from "jquery";
@@ -81,6 +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,'=======-=-=-=-=');
     // if(!come){
     //   other_data = JSON.parse(baseObj.detailList[2].contentJson)
     //   lis_data = JSON.parse(baseObj.detailList[4].contentJson)
@@ -106,10 +108,12 @@ class PreviewBody extends Component {
           <ItemPart dataStr={dataStr.marriageHistory} title={'婚育史：'} type={1}></ItemPart>
           <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={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>
           <ItemPart dataStr={dataStr.pacs} title={'辅检：'} type={2}></ItemPart>
-          <ItemPart dataStr={dataStr.diag} title={'诊断：'} type={2} lastDot={true}></ItemPart> */}
-          <tr className={style['patInfoFst']}>
+          <ItemPart dataStr={dataStr.diag} title={'诊断：'} type={2} lastDot={true}></ItemPart>
+          <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>
+          {/* <tr className={style['patInfoFst']}>
             <td className={style['patInfoSec']}>医嘱：</td>
             <td className={`${style['patInfoSec']} ${style['pushMessage']} ${style['font14']}`}>
               {((adviceData&&adviceData.assay && adviceData.assay.length > 0) || ((adviceData&&adviceData.check)&& (adviceData&&adviceData.assay.check > 0))) && <p className={style.pushMessageTitle}><span>开单项目</span></p>}
@@ -142,7 +146,7 @@ class PreviewBody extends Component {
                 adviceData&&adviceData.adviceInput && <div dangerouslySetInnerHTML={{__html: adviceData.adviceInput}} className={style.pushMessageDes}></div>
               }
             </td>
-          </tr>
+          </tr> */}
         </table>
         <p className={style.docName}>医生签名：<span>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
         {showAssessBtn&&access?<AssessResultHis showHistoryCases={showHistoryCases} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}

src/store/async-actions/inspect.js

@@ -23,7 +23,7 @@ export const getSearchList = (val) => {
             if(res.data.code==0){
                 const data = res.data.data;let curDate=[];
                 if(type==2){
-                    curDate = data.lisDetailNames
+                    curDate = data && data.lisDetailNames
                 }else{
                     let arr = data.lisNames,tmp=[];
                     for (var key in arr) {

src/store/async-actions/print.js

@@ -118,30 +118,31 @@ export const saveMedicalData = () =>{
             "contentJson": '',
             "type": 8
         },
-        // {
-        //     "content": tempPreview.lis,
-        //     "contentValue": filterDataArr(JSON.parse(tempPreview.lis)),
-        //     "contentJson": '',
-        //     "type": 9
-        // },
-        // {
-        //     "content": tempPreview.pacs,
-        //     "contentValue": filterDataArr(JSON.parse(tempPreview.pacs)),
-        //     "contentJson": '',
-        //     "type": 10
-        // },
-        // {
-        //     "content": tempPreview.diag,
-        //     "contentValue": filterDataArr(JSON.parse(tempPreview.diag)),
-        //     "contentJson": '',
-        //     "type": 11
-        // },
-        // {
-        //     "content": tempPreview.advice,
-        //     "contentValue": filterDataArr(JSON.parse(tempPreview.advice)),
-        //     "contentJson": '',
-        //     "type": 12
-        // }
+        // 化验
+        {
+            "content": tempPreview.lis,
+            "contentValue": tempPreview.lis,
+            "contentJson": JSON.stringify(tempPreview.lis),
+            "type": 9
+        },
+        {
+            "content": tempPreview.pacs,
+            "contentValue": tempPreview.pacs,
+            "contentJson": JSON.stringify(tempPreview.pacs),
+            "type": 10
+        },
+        {
+            "content": tempPreview.diag,
+            "contentValue": tempPreview.diag,
+            "contentJson": '',
+            "type": 11
+        },
+        {
+            "content": tempPreview.advice,
+            "contentValue": tempPreview.advice,
+            "contentJson": JSON.stringify(tempPreview.advice),
+            "type": 12
+        }
     ]
     let params = {
         "age": formatFormParmas('patientAge', patInfoData),
@@ -156,6 +157,8 @@ 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

@@ -73,9 +73,11 @@ const getUrlArgObject = (parm) => {
     let args = qs.parse(query.substr(1));
     return args[parm];//返回对象  
 } 
+
+// 转换jsonData 数据  转为json
 const getAllDataList =(baseList) =>{           //获取所有模块结构化的数据
     let jsonData = {};
-    // console.log(baseList,'=======================');
+    jsonData.lis = {};
     jsonData.chief = baseList.mainSuit.saveText&&baseList.mainSuit.saveText[0];   // 主诉
     jsonData.currentIll = baseList.currentIll.saveText && baseList.currentIll.saveText[0];   //现病史
     jsonData.pastHistory = baseList.pastHistory.saveText && baseList.pastHistory.saveText[0];   //既往史
@@ -86,6 +88,12 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.checkBody = baseList.checkBody.saveText && baseList.checkBody.saveText[0];   //查体
 
 
+    jsonData.lis.labelList = baseList.inspect.labelListSmall &&  baseList.inspect.labelListSmall;      //化验
+    jsonData.pacs = baseList.assistCheck.assistLabel;     //辅检
+    jsonData.diag = baseList.diagnosticList.diagnosticList;      //诊断
+    jsonData.advice = baseList.newAdvice.labelListSmall;       //医嘱
+
+
     //月经史公式
     // const other = baseList.otherHistory;
     // jsonData.lis = {};
@@ -154,22 +162,32 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
     return jsonDataString;
 }
 
- // 返回文本信息  _lcq
+ // 返回文本信息 转换preview 数据  转为json
 const formatTextInfo = (baseList) =>{
+  console.log(baseList,'=========baseList==========');
+  let labelList = {
+    labelListSmall: [],
+    labelListBig: [],
+  };
+  labelList.labelListSmall = baseList.inspect.labelListSmall;
+  labelList.labelListBig = baseList.inspect.labelListBig;
+  console.log(labelList, 'labelList========');
+
   return {
-       'chief': JSON.stringify(baseList.mainSuit.saveText),
-      'present': JSON.stringify(baseList.currentIll.saveText),
-       'pastHistory': JSON.stringify(baseList.pastHistory.saveText),
-       'personalHistory': JSON.stringify(baseList.personalHistory.saveText),
-       'familyHistory': JSON.stringify(baseList.familyHistory.saveText),
-       'marriageHistory': JSON.stringify(baseList.marriageHistory.saveText),
-       'menstruationHistory': JSON.stringify(baseList.menstruationHistory.saveText),
-       'vital': JSON.stringify(baseList.checkBody.saveText),
-//        'lis': baseList.inspect.inspectStrPlus,
-//        'pacs': baseList.assistCheck.dataString,
-//        'diag': baseList.diagnosticList.diagnosticStr,
-//        'advice': baseList.pushMessage.AdviceStr
-  }
+    chief: JSON.stringify(baseList.mainSuit.saveText),
+    present: JSON.stringify(baseList.currentIll.saveText),
+    pastHistory: JSON.stringify(baseList.pastHistory.saveText),
+    personalHistory: JSON.stringify(baseList.personalHistory.saveText),
+    familyHistory: JSON.stringify(baseList.familyHistory.saveText),
+    marriageHistory: JSON.stringify(baseList.marriageHistory.saveText),
+    menstruationHistory: JSON.stringify(baseList.menstruationHistory.saveText),
+    vital: JSON.stringify(baseList.checkBody.saveText),
+    //  'lis': baseList.inspect.labelListSmall,  // 化验
+    lis: labelList, // 化验
+    pacs: baseList.assistCheck.dataString,
+    diag: baseList.diagnosticList.diagnosticStr,
+    advice: baseList.newAdvice.labelListSmall,
+  };
 }