Merge remote-tracking branch 'origin/TCM0513' into testNew

src/components/Diagnosis/index.jsx

@@ -99,8 +99,8 @@ class Diagnosis extends Component {
         const {isTcm,tcmList} = this.props;
         if (isTcm) {    //添加中医诊断后才显示中医症候添加按钮
             const len = tcmList.length>0?tcmList.length-1:0;
-            const showNext = tcmList.length===0||(tcmList.length>0&&tcmList[len].tcmDiag&&tcmList[len].tcmSyndrome);
-            const showZh = tcmList.length>0&&tcmList[len].tcmDiag&&!tcmList[len].tcmSyndrome;
+            const notAll = tcmList.find((it)=>!it.tcmSyndrome);     //是否有未填写的症候
+            const showNext = tcmList.length===0||!notAll;
             return (<div id="diagnosisTcmResult">
                 <ItemBox id="tcmDiagnosis" title="中医诊断" boxHeight='auto' hideAllDrop={this.props.hideAllDrop}
                          titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>

src/components/DiagnosticItem/index.jsx

@@ -51,7 +51,7 @@ class DiagnosticItem extends Component{
             const lastTcmDiag = tcmList[tcmList.length-1].tcmDiag;
             for (let i = 0; i < tcmList.length-1; i++) {
                 if(tcmList[i].tcmDiag+tcmList[i].tcmSyndrome=== lastTcmDiag+item.name) {
-                    Notify.info('该中医诊断+中医症候已存在');
+                    Notify.info('该中医诊断+中医证候已存在');
                     return
                 }
             }

src/components/DiagnosticList/index.jsx

@@ -355,21 +355,18 @@ class DiagnosticList extends Component {
                             {diagList.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}
                             <span className={style['diag-number']} style={{fontWeight:index === 0 ?'bold':'normal'}}>{index === 0 ? '1' : index+1}</span>
 
-                                {tcmDiag?<span className={style['diag-name']}
-                                  onMouseEnter={this.handleMouseEnterDrug.bind(this,index)}
-                                  onMouseLeave = {this.handleMouseLeaveDrug.bind(this)}
-                            >
+                                {tcmDiag?<span className={style['diag-name']}>
                                       <span title={tcmDiag} className={style['diag-name-box']} style={{'max-width': '300px'}}>
-                                        <input type="text" value={tcmDiag} onFocus={(e)=>{this.handleFocus()}} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index)}/>
+                                        <input type="text" value={tcmDiag} disabled={true}/>
                                       </span>
 
                                     </span>:<Add showText="添加中医诊断结果" isTcm={isTcm} handleClick={this.handleTcmShowSearch} id="addTcmDiag" height="50px" />}
-                            {tcmSyndrome?<span className={style['diag-name']} onMouseEnter={this.handleMouseEnterDrug.bind(this,index)} onMouseLeave = {this.handleMouseLeaveDrug.bind(this)}>
+                            {tcmSyndrome?<span className={style['diag-name']}>
                                       <span title={tcmSyndrome} className={style['diag-name-box']} style={{'max-width': '300px'}}>
-                                        <input type="text" value={tcmSyndrome} onFocus={(e)=>{this.handleFocus()}} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index)}/>
+                                        <input type="text" value={tcmSyndrome} disabled={true}/>
                                       </span>
 
-                                    </span>:(tcmDiag?<Add showText="添加中医症候" isTcm={isTcm} handleClick={this.handleSymShowSearch} id="addSymDiag" height="50px" />:'')}
+                                    </span>:(tcmDiag?<Add showText="添加中医证候" isTcm={isTcm} handleClick={this.handleSymShowSearch} id="addSymDiag" height="50px" />:'')}
                                 {tcmDiag&&tcmSyndrome?'':<DiagResultSearch
                                         refreshScroller={refreshScroller}
                                         setHighter={setHighter}

src/components/PreviewBody/index.jsx

@@ -131,7 +131,7 @@ class PreviewBody extends Component {
           <ItemPart dataStr={dataStr.vital} title={'查体：'} type={1}></ItemPart>          
           <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.diag} title={'西医诊断：'} type={2} lastDot={true}></ItemPart>
           <ItemPart dataStr={dataStr.tcmDiag} title={'中医诊断：'} type={2} lastDot={true}></ItemPart>
           <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>
          

src/store/actions/diagnosticList.js

@@ -45,7 +45,7 @@ export const addTcmDiagnostic = (state, action) => {
     //console.log('addTcmDiagnostic',action)
     const { isSym } = action;
     let obj=null;
-    //如果上一个诊断和症候不全，则不添加新行
+    //如果前面有一个诊断和症候不全，则不添加新行（不一定是上一个，但肯定只有一个不全）
     const len = res.tcmList.length;
     if(len===0){    //len==0,只可能是添加中医诊断
         obj = {
@@ -56,7 +56,8 @@ export const addTcmDiagnostic = (state, action) => {
         res.tcmList.push(obj);
     }else{
         if(isSym){      //上一个症候没填，不用新增
-            res.tcmList[len-1].tcmSyndrome=action.item.name;
+            const noAllInx = res.tcmList.findIndex((it)=>!it.tcmSyndrome);
+            res.tcmList[noAllInx].tcmSyndrome=action.item.name;
             if(len===1){
                 res.otherIndex = {
                     "tcmDiag":res.tcmList[0].tcmDiag, //中医诊断
@@ -267,6 +268,9 @@ export function reDiagData(state, action) {
     if(action.params[12]){
         res.tcmList =action.params[12].contentValue;
         res.otherIndex = action.params[12].diseaseName;
+    }else{
+        res.tcmList =[];
+        res.otherIndex ={};
     }
     return res;
 }

src/store/async-actions/diagnosticList.js

@@ -5,13 +5,12 @@ 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.mainSuireDiagDatat.saveText.length === 0 || state.mainSuit.saveText.length === 1
+                                      && (state.mainSuit.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) {

src/utils/tools.js

@@ -184,7 +184,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 }
 
  // 返回文本信息 转换preview 数据  转为json
-const formatTextInfo = (baseList) =>{
+const formatTextInfo = (baseList) =>{console.log(1,baseList)
   // console.log(baseList,'=========baseList==========');
   let labelList = {
     labelListSmall: [],
@@ -215,10 +215,15 @@ const formatTextInfo = (baseList) =>{
     diseaseName: baseList.diagnosticList.diseaseName,
   };
     const {otherIndex} = baseList.diagnosticList;
+    const {tcmList} = baseList.diagnosticList;
+    let str = '';
+    tcmList.map((it)=>{
+        str+=it.tcmDiag+"-"+it.tcmSyndrome+','
+    });
   let diagnosticTcmList = {
       diagnosticList: baseList.diagnosticList.tcmList,
       diagnosticStrNoType: otherIndex.tcmDiag+otherIndex.tcmSyndrome,
-      diagnosticStr: otherIndex.tcmDiag+otherIndex.tcmSyndrome,
+      diagnosticStr: str,
       diseaseName: otherIndex,
   };
   return {
@@ -811,7 +816,6 @@ function filterDataArr(arrTmp){   //数据处理
           return '';
       }
       return it.replace(config.punReg,function(word){
-        console.log(9898)
         return word.substr(0,1);
       });
     });