合并liucf分支

src/components/MainSuit/index.jsx

@@ -222,33 +222,32 @@ class MainSuit extends Component{
     const {freeText,saveText,datas,clearSearch,getSymptomFeature,currentData,saveChronic} = this.props;
     const that = this;
     let data = this.state.inpText;
+    const inner = e.target.innerText;
     //分词-现病史没有模板的时候才去获取
-    if(currentData&&currentData.length==0){
-      const me = getFeature(e.target.innerText);
-      me.then((res)=>{
-        // console.log(222,res)
+    if(inner.trim() && currentData&&currentData.length==0){
+      getFeature(inner).then((res)=>{
         if(res.data.code==0){
           const result = res.data.data;
-          getSymptomFeature && getSymptomFeature(result);
-          // 判断是否为慢病复诊-请求慢病模板
-          /*let flg = this.ifClear();
-          if(result.? && !flg){
-            saveChronic && saveChronic({name:'糖尿病',id:21773});
-          }*/
+          // 慢病
+          if(result && result[0].chronicLabel==1){
+            let flg = this.ifClear();
+            if(!flg){
+              saveChronic && saveChronic(result[0]);
+            }
+          }else{
+            getSymptomFeature && getSymptomFeature(result);
+          }
         }
       })
     }
     if(!isIE()){
-      /*if(currentData&&currentData.length==0){//现病史没有模板的时候才去获取
-        getSymptomFeature && getSymptomFeature(e.target.innerText);
-      } */
-      e.target.innerText?(e.target.innerText=""):(e.target.innerHTML="")
+      inner?(e.target.innerText=""):(e.target.innerHTML="")
       freeText && freeText(data.trim());
       // 慢病模板获取：精确匹配"糖尿病复诊"，储存慢病字段
-      let flg = this.ifClear();
+      /*let flg = this.ifClear();
       if((data.trim()=='糖尿病复诊'||data.trim()=='糖尿病(复诊)'||data.trim()=='糖尿病（复诊）') && !flg){
-        saveChronic && saveChronic({name:'糖尿病',id:21773});
-      }
+        saveChronic && saveChronic({name:'糖尿病',conceptId:21773});
+      }*/
     }else{
       if(datas.length==0){
         const ev = e || window.event;

src/components/WrapModalBodyPac/index.less

@@ -270,4 +270,4 @@
       }
     }
   }
-}
+}

src/store/async-actions/diagnosticSearch.js

@@ -6,13 +6,13 @@ import { GET_SEARCH } from '@store/types/emergencyHis';
 export const getSearchList = (val,flag) => {
     if(val.trim() == ''){
         // const data = [];
-        if(flag){//��ʷ����
+        if(flag){//ÀúÊ·²¡Àú
             return (dispatch) =>  dispatch({
                 type: GET_SEARCH,
                 searchResult: []
             })
         }
-        return (dispatch) =>  dispatch({//���
+        return (dispatch) =>  dispatch({//Õï¶Ï
             type: GET_SEARCH_RESULT,
             searchResult: []
         })
@@ -36,12 +36,12 @@ export const getSearchList = (val,flag) => {
         })
         .then((res)=>{
             const data = res.data.data;
-            if(flag){ //��ʷ����
+            if(flag){ //ÀúÊ·²¡Àú
                 dispatch({
                     type: GET_SEARCH,
                     searchResult: data
                 })
-            }else{//���
+            }else{//Õï¶Ï
                 dispatch({
                     type: GET_SEARCH_RESULT,
                     searchResult: data

src/store/async-actions/homePage.js

@@ -38,7 +38,7 @@ export const getInitModules= (dispatch,getStore)=>{
   const chronicMagItem = state.diagnosticList.chronicMagItem;//诊断入口
   // const chronicId = chronicMagItem?chronicMagItem.id:'';
   const chronicDesease = state.mainSuit.chronicDesease; //主诉入口
-  const chronicId = chronicDesease&&chronicDesease.id||chronicMagItem&&chronicMagItem.conceptId||'';
+  const chronicId = chronicDesease&&chronicDesease.conceptId||chronicMagItem&&chronicMagItem.conceptId||'';
   const param = {
     age:message.patientAge,
     sexType:message.sex,