Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize

src/components/ChronicInfo/index.jsx

@@ -216,8 +216,9 @@ class ChronicInfo extends React.Component{
     addAssessItem(v,pIndex,i);
   }
   addFormula(it,v,pIndex,i){
+    const {chronicMagItem} = this.props;
     this.closeFormula(it);
-    this.handleAddAssessItem(v,pIndex,i);
+    chronicMagItem&&this.handleAddAssessItem(v,pIndex,i);
   }
   handleReg(e){   //只能输入数字
     const hasDot = e.target.value.indexOf('.')!=-1;
@@ -267,14 +268,14 @@ class ChronicInfo extends React.Component{
   }
   confirmOption(parent,pIndex,i){//可能结果确定
     const {radioVal,possible} = this.state;
-    const {savePossibleResult} = this.props;
+    const {savePossibleResult,chronicMagItem} = this.props;
     this.setState({
       possible:Object.assign({},possible,radioVal),
       radioVal:Object.assign({},possible,radioVal),//不设置radioVal只有最近一次选中的值
       optionId:null,
     });
     savePossibleResult&&savePossibleResult({possible:Object.assign({},possible,radioVal),radioVal:Object.assign({},possible,radioVal)})
-    this.handleAddAssessItem(parent,pIndex,i);
+    chronicMagItem&&this.handleAddAssessItem(parent,pIndex,i);
 
   }
   handleSaveCalcu(obj){
@@ -343,7 +344,7 @@ class ChronicInfo extends React.Component{
   }
   
   getDetail(){
-    const {data,formulaResult,calcuResult,indexs} = this.props;
+    const {data,formulaResult,calcuResult,chronicMagItem} = this.props;
     const {formulaId,optionId,possible,radioVal,calcuValues,currentIndex,hasEnterImg} = this.state;
     let list = data&&data.map((v,i)=>{
                     return <div className={style["list"]}>
@@ -387,7 +388,7 @@ class ChronicInfo extends React.Component{
                             </span>
                             {formulaId&&formulaId==v.conceptId&&<MiniToast title={it.content.name}
                                 icon={allTableIcon}
-                                confirmText='加入病例记录'
+                                confirmText={chronicMagItem?'加入病例记录':'确定'}
                                 show={formulaId&&formulaId==v.conceptId?true:false}
                                 close={this.closeFormula.bind(this,it)}
                                 confirm={this.addFormula.bind(this,it,v,i,j)}
@@ -451,7 +452,7 @@ class ChronicInfo extends React.Component{
                             </span>
                             <MiniToast title='结果选择'
                                 icon={checkIcon}
-                                confirmText='加入病例记录'
+                                confirmText={chronicMagItem?'加入病例记录':'确定'}
                                 show={optionId&&optionId==v.conceptId?true:false}
                                 close={this.closeOption}
                                 confirm={this.confirmOption.bind(this,v,i,j)}
@@ -498,7 +499,7 @@ class ChronicInfo extends React.Component{
     const {comfirnFlag,flag,ff} = this.state;
     const {chronicMagItem,chronicDesease,formulaResult,showHide,slideUp} = this.props;
     const scaleFooter = <Footer print={true}
-                                footText={showHide.isPop?"确定":"加入病例记录"}
+                                footText={showHide.isPop||!chronicMagItem?"确定":"加入病例记录"}
                                 handlePrint={this.onPrint}
                                 handleConfirm={()=>{this.comfirnTable()}}/>;
     return <div className={style["tips"]} style={{marginBottom:'15px'}}>

src/components/CurrentIll/index.jsx

@@ -52,7 +52,8 @@ class CurrentIll extends Component{
       })
     }else if(!text) {//现病史框里没有内容时才设置模板
       let num = moduleNum.num;//主诉使用了几个模板
-      if(data.length==0 && (!isChronic || JSON.stringify(isChronic)=='{}') ){
+      //console.log(999,isChronic)
+      if(data.length==0 && !isChronic){
         clearTimeout(setDataTimer);
         setDataTimer = setTimeout(function(){//延时，等待主诉失焦数据返回
             setData && setData({num,mainData,mainIds,symptomFeature:symptomFeature.featureData,isChronic,mainTailIds});   

src/components/DiagnosticList/index.jsx

@@ -254,7 +254,6 @@ class DiagnosticList extends Component {
         const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading} = this.props;
         const { visible, treatTitle ,showAssess, isAssessConfirm, radioVal, possible,assessId,disName, hasOndel, hasOnIndex} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
-        const chronicLine = chronicMagItem&&chronicMagItem.name;     //当前是否走的慢病流程
         let isChronic = false;      //是否要显示管理评估
         const footer = <Footer print={true}
                                footText="确定"
@@ -265,7 +264,7 @@ class DiagnosticList extends Component {
                     {list && (list.length > 0) && list.map((item, index) => {
                         const hasTreat = item.treat && ((item.treat.commonTreatment&&item.treat.commonTreatment.content) || (item.treat.surgeryTreatment&&item.treat.surgeryTreatment.content) || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
                            || (item.drugHistory && item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory &&item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow)
-                        isChronic = chronicLine&&item.type==2&&chronicList.findIndex((it)=>it.conceptId==item.conceptId)!=-1;
+                        isChronic = chronicMagItem&&item.type==2&&chronicList.findIndex((it)=>it.conceptId==item.conceptId)!=-1;
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.conceptId} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}

src/components/Operation/index.jsx

@@ -272,7 +272,7 @@ class Operation extends Component {
       diagShowTmp(false)
       this.setState({ title: '' })
       // 慢病标识
-      const chronicFlag = chronicMagItem&&chronicMagItem.name || chronicDesease&&chronicDesease.name?true:false;
+      const chronicFlag = chronicMagItem || chronicDesease?true:false;
       clear(chronicFlag);
     } else if (type == 3) {
       if (this.state.title.trim() == '') {

src/components/PreviewBody/index.jsx

@@ -78,7 +78,6 @@ class PreviewBody extends Component {
     const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn,showHistoryCases} = this.props;
     const other_yjs = dataStr.other?filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other):'';
     const noData = JSON.stringify(preInfo) == '{}';
-    const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
     return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
       <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "620px" }}>
         <Information baseObj={baseObj} preInfo={preInfo}></Information>

src/components/ScaleSearch/index.jsx

@@ -100,4 +100,4 @@ class ScaleSearch extends Component {
   }
 }
 
-export default ScaleSearch;
+export default ScaleSearch;

src/containers/CurrentIll.js

@@ -11,7 +11,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
 import {didPushParamChange} from '@utils/tools.js';
 
 
-function mapStateToProps(state) { //console.log(111,state);
+function mapStateToProps(state) {
   const {homePage,currentIll,mainSuit,diagnosticList} = state;
     return {
         data:currentIll.data,//主诉模板
@@ -41,7 +41,7 @@ function mapStateToProps(state) { //console.log(111,state);
         boxLeft:homePage.boxLeft,
         allModules:homePage.allModules,
         // isChronic:!!diagnosticList.chronicMagItem,
-        isChronic:mainSuit.chronicDesease&&mainSuit.chronicDesease.name?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
+        isChronic:mainSuit.chronicDesease?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
 
     }
 }

src/containers/DiagnosticList.js

@@ -23,7 +23,7 @@ function mapStateToProps(state) {
         showReferRecord: diagnosticList.showReferRecord,
         showHistoryCase: diagnosticList.showHistoryCase,
         items:state.historyTemplates.items,
-        chronicMagItem: diagnC&&diagnC.name?diagnC:state.mainSuit.chronicDesease,
+        chronicMagItem: diagnC?diagnC:state.mainSuit.chronicDesease,
         typeConfig: state.typeConfig.typeConfig,
         wholeResults:assessResult.wholeResults,
         scaleInfo: pushMessage.scaleInfo,//量表内容

src/containers/MainSuit.js

@@ -38,7 +38,7 @@ function mapStateToProps(state) {//console.log(state)
     boxLeft:homePage.boxLeft,
     currentData:state.currentIll.data,
     allModules:homePage.allModules,
-    chronicDesease:mainSuit.chronicDesease&&mainSuit.chronicDesease.name?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
+    chronicDesease:mainSuit.chronicDesease?mainSuit.chronicDesease:diagnosticList.chronicMagItem,
     items:state.historyTemplates.items,
     showHisBox:mainSuit.showHisBox,
   }

src/store/actions/diagnosticList.js

@@ -6,7 +6,7 @@ export const addDiagnostic = (state, action) => {
 
 export const delDiagnostic = (state, action) => {
     const res = JSON.parse(JSON.stringify(state));
-    res.diagnosticList = res.diagnosticList.filter(item => (item.id !== action.item.id && item.name !== action.item.name));
+    res.diagnosticList = res.diagnosticList.filter(item => (item.conceptId !== action.item.conceptId || item.name !== action.item.name));
     return res;
 }
 

src/store/async-actions/treat.js

@@ -53,7 +53,7 @@ export const addDiagnostic = (item) => {
                 "scaleName": "string",
             };
             //判断是否走慢病系统
-            const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+            const isChronic = state.diagnosticList.chronicMagItem ||state.mainSuit.chronicDesease;
             // const isChronic = true
             if (isChronic) {
                 let chronicList = JSON.parse(storageLocal.get('chronic'));
@@ -161,7 +161,7 @@ export const getTreatResult = (item) =>{
         //         "symptom": "恶心，呕吐",
         //         "vital": ""
         // }
-        const isChronic = state.diagnosticList.chronicMagItem && state.diagnosticList.chronicMagItem.name||state.mainSuit.chronicDesease && state.mainSuit.chronicDesease.name;
+        const isChronic = state.diagnosticList.chronicMagItem ||state.mainSuit.chronicDesease;
         // const isChronic = true
         if (isChronic) {
             let chronicList = JSON.parse(storageLocal.get('chronic'));

src/store/reducers/mainSuit.js

@@ -27,7 +27,7 @@ const initState = {
     featureData:[],
     refresh:false //用于数据更新
   },
-  chronicDesease:{}, //慢病
+  chronicDesease:null, //慢病
   mainTailIds:[]  //获取症状尾巴用
 }
 

src/utils/tools.js

@@ -231,7 +231,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清空所有的数据
     if(action == 'clear'){     //清空
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
-      store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:{}});
+      store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:null});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
         store.dispatch({type: CLEARCHECKBODY,data:[block],isEmpty:true,saveText:[],selecteds:[]});
@@ -246,7 +246,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
             data:[],
             saveText:'',
             mainSuitStr: '',
-            chronicMagItem:{}
+            chronicMagItem:null
         });
         store.dispatch({
             type: CLEAR_ALL_PUSH_MESSAGE,