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

src/components/DiagnosticItem/index.jsx

@@ -47,12 +47,14 @@ class DiagnosticItem extends Component{
     }
     chooseDiagodal(item) {
         const { diagnosticList,isTcm,tcmList,showSym} = this.props;
-        if(isTcm&&showSym){ //添加的是中医症候，判断是否重复，添加中医诊断不需要判断
-            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('该中医诊断+中医证候已存在');
-                    return
+        if(isTcm){ //添加的是中医症候，判断是否重复，添加中医诊断不需要判断
+            if(showSym){
+                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('该中医诊断+中医证候已存在');
+                        return
+                    }
                 }
             }
         }else{

src/components/DiagnosticList/index.jsx

@@ -148,7 +148,7 @@ class DiagnosticList extends Component {
     showTreat(item, idx) {
         const  { getTreatResult,getBilling,isTcm } = this.props;
         getTreatResult && getTreatResult(item,idx,isTcm);
-        getBilling({mode:10});
+        getBilling({isTcm});
     } 
     handleClickDiag(item) {
         const { getTips } = this.props;

src/utils/tools.js

@@ -222,7 +222,7 @@ const formatTextInfo = (baseList) =>{console.log(1,baseList)
     });
   let diagnosticTcmList = {
       diagnosticList: baseList.diagnosticList.tcmList,
-      diagnosticStrNoType: otherIndex.tcmDiag+otherIndex.tcmSyndrome,
+      diagnosticStrNoType: otherIndex?(otherIndex.tcmDiag+otherIndex.tcmSyndrome):'',
       diagnosticStr: str,
       diseaseName: otherIndex,
   };