Merge branch 'byll6.0' into newVersion6.0

src/store/async-actions/diagnosticSearch.js

@@ -30,9 +30,9 @@ export const getSearchList = (val,flag) => {
         }
         json('/demo/retrieval/index',{
             "type":'4',
-            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
+            "age": formatFormParmas('patientAge',state.patInfo.patInfoData),
             "inputStr": val,
-            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
+            "sex": formatFormParmas('patientSex',state.patInfo.patInfoData),
         })
         .then((res)=>{
             if(res.data.code==0){