新建新分支

src/common/components/DropList/index.jsx

@@ -38,6 +38,7 @@ class DropList extends Component{
     return <div className={this.getClass()} contentEditable='false'>
       <ul>
         {data&&data.map((it)=>{
+          /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
           return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
         })}
         <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>

src/components/CopyRight/index.less

@@ -50,7 +50,7 @@
         left: 50%;
         margin-left: -410px;
         background: #fff;
-        top: 20%;
+        top: 65px;
        
         img{
           float: right;
@@ -74,8 +74,6 @@
         }
         .content {
           padding: 10px;
-          max-height: 400px;
-          overflow: auto;
         }
       }
     }

src/components/RadioDrop/index.jsx

@@ -55,6 +55,7 @@ class RadioDrop extends Component{
       default:
         // text = item.labelPrefix+item.name+item.labelSuffix;
         text = item.name;
+        // text = item.questionDetailList&&item.questionDetailList.length>0?item.questionDetailList[0].name: item.name;
     }
     handleSelect&&handleSelect({ikey,id:item.id,text,mainSaveText});
   }

src/containers/SpreadDrop.js

@@ -362,8 +362,17 @@ function mapDispatchToProps(dispatch,store){
         const bigData = await getCommSymptomPush();
         let result = bigData.data;
         if(+result.code == 0){
-          let pushDataList = result.data.symptom;
-          if(pushDataList.length > 0){
+          // let pushDataList = result.data.symptom;
+          let bigDataList = result.data.symptom;
+          let pushDataList = [];
+          if(bigDataList.length>0){//剔除没有id
+            pushDataList = bigDataList.filter(function(item){
+              return item.id
+            });
+          }else{
+            pushDataList = bigDataList;
+          }
+          /*if(pushDataList.length > 0){
             if(obj.type == 1){// 主诉--添加症状
               dispatch({
                 type:GET_BIGDATAPUSH,
@@ -377,10 +386,25 @@ function mapDispatchToProps(dispatch,store){
                 info:obj
               })
             }
-          }else{//推送无数据显示空下拉--1.9
-            /*Notify.info("暂无推送");
-            return*/
-          }
+          }else{
+            Notify.info("暂无推送");
+            // return
+          }*/
+          //推送无数据显示空下拉并提示暂无推送--1.9/1.18
+          if(pushDataList.length == 0){Notify.info("暂无推送");}
+          if(obj.type == 1){// 主诉--添加症状
+              dispatch({
+                type:GET_BIGDATAPUSH,
+                data:pushDataList,
+                info:obj
+              })
+            }else if(obj.type == 2){// 现病史--添加其他症状
+              dispatch({
+                type:CURRENT_GET_BIGDATAPUSH,
+                data:pushDataList,
+                info:obj
+              })
+            }
         }else{
           console.log(result.msg);
           // 接口请求失败，不往下执行显示下拉

src/store/actions/currentIll.js

@@ -73,9 +73,10 @@ export const setData = (state,action) =>{
     objToArr.push(mainLabelModule[m]);
   }
   // 过滤掉没有mapping的数据
-  let mainLabelModuleArr = objToArr.filter((item)=>{
+  let mainLabelModuleArr = objToArr;
+  /*let mainLabelModuleArr = objToArr.filter((item)=>{
     return item.questionMapping.length>0;
-  })
+  })*/
   
   if (useEmpty) {
     res.data = res.emptyData;
@@ -128,10 +129,9 @@ export const setData = (state,action) =>{
           mainLabelModuleArr.map((v,i)=>{
             if(mainCopy[k].id==v.id){
               ind++;
-              // newMainCopy.splice(k+1,0,...v.questionMapping);
               let items = v.questionMapping.filter((item)=>{
                               return item.symptomType==0||item.symptomType==1;
-                            })  
+                            })          
               lengArr[k] = items.length;  //每一个主诉尾巴长度        
               /*if(ind==1){
                 preLength = items.length;
@@ -150,7 +150,8 @@ export const setData = (state,action) =>{
       if(withs.length>0){
         let withInd = 0;
         let withInsertInd = 0;
-        let withPreLength = 0;
+        // let withPreLength = 0;
+        let withLengArr=[];
         for(let d=0; d <withs.length;d++){
           mainLabelModuleArr.map((v,i)=>{
             if(withs[d].id==v.id){
@@ -158,10 +159,14 @@ export const setData = (state,action) =>{
               let items = v.questionMapping.filter((item)=>{
                               return item.symptomType==0||item.symptomType==2;
                             })
-              if(withInd==1){
+              /*if(withInd==1){
                 withPreLength = items.length;
               }else{
                 withInsertInd += withPreLength;
+              }*/
+              withLengArr[d] = items.length;
+              if(withInd>1){
+                withInsertInd += withLengArr[d-1];
               }
               newWiths.splice(d+withInsertInd+1,0,...items);
             }
@@ -308,6 +313,11 @@ export function setRadioValue(state,action){
     });
   }else{
     item.questionMapping[subInx].value = text;
+    /*if(item.questionMapping[subInx].controlType==1){//例如：有无治疗-未经治疗
+      item.value = text;
+    }else{
+      item.questionMapping[subInx].value = text;
+    }*/
     let hasValue = false;
     const sub = item.questionMapping.map((it)=>{
       //添加选中状态
@@ -376,9 +386,10 @@ export const bigDataSymptom = (state,action) => {
   const index = action.info.ikey;
   let labelInx = getLabelIndex(index);
   // 添加症状 暂时剔除没有id、questionMapping字段的数据
-  let pushDataList = action.data.filter(function(item){
+  let pushDataList = action.data;
+  /*let pushDataList = action.data.filter(function(item){
     return item.id
-  });
+  });*/
   let dataList = inlineDatas[labelInx].questionMapping;
   for(let k=0; k<dataList.length; k++){
     if(dataList[k].controlType == 99){

src/store/actions/mainSuit.js

@@ -53,16 +53,16 @@ export const getBigSymptom = (state,action) => {
   const index = action.info.ikey;
   let labelInx = getLabelIndex(index);
   // 添加症状 暂时剔除没有id、questionMapping字段的数据
-  let pushDataList = action.data.filter(function(item){
+  let pushDataList = action.data;
+  /*let pushDataList = action.data.filter(function(item){
     return item.id
-  });
+  });*/
   let dataList = inlineDatas[labelInx].questionMapping;
   for(let k=0; k<dataList.length; k++){
     if(dataList[k].controlType == 99){
       dataList[k].questionDetailList = pushDataList;
     }
   }
-  
   return res;
 }
 

src/store/actions/pushMessage.js

@@ -44,12 +44,11 @@ function getAdviceStr(advice) {
 			if(scheme[i].treatment[j].treatmentStr === '') {
 				AdviceStr = AdviceStr + scheme[i].treatment[j].treatmentStr
 			} else {
-				AdviceStr = AdviceStr + ', ' + scheme[i].treatment[j].treatmentStr
+				AdviceStr = AdviceStr.substring(1, AdviceStr.length) + ', ' + scheme[i].treatment[j].treatmentStr
 			}
 			
 		}
 	}
-	AdviceStr = AdviceStr.substring(1, AdviceStr.length)
 	if(assay || check)  { 
 		AdviceStr = assay + check +'; ' + AdviceStr;
 	}	
@@ -93,7 +92,7 @@ export const addScheme = (state, action) => {
    //将同类药添加到一起
 	for (let i = 0; i < scheme[RepeatIndex].treatment.length; i++) {
 		for (let j = 0; j < treatment.length; j++) {
-			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].drugsName === treatment[j].drugsName) {
+			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id) {
 				for(let z = 0; z < treatment[j].medicitionsList.length; z++) {
 					if(treatment[j].medicitionsList[z].selected) {
 						if(scheme[RepeatIndex].treatment[i].treatmentStr !== '') {

src/utils/ajax.js

@@ -51,7 +51,7 @@ const post=(url,data)=>{
 
   return axios({
     method:'post',
-    url:url,
+    url:host+url,
     data
   });
 };
@@ -62,7 +62,7 @@ const json=(url,data)=>{
   return new Promise((resolve,reject)=>{
     $.ajax({
       method:'post',
-      url:url,
+      url:host+url,
       data:JSON.stringify(data),
       contentType:"application/json; charset=UTF-8",
       success:function(res){
@@ -76,7 +76,7 @@ const json=(url,data)=>{
 };
 
 const get=(url)=>{
-  return axios.get(url).then(data=>data.data);
+  return axios.get(host+url).then(data=>data.data);
 };
 
 module.exports={

src/utils/config.js

@@ -1,5 +1,6 @@
 // const host='http://192.168.3.100:5050';//王峰
 const host='http://192.168.2.241:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:8080'; //周铁刚
 // const newIcssVisitUrl = '223.93.170.82:13000';    //icss服务访问地址（跳转目的地），不能加http://