推送接口主诉现病史合并，治疗方案容错

src/components/DiagnosticList/index.jsx

@@ -80,7 +80,7 @@ class DiagnosticList extends Component {
         return(
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
-                        const hasTreat = item.treat.commonTreatment && item.treat.surgeryTreatment && item.treat.treatment.length>0
+                        const hasTreat = item.treat&&item.treat.commonTreatment && item.treat.surgeryTreatment && item.treat.treatment.length>0
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img src={diagUp}/></span>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img src={diagDown}/></span>}

src/store/async-actions/fetchModules.js

@@ -112,7 +112,7 @@ export function getInitData(){
       pacs: emrData.pacs,
       sex: emrData.sex,
       vital:emrData.vital,
-      symptom: emrData.current||emrData.main
+      symptom: emrData.current + emrData.main
     };
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){

src/store/async-actions/treat.js

@@ -42,7 +42,7 @@ export const addDiagnostic = (item) => {
                 "other": emrData.other,
                 "pacs": emrData.pacs,
                 "sex": emrData.sex,
-                "symptom": emrData.current||emrData.main,
+                "symptom": emrData.current + emrData.main,
                 "vital": emrData.vital
             };
             
@@ -102,7 +102,7 @@ export const getTreatResult = (item) =>{
             "other": emrData.other,
             "pacs": emrData.pacs,
             "sex": emrData.sex,
-            "symptom": emrData.current||emrData.main,
+            "symptom": emrData.current + emrData.main,
             "vital": emrData.vital
         };