Merge remote-tracking branch 'origin/Chronic_lcf' into ChronicMag

# Conflicts:
#	src/common/components/Radio/index.js
#	src/components/AssessResult/ChartItem/index.jsx
#	src/components/AssessResult/ChooseItem/index.jsx
#	src/components/AssessResult/index.jsx
#	src/components/ChronicInfo/index.jsx
#	src/containers/AssessResult.js
#	src/store/actions/currentIll.js
#	src/store/actions/mainSuit.js
#	src/store/async-actions/homePage.js
#	src/store/async-actions/pushMessage.js
#	src/store/reducers/assessResult.js
#	src/store/reducers/pushMessage.js
#	src/store/types/assessResult.js
#	src/store/types/pushMessage.js

src/common/components/ConfirmModal/index.jsx

@@ -122,7 +122,8 @@ class ConfirmModal extends Component {
             width, 
             height, 
             closable, 
-            noFooter
+            noFooter,
+            icon
         } = this.props;
         const marginLeft = -parseInt(width)/2
         const marginTop = -parseInt(height)/2
@@ -130,7 +131,11 @@ class ConfirmModal extends Component {
             <NewPortal visible={visible}>
                 <div className={styles['modal-wrapper']} id='confirm'>
                     <div className={styles[['modal']]} style = {{width: width, marginLeft:marginLeft, height:height, marginTop:marginTop}}>
-                        <div className={styles['modal-title']} style={{background: titleBg}}>{title ? title : ''} {closable ? <img onClick={this.closeModal} className={styles['modal-close']} src = {close}/> : false}</div>
+                        <div className={styles['modal-title']} style={{background: titleBg}}>
+                            {icon?<img src={icon} className={styles['icon']}/>:''}
+                            {title ? title : ''} 
+                            {closable ? <img onClick={this.closeModal} className={styles['modal-close']} src = {close}/> : false}
+                        </div>
                         <div className={styles['modal-content']}>{children}</div>
                         {noFooter ? '' : <div className={styles['modal-operator']+' clearfix'}>
                             <div className={styles['modal-btn-box']}>

src/common/components/ConfirmModal/index.less

@@ -17,6 +17,11 @@
     background: #e5e5e5
 }
 
+.icon{
+    vertical-align: text-top;
+    margin-right: 2px;
+}
+
 .modal-close {
     position: absolute;
     right: 0px;
@@ -80,4 +85,4 @@
     filter:alpha(opacity=60);
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
     z-index: 9998;
-}
+}

src/components/ChronicInfo/index.jsx

@@ -10,7 +10,7 @@ import allIcon from '@common/images/all-table.png';
 import tableIcon from '@common/images/table.png';
 import allTableIcon from '@common/images/all-table.png';
 import checkIcon from '@common/images/check.png';
-import {ComplexModal} from '@commonComp';
+import {ComplexModal,ConfirmModal} from '@commonComp';
 import AssessResult from '@containers/AssessResult';
 import ScaleTable from '../ScaleTable';
 
@@ -62,6 +62,12 @@ class ChronicInfo extends React.Component{
     })
   }
   showTable(){
+    // 密西根糖尿病周围神经病评分（MDNS） 为例
+    const item = {
+      id:40744,
+      name:'密西根糖尿病周围神经病评分（MDNS）'
+    }
+    this.props.getScaleInfo(item);
     this.setState({
       showTable:true
     })
@@ -80,12 +86,13 @@ class ChronicInfo extends React.Component{
     const {hideList} = this.props;
     hideList&&hideList();
   }
+
   render(){
     const footer = <div className={style['footer']}>
       <span className={style['print']}><img src={printIcon} alt=""/>打印</span>
       <span className={style['okBtn']}>确定</span>
     </div>;
-    const {chronicMagItem,showList,tableList} = this.props;
+    const {chronicMagItem,showList,tableList,scaleInfo} = this.props;
     const {showInfo,showOption,showTable,showAssess} = this.state;
     return <div className={style["tips"]} style={{marginBottom:'15px'}}>
               <div className={`${style["tips-title"]} ${style["chronic"]}`}>
@@ -176,33 +183,31 @@ class ChronicInfo extends React.Component{
                   </div>
                 </div>
               </div>
-            {showList?<ComplexModal onclose={this.close}
-                      title='全部量表' 
-                      icon={allTableIcon}
-                      height={300}
-                      width={400}>
-            <ul className={style['toast-cont']}>
-              {tableList&&tableList.map((v,i)=>{
-                return <li>
-                <span>{'【'+v.name+'】'}</span>
-                </li>
-              })}
-            </ul>
-        </ComplexModal>:''}
-        {showTable?<ComplexModal onclose={this.closeTable} footer={footer}
+              <ConfirmModal visible={showList} noFooter='true' title='全部量表' close={this.close} titleBg="#DFEAFE" icon={allTableIcon} height={300}>
+                      <ul className={style['toast-cont']}>
+                        {tableList&&tableList.map((v,i)=>{
+                          return <li>
+                          <span>{'【'+v.name+'】'}</span>
+                          </li>
+                        })}
+                      </ul>
+              </ConfirmModal>
+              {showTable?<ComplexModal onclose={this.closeTable} footer={footer}
                       title='密西根糖尿病神经筛查表（MDNS）' 
                       icon={tableIcon}
+                      top={20}
+                      bottom={20}
                       width={820}>
-          <ScaleTable></ScaleTable>
-        </ComplexModal>:''}
-        {showAssess?<ComplexModal onclose={this.showAssessFn} footer={footer}
+                <ScaleTable data={scaleInfo}></ScaleTable>
+              </ComplexModal>:''}
+              {showAssess?<ComplexModal onclose={this.showAssessFn} footer={footer}
                       title='管理和评估' 
                       icon={manageIcon}
                       top={20}
                       bottom={20}
                       width={820}>
-          <AssessResult></AssessResult>
-        </ComplexModal>:''}
+                <AssessResult></AssessResult>
+              </ComplexModal>:''}
       </div>
   }
 }

src/components/ChronicInfo/index.less

@@ -67,6 +67,7 @@
         }
         .listName{
           color:#3B9ED0;
+          cursor: pointer;
         }
         .listResult{
           float: right;

src/components/CurrentIll/index.jsx

@@ -43,7 +43,7 @@ class CurrentIll extends Component{
 
   handleFocus(e){
     // 判断主诉是否为空
-    const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear,symptomFeature} = this.props;
+    const {mainData,mainText,setData,moduleNum,mainIds,data,changeEditIll,editClear,symptomFeature,isChronic} = this.props;
     const that = this;
     let {setDataTimer} = this.state; 
     let mainFinallyText = filterDataArr(mainText);
@@ -61,7 +61,7 @@ class CurrentIll extends Component{
         // setData && setData({useEmpty,num,mainData,mainIds});
         clearTimeout(setDataTimer);
         setDataTimer = setTimeout(function(){//延时，等待主诉失焦数据返回
-          setData && setData({num,mainData,mainIds,symptomFeature:symptomFeature.featureData});
+          setData && setData({num,mainData,mainIds,symptomFeature:symptomFeature.featureData,isChronic});
         },200)  
         this.setState({
           setDataTimer

src/components/DiagnosticList/index.jsx

@@ -3,7 +3,7 @@ import style from './index.less';
 import del_icon from './img/delete.png'
 import diagUp from './img/diagUp.png'
 import diagDown from './img/diagDown.png'
-import {ConfirmModal, Message,ComplexModal} from '@commonComp';
+import {ConfirmModal, Message} from '@commonComp';
 import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
 import store from '@store';
@@ -147,9 +147,6 @@ class DiagnosticList extends Component {
         const { list, treatment, showReferRecord, showHistoryCase } = this.props
         const { visible, treatTitle } = this.state
         const lastIndex = list.length -1;
-        const footer = <div className={style['footer']}>
-                          <span className={style['okBtn']} onClick={this.referCase}>确定</span>
-                        </div>;
         return(
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
@@ -182,17 +179,10 @@ class DiagnosticList extends Component {
                     <ConfirmModal visible={showReferRecord} okText='是' cancelText='否' confirm={this.referRecord}  cancel={this.noReferRecord} close={this.noReferRecord}>
                         <div className={style['confirm-info']}>是否引用往期病历</div> 
                     </ConfirmModal>
-                    {/*<ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal}>
+                    <ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal} titleBg="#DFEAFE" icon={tableIcon} height={300}>
                         {this.getHistoryCase()}
                         <div className={style['confirm-history']}><span className={style['confirm-history-btn']} onClick={this.referCase}>确定</span></div>
-                    </ConfirmModal>*/}
-                    {showHistoryCase?<ComplexModal onclose={this.closeHistoryCaseModal} footer={footer}
-                      title='请选择历史病历' 
-                      icon={tableIcon} 
-                      height={300}
-                      width={400}>
-                      {this.getHistoryCase()}
-                    </ComplexModal>:''}
+                    </ConfirmModal>
                 </div>
                
         )

src/components/DiagnosticList/index.less

@@ -111,14 +111,22 @@
     padding: 10px 30px;
 }
 .confirm-history {
-    height: 50px;
+    // height: 50px;
     position: relative;
 }
 .confirm-history-btn {
-    border: 1px solid #000;
-    padding: 5px 10px;
     position: absolute;
     right: 15px;
+    // bottom: 10px;
+    display: inline-block;
+    width: 66px;
+    height: 32px;
+    line-height: 32px;
+    text-align: center;
+    color: #3B9ED0;
+    border: 1px solid #3B9ED0;
+    border-radius: 4px;
+    cursor: pointer;
 }
 .history-info {
     height: 185px;
@@ -131,22 +139,4 @@
             margin-right: 5px;
         }
     }
-}
-.footer{
-  .okBtn{
-    width: 80px;
-    height: 34px;
-    line-height: 32px;
-    text-align: center;
-    outline: none;
-    border-radius: 4px;
-    cursor: pointer;
-    border: 1px solid #3B9ED0;
-    box-sizing: border-box;
-    margin-left: 20px;
-    background: #3B9ED0;
-    color: #fff;
-    float: right;
-    margin-right: 20px;
-  }
 }

src/components/ScaleTable/index.jsx

@@ -6,47 +6,78 @@ import mocks from '../../mock/chronicTable.js'
 class ScaleTable extends React.Component{
   constructor(props){
     super(props);
+    this.handleChange = this.handleChange.bind(this);
+  }
+
+  handleChange(event){
+    console.log(event.target.value);
   }
 
   render(){
+    const {data} = this.props;
+    const content = data && data[1].content;
+    const datas = content && JSON.parse(content);
+    console.log(5555,datas);
+
     return <div className={style['tableBox']}>
             <h1>密西根糖尿病神经筛查表（MDNS）</h1>
             <p>MDNS可与MNSI联合应用以确定是否存在周围神经病变，在一段时间内对患者进行评分可以评估疾病的进展情况。</p>
             <table className={style['table']}>
               <thead>
                 <tr>
-                  {mocks.data.title.map((v,i)=>{
+                  {datas&&datas.title.map((v,i)=>{
                     return <td>{v.name}</td>
                   })}  
                 </tr>
               </thead>
               <tbody>
-                {mocks.data.details.map((v,i)=>{
+                {datas&&datas.rows.map((v,i)=>{
                     return <tr>
                     <td>{v.name}</td>
                     <td>
                       {v.details.map((it,index)=>{
-                        return <td style={{display:'block'}}>{it.detailName}</td>
+                        /*return <td style={{display:'block'}}>{it.detailName}</td>*/
+                        return <td className={style['block']}>
+                          <label>
+                            <input type="radio" name={v.name} value={it.score} onChange={this.handleChange}/>{it.detailName}
+                            {/*<span style={{display:+it.state==1?'inline':'none',color:'#3B9ED0'}}>（智能推荐）</span>*/}
+                            <span style={{display:it.detailName=='正常'?'inline':'none',color:'#3B9ED0'}}>（智能推荐）</span>
+                          </label>
+                        </td>
+                      })}
+                    </td>
+                    <td>
+                      {v.details.map((it,index)=>{
+                        return <td className={style['block']}>{it.score}</td>
                       })}
                     </td>
-                    <td></td>
                     <td></td>
                     </tr>
                   })} 
               </tbody>
+              <tfoot>
+                <tr>
+                  <td colspan="4" className={style['sum']}>总计：</td>
+                </tr>
+              </tfoot>
             </table>
             <div>
               <p>
                 1. 计算方法：<br/>
-              感觉损伤得分=左右两侧感觉检查项目的分数之和
-              肌力得分=左右两侧肌力检查项目的分数之和
-              反射得分=左右两侧反射检查项目的分数之和
+              感觉损伤得分=左右两侧感觉检查项目的分数之和<br/>
+              肌力得分=左右两侧肌力检查项目的分数之和<br/>
+              反射得分=左右两侧反射检查项目的分数之和<br/>
               体格检查得分=感觉损伤得分+肌力得分+反射得分
               </p>
               <p>
                 2. 临床体格检查部分：<br/>
               最低得分0  最高得分46， 分数越高，周围神经病越重
               </p>
+              {datas&&datas.calculate.range.map((v,i)=>{
+                return <p>
+                  <span>{v.min}~{v.max}</span>&nbsp;<span>{v.text}</span>
+                </p>
+              })}
             </div>
           </div>
   }

src/components/ScaleTable/index.less

@@ -1,6 +1,5 @@
 .tableBox{
-  // max-height: 700px;
-  height: 690px;
+  // height: 690px;
   overflow-y: auto;
   padding: 15px;
   h1{
@@ -13,6 +12,13 @@
 .table{
   width: 100%;
   margin: 10px 0 10px;
+  border-top: 10px solid #D8D8D8;
+  border-bottom: 10px solid #D8D8D8;
+  thead,tfoot{
+    tr{
+      height: 54px;
+    }
+  }
   tr{
     border-bottom: 1px solid #979797;
     td{
@@ -20,21 +26,10 @@
       padding: 7px 0;
     }
   }
-}
-/* .tableBtn{
-  // position: absolute;
-  text-align: right;
-  color:#000;
-  padding: 15px 10px 0 0;
-  .confirmBtn{
-    display: inline-block;
-    color:#fff;
-    width: 80px;
-    height: 32px;
-    line-height: 32px;
-    border-radius: 4px;
-    background: #3B9ED0;
-    margin-left: 25px;
-    text-align: center;
+  .sum{
+    text-align: right;
+  }
+  .block{
+    display: block;
   }
-} */
+}

src/config/index.js

@@ -18,12 +18,16 @@ export default {
       '6':'addSymptom'        //添加病情变化--主诉
     },*/
     moduleCP:{//使用type
-      '1':'mainSuit',         //主诉
-      '2':'current',          //现病史
-      '3':'currentEmpty',        //现病史空模板
-      '4':'otherHisModel',         //其他史
-      '21':'addSymptom',      //主诉子模板--添加病情变化
-      '22':'process',          //现病史子模板--病程变化
+      '1':'mainSuit',          //主诉
+      '2':'current',           //现病史
+      '3':'otherHisModel',     //其他史
+      '4':'checkbody',         //查体
+      '5':'assay',             //化验
+      '6':'assistCheck',        //辅检
+      '22':'currentEmpty',      //现病史空模板
+      '31':'addSymptom',        //主诉子模板--添加病情变化
+      '32':'process',           //现病史子模板--病程变化
+      '322':'currentEmptySon',  //现病史-空模板-子模板
     },
     textId:'text',        //自由文本标签的id,
     textLabel:'{"tagType":"8","id":"","name":""}',

src/containers/ChronicInfo.js

@@ -1,7 +1,7 @@
 import {connect} from 'react-redux';
 import ChronicInfo from '../components/ChronicInfo';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
-import {getTableList} from '../store/async-actions/pushMessage';
+import {getTableList,getScaleInfo} from '../store/async-actions/pushMessage';
 
 function mapStateToProps(state){
   return{
@@ -9,6 +9,7 @@ function mapStateToProps(state){
     questionId: state.diagnosticList.clickDiag,
     tableList: state.pushMessage.tableList,
     showList: state.pushMessage.showList,
+    scaleInfo: state.pushMessage.scaleInfo,//量表明细
   }
 }
 
@@ -20,6 +21,9 @@ function mapDispatchToProps(dispatch){
     },
     hideList(){
       dispatch({type:HIDE_TABLE_LIST})
+    },
+    getScaleInfo(item){
+      dispatch(getScaleInfo(item))
     }
   }
 }

src/store/actions/currentIll.js

@@ -1,6 +1,5 @@
 import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
 import config from '@config/index.js';
-import {getInitModules} from '@store/async-actions/homePage.js';
 import {formatContinueDots} from '@utils/tools';
 
 //插入病程变化模板
@@ -97,6 +96,7 @@ export const setData = (state,action) =>{
   res.symptomIds = JSON.parse(JSON.stringify(mainIds));
   const num = action.info.num;//点击了几次添加病情变化
   const symptomFeature = action.info.symptomFeature;//分词
+  const isChronic = action.info.isChronic;//慢病标识
   let useEmpty,mainData;
   let mainModleData = JSON.parse(JSON.stringify(action.info.mainData));//主诉模板数据
   let moduleData = JSON.parse(JSON.stringify(res.moduleData));//现病史模板
@@ -117,11 +117,24 @@ export const setData = (state,action) =>{
   /*let mainLabelModuleArr = objToArr.filter((item)=>{
     return item.questionMapping.length>0;
   })*/
+  
+
+  // 是慢病，暂且使用现病史慢病模板，不区分空模板
+  if(isChronic){
+    res.data = fullfillText(moduleData).newArr;
+    res.saveText = fullfillText(res.data).saveText;
+    res.update=Math.random();
+    return res;
+  }
+
+  /****************************************/
   // 是否使用空模板：num=0时判断mainIds，num>=1，截取第一病程遍历是否有症状exist
   if(num==0){
-    useEmpty = mainIds.length>0 ? false:true;
+    // useEmpty = mainIds.length>0 ? false:true;
+    useEmpty = mainIds.length==0 && !symptomFeature || symptomFeature.length==0? true:false;
     mainData = mainModleData;
   }else{
+    // 模板也分词时得加上分词结果的判断
     let sliceIdx;
     for(let j=0; j<mainModleData.length; j++){
       if(mainModleData[j].id==config.tongYId && mainModleData[j].pos==1){

src/store/actions/mainSuit.js

@@ -28,24 +28,29 @@ export const setMainMoudle = (state,action) => {
   const originalSonData = action.addSymptom;
   let spreadLabels=[];
   let sonSpreadLabels=[];//子模板
-  for(let i=0; i<originalData.length;i++){
-    if(originalData[i].tagType==4){
-      spreadLabels.push(...originalData[i].questionMapping);
-    }else{
-      spreadLabels.push(originalData[i]);
+  if(originalData){
+    for(let i=0; i<originalData.length;i++){
+      if(originalData[i].tagType==4){
+        spreadLabels.push(...originalData[i].questionMapping);
+      }else{
+        spreadLabels.push(originalData[i]);
+      }
     }
   }
-  for(let j=0; j<originalSonData.length;j++){
-    if(originalSonData[j].tagType==4){
-      sonSpreadLabels.push(...originalSonData[j].questionMapping);
-    }else{
-      sonSpreadLabels.push(originalSonData[j]);
+  if(originalSonData){
+    for(let j=0; j<originalSonData.length;j++){
+      if(originalSonData[j].tagType==4){
+        sonSpreadLabels.push(...originalSonData[j].questionMapping);
+      }else{
+        sonSpreadLabels.push(originalSonData[j]);
+      }
     }
-  }
+  } 
   // res.moduleData = action.data;
   // res.addSmoduleData = action.addSymptom;
   res.moduleData = spreadLabels;
-  res.saveText = res.save||[];
+  // res.saveText = res.save||[];
+  res.saveText = res.save||res.saveText;//慢病
   res.addSmoduleData = sonSpreadLabels;
   res.addModuleName = action.addModuleName;
   res.update=Math.random();
@@ -668,6 +673,9 @@ export const clearMainSuit = (state,action)=>{//回读和清除
   if(res.data.length > 0){//回读
     res.editClear = false;
   }
+  if(action.symptomFeature !== undefined){//清除分词数据
+    res.symptomFeature.featureData = action.symptomFeature;
+  }
   return res;
 }
 

src/store/async-actions/homePage.js

@@ -43,7 +43,7 @@ export const getInitModules= (dispatch,getStore)=>{
   return json(api.getModules,param).then((res) => {
       dispatch(initHistoryDetails(message));      //历史病历回读
       if (res.data.code == '0') {
-        const newObj = modulesParseJson(res.data.data);console.log("模板分发：",newObj);
+        const newObj = modulesParseJson(res.data.data);
         const initData = newObj.json;
         const initSaveText = newObj.saveTextJson;
         const initModuleName = newObj.moduleName;
@@ -51,7 +51,6 @@ export const getInitModules= (dispatch,getStore)=>{
         dispatch({
           type: SETALLMODULES,
           data: res.data.data,
-          // ifChronic:chronicMagItem&&chronicMagItem.id?true:false
         });
         dispatch({
           type: SETINITDATA,
@@ -64,14 +63,16 @@ export const getInitModules= (dispatch,getStore)=>{
           data:initData.mainSuit,
           addSymptom:initData.addSymptom,
           addModuleName:initModuleName.addSymptom,//模板名称
-		      save:initSaveText.mainSuit
+		      // save:initSaveText.mainSuit
         });
         dispatch({
           type:SET_CURRENT,
           data:formatContinueDots(initData.current),
           save:initSaveText.current,
-          processModule:formatContinueDots(initData.process),//病程变化
-          processModuleName:initModuleName.process,//病程变化模板名称
+          // processModule:formatContinueDots(initData.process),//病程变化
+          // processModuleName:initModuleName.process,//病程变化模板名称
+          processModule:[],//病程变化
+          processModuleName:'',//病程变化模板名称
           saveProcess:initSaveText.process,
           emptyData:formatContinueDots(initData.currentEmpty),//现病史空模板
           saveEmpty:initSaveText.currentEmpty,
@@ -86,7 +87,6 @@ export const saveClickNum = (dispatch,getState)=>{
   const state = getState();
   const patientInfo = state.patInfo.message;
   const data = state.homePage.clickData;//所有点击事件储存
-  //console.log(999,state,data);
   const params = {
     "doctorId": patientInfo.doctorId,         //医生id
     "hospitalDeptId":patientInfo.hospitalDeptId ,   //部门ID

src/store/async-actions/pushMessage.js

@@ -1,5 +1,5 @@
 import { get, post, json } from "@utils/ajax";
-import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_CHRONIC_PUSHS} from '../types/pushMessage';
+import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS} from '../types/pushMessage';
 import { SET_CLICK_DIAG } from '../types/diagnosticList';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
@@ -131,6 +131,7 @@ export const getTipsDetails = () => {
     }
 }
 
+// 量表列表
 export const getTableList = (id)=>{
     return (dispatch,getState)=>{
         json(api.getTableList, {disId:id})
@@ -145,4 +146,33 @@ export const getTableList = (id)=>{
             console.log(e)
         })
     }
+}
+
+// 量表明细
+export const getScaleInfo = (it)=>{
+    return (dispatch,getState)=>{
+        const emrData = getEMRParams();
+          const params = {
+            age: emrData.age,
+            featureType: "21",
+            diag: emrData.dis,
+            // lis: emrData.lis,
+            lis: [],
+            sex: emrData.sex,
+            scaleId:it.id,
+            scaleName:it.name
+          };
+        json(api.push, params)
+        .then((res)=>{
+            const result = res.data;
+            if(result.code==0){
+                dispatch({
+                    type: SET_SCALE_INFO,
+                    data: result.data.scale
+                })
+            }
+        }).catch((e) => {
+            console.log(e)
+        })
+    }
 }

src/store/reducers/pushMessage.js

@@ -1,4 +1,4 @@
-import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST,SET_CHRONIC_PUSHS} from '../types/pushMessage';
+import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_TIPS_DETAILS, SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT, IS_FIRST_MAIN_DIAG, SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,HIDE_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS} from '../types/pushMessage';
 import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, setCommontreatment, isFirstMainDiag, setAdviceInput } from '../actions/pushMessage';
 
 const initState = {
@@ -67,6 +67,9 @@ export default function(state = initState, action) {
     case SET_CHRONIC_PUSHS:
       res.chronicPushItems = action.data;
       return res;
+    case SET_SCALE_INFO://量表明细
+      res.scaleInfo = action.data;
+      return res;
     default:
       return state;
   }

src/store/types/pushMessage.js

@@ -19,5 +19,6 @@ export const SET_CHRONIC_TABLELIST = 'SET_CHRONIC_TABLELIST' ; //设置量表列
 export const SHOW_TABLE_LIST = 'SHOW_TABLE_LIST' ; //显示量表列表
 export const HIDE_TABLE_LIST = 'HIDE_TABLE_LIST' ; //隐藏量表列表
 export const SET_CHRONIC_PUSHS ='SET_CHRONIC_PUSHS'; //右侧慢病量表评估推送模块数据
+export const SET_SCALE_INFO = 'SET_SCALE_INFO' ; //量表明细
 
 

src/utils/tools.js

@@ -241,7 +241,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:[],clearAction:true});
+      store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],clearAction:true,symptomFeature:[]});
         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:[]});