Browse Source

历史病例引用

zhouna 4 years ago
parent
commit
46e5fa96f8

+ 3 - 1
src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -311,7 +311,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;
+        //console.log(1,dataStr)
         const getAllDataStringList = (dataStr) =>{           //获取所有模块文本的数据
             let jsonDataString = {};
             jsonDataString.lis = {};
@@ -326,6 +327,7 @@ class HistoryCaseContainer extends React.Component {
             jsonDataString.lis = dataStr[8] && dataStr[8].content || '';      //检验导入填写
             jsonDataString.pacs = dataStr[9] && dataStr[9].content || '';     //检查
             jsonDataString.diag = dataStr[10] &&dataStr[10].content || '';      //诊断
+            jsonDataString.tcmDiag = dataStr[12] &&dataStr[12].content || '';      //诊断
             jsonDataString.advice = dataStr[11] && dataStr[11].content || '';       //医嘱
             return jsonDataString;
         }

+ 2 - 1
src/components/PreviewBody/index.jsx

@@ -82,7 +82,7 @@ class PreviewBody extends Component {
     }
   }
   render() {
-    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;
+    const { show, preInfo, dataJson, dataStr, baseObj, flg ,come,showAssessBtn,showHistoryCases} = this.props;console.log(3,dataStr)
     let other_data={},lis_data={},pas_data={},other_yjs='',access='',adviceData={};
     let isShowSex = baseObj.sex !== 2 ? false : true
     const contStyle = {
@@ -132,6 +132,7 @@ class PreviewBody extends Component {
           <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>
+          <ItemPart dataStr={dataStr.tcmDiag} title={'中医诊断:'} type={2} lastDot={true}></ItemPart>
           <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>
          
         </table>

+ 3 - 0
src/store/actions/diagnosticList.js

@@ -276,5 +276,8 @@ export function reDiagData(state, action) {
     res.diagnosticList = action.params[10].contentValue;
     res.diagnosticStrNoType = action.params[10].contentJson;
     res.diseaseName = action.params[10].diseaseName;
+    //中医数据
+    res.tcmList =action.params[12].contentValue;
+    res.otherIndex = action.params[12].diseaseName;
     return res;
 }

+ 2 - 1
src/store/async-actions/diagnosticList.js

@@ -5,12 +5,13 @@ import { SET_READ_MODE } from "@store/types/typeConfig";
 import {storageLocal} from '@utils/tools'
 import { SAVE_FREE ,SAVE_CHRONIC} from '@store/types/mainSuit';
 import {ISREAD,MODI_LOADING} from "../types/homePage";
+import {reDiagData} from "../actions/diagnosticList";
 export const isAddMainSuit = () =>{
     return (dispatch, getState) => {
         const state = getState();
         if(state.diagnosticList.diagnosticList.length === 1 && state.diagnosticList.diagnosticList[0].type === 2) {
             const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和检验查体是否为空
-                                      && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
+                                      && (state.mainSuireDiagDatat.saveText.length === 0 || state.mainSuit.saveText.length === 1
                                       &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
                                       && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus.length === 0
             if(isAddMainSuitFlag) {

+ 8 - 1
src/store/async-actions/print.js

@@ -71,7 +71,7 @@ function formatFormParmas(val,arr){
 // 保存病历_lcq_new_重写
 export const saveMedicalData = () =>{
     let baseList = store.getState();
-    const { patInfo: { patInfoData },homePage:{curHos}} = baseList
+    const { patInfo: { patInfoData },homePage:{curHos}} = baseList;
     let inquiryDate = timestampToTime(new Date().getTime())  // 获取当前时间  
     let modeName = baseList.patInfo.medicalName   //病历名称
     let jsonData = getAllDataList(baseList);
@@ -153,6 +153,13 @@ export const saveMedicalData = () =>{
         contentJson: JSON.stringify(tempPreview.advice),
         type: 12,
       },
+      {
+          content: tempPreview.tcmDiag.diagnosticStr,
+          contentValue: tempPreview.tcmDiag.diagnosticList,
+          diseaseName: tempPreview.tcmDiag.diseaseName,
+          contentJson: tempPreview.tcmDiag.diagnosticStrNoType,
+          type: 13,
+      },
     ];
     // let sex = formatFormParmas('patientSex', patInfoData) === '男' ? 1 : 0
     let params = {

+ 8 - 1
src/utils/tools.js

@@ -214,7 +214,13 @@ const formatTextInfo = (baseList) =>{
     diagnosticStr: baseList.diagnosticList.diagnosticStr,
     diseaseName: baseList.diagnosticList.diseaseName,
   };
-
+    const {otherIndex} = baseList.diagnosticList;
+  let diagnosticTcmList = {
+      diagnosticList: baseList.diagnosticList.tcmList,
+      diagnosticStrNoType: otherIndex.tcmDiag+otherIndex.tcmSyndrome,
+      diagnosticStr: otherIndex.tcmDiag+otherIndex.tcmSyndrome,
+      diseaseName: otherIndex,
+  };
   return {
     chief: JSON.stringify(baseList.mainSuit.saveText),
     present: JSON.stringify(baseList.currentIll.saveText),
@@ -227,6 +233,7 @@ const formatTextInfo = (baseList) =>{
     lis: labelList, //化验
     pacs: assistLabelList,
     diag: diagnosticList,
+    tcmDiag:diagnosticTcmList,
     advice: newAdviceLabelList,
   };
 }