Merge branch 'dev/new1' into optimize-zxc

src/components/AddInspect/SlideSelect/index.jsx

@@ -88,7 +88,7 @@ class SlideSelect extends Component {
     let numPlus = 0,numPlus1 = 0;
     let staticTime = {}
     if(dateTime){
-      let tmp1 = dateTime.split(' ')[0].split('-')            
+      let tmp1 = dateTime.split(' ')[0].split('-')
       let tmp2 = (dateTime).split(' ').length>1&&(dateTime).split(' ')[1].split(':')
       staticTime = {
         year: tmp1[0]-0,

src/components/AssessResult/ChartItem/index.jsx

@@ -161,7 +161,7 @@ class Chart extends Component{
       let name='';
       it&&it.creatTime.map((x,i)=>{
         inx=xAxis.findIndex((a)=>{
-          name=type=='week'?x.substr(0,13):x.substr(0,10);
+          name=x.substr(0,13);
           return a.substr(0,13)==name;
         });     //日期对应横坐标的位置
         if(inx!=-1){
@@ -222,7 +222,7 @@ class Chart extends Component{
           rotate:65,
           fontSize:10,
           formatter: function(value,index){
-            return value.substr(0,10);
+            return value.substr(0,13);
           }
         }
       },

src/components/AssessResult/ScaleItem/index.jsx

@@ -197,9 +197,9 @@ class ScaleItem extends Component {
           const cresult = showRes&&showRes[1]&&showRes[1].text;
                     temp = <div className={style['results']}>
                     <span>计算公式结果：</span>
-                    <span className={style["blue"]} onClick={this.showFormula.bind(this,item.conceptId,it)}>{cresult?cresult:'请选择'}</span>
-                    <img src={level1} />
-                    <MiniToast title={it.content.name}
+                    <span className={style["blue"]} style={disabled?{cursor:'default'}:''} onClick={disabled?'':this.showFormula.bind(this,item.conceptId,it)}>{cresult?cresult:'请选择'}</span>
+                      {disabled?'':<img src={level1} />}
+                      {disabled?'':<MiniToast title={it.content.name}
                                confirmText='关闭'
                                icon={allTableIcon}
                                show={formulaId&&formulaId==item.conceptId?true:false}
@@ -218,7 +218,6 @@ class ScaleItem extends Component {
                                   return <div className={style["chooseItem"]}>
                                     <Radio label={ii.detailName}
                                            isSelect={ii.state == 1}
-                                           disabled={disabled}
                                            handleClick={this.handleForRadio.bind(this,item.conceptId,details,idd,ind)}>
                                       >
                                     </Radio>
@@ -232,7 +231,7 @@ class ScaleItem extends Component {
                                 <span>{'请输入'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                {disabled?item1.value:<input type="text" placeholder="请输入"  value={item1.value} onKeyDown={this.handleReg.bind(this)} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>}
+                                <input type="text" placeholder="请输入"  value={item1.value} onKeyDown={this.handleReg.bind(this)} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>
                               </td>
                               <td>
                                 <span>{item1.uint}</span>
@@ -242,7 +241,7 @@ class ScaleItem extends Component {
                           }
                         })}
                       </table>
-                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,its)}>计算</div>}
+                      <div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,its)}>计算</div>
                       <table>
                         {showRes && Array.isArray(showRes) &&showRes.map((itemResult) => {
                           return <tr>
@@ -255,14 +254,14 @@ class ScaleItem extends Component {
                           </tr>
                         })}
                       </table>
-                    </MiniToast>
+                    </MiniToast>}
                 </div>
         }else if(its.type==3){
           temp = <div className={style['results']}>
                     <span>可能结果：</span>
-                    <span onClick={this.showOption.bind(this,item.conceptId)} className={style["blue"]}>{possible&&possible[item.conceptId]?possible[item.conceptId]:'请选择'}</span>
-                    <img src={level1} />
-                    <MiniToast title='结果选择'
+                    <span onClick={disabled?'':this.showOption.bind(this,item.conceptId)} style={disabled?{cursor:'default'}:''} className={style["blue"]}>{possible&&possible[item.conceptId]?possible[item.conceptId]:'请选择'}</span>
+                    {disabled?'':<img src={level1} />}
+                    {disabled?'':<MiniToast title='结果选择'
                          icon={checkIcon}
                          show={optionId&&optionId==item.conceptId?true:false}
                          close={this.closeOption}
@@ -273,7 +272,6 @@ class ScaleItem extends Component {
                           {it.content.details&&it.content.details.map((lis,ind)=>{
                             return <div className={style["chooseItem"]}>
                               <Radio label={lis.detailName}
-                                     disabled={disabled}
                                      isSelect={radioVal&&radioVal[item.conceptId]==lis.detailName}
                                      handleClick={this.handleRadio.bind(this,lis,item,i)}>
                               </Radio>
@@ -281,7 +279,7 @@ class ScaleItem extends Component {
                             </div>
                           })}
                         </div>
-                    </MiniToast>
+                    </MiniToast>}
                   </div>;
         }
         const passId = item.details[j].type==1?item.details[j].content.conceptId:undefined;

src/components/AssessResult/index.jsx

@@ -33,11 +33,11 @@ class AssessResult extends Component {
     this.handleScaleText = this.handleScaleText.bind(this);
     this.handleResult = this.handleResult.bind(this);
   }
-  componentWillMount(){
+  /*componentWillMount(){
     const {disId,disName,getAssess} = this.props;
     //获取评估
     getAssess&&getAssess(disId,disName);
-  }
+  }*/
   handleScaleText(text){
     const {disName} = this.props;
     const obj = Object.assign({},this.state.wholeAssessText);

src/components/DiagnosticList/index.jsx

@@ -15,6 +15,7 @@ import { dragBox } from '@utils/drag';
 import iconRadioDefault from '@common/images/icon-radio-default.png'
 import iconRadioActive from '@common/images/icon-radio-active.png'
 import AssessResult from '@containers/AssessResult';
+import {getAssessData} from '@store/async-actions/fetchModules';
 import tableIcon from '@common/images/table.png';
 import { CONFIRM_TYPE } from "@store/types/typeConfig";
 import $ from "jquery";
@@ -191,12 +192,28 @@ class DiagnosticList extends Component {
         </div>)
     }
     showAssessFn(item){
+      const {setAssess} = this.props;
+      const that = this;
         if(item&&item.conceptId){         //显示评估弹窗
-          this.setState({
-            showAssess:true,
-            isAssessConfirm:false,
-            assessId:item.conceptId,
-            disName:item.name
+          getAssessData(item.conceptId,item.name).then((res)=>{
+            if(res.data.code=='0'){
+              const data = res.data.data;
+              if(!data||data.length==0){
+                Notify.info('暂无数据');
+              }else{
+                setAssess&&setAssess(data,item.name);
+                that.setState({
+                  showAssess:true,
+                  isAssessConfirm:false,
+                  assessId:item.conceptId,
+                  disName:item.name
+                });
+              }
+            }else{
+              Notify.error(res.data.msg);
+            }
+          }).catch(error=>{
+            console.log(error);
           });
         }else{          //关闭评估弹窗
             this.setState({

src/components/PreviewBody/index.jsx

@@ -103,7 +103,7 @@ class PreviewBody extends Component {
   render() {
     const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn,showHistoryCases} = this.props;
     const other_yjs = dataStr.other?filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other):'';
-    const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
+    //const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
     const noData = JSON.stringify(preInfo) == '{}';
     return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
       <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "620px" }}>
@@ -144,7 +144,7 @@ class PreviewBody extends Component {
           </tr>
         </table>
         <p className={style.docName}>医生签名：<span>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
-        {showAssessBtn&&isChronic?<AssessResultHis showHistoryCases={showHistoryCases} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
+        {showAssessBtn&&dataJson.haveAssess?<AssessResultHis showHistoryCases={showHistoryCases} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
         <div onClick={() => { this.surePrint(dataStr) }} className={style.printBtn} style={{
           display: show ? 'inline-block' : 'none',
         }}>打印</div>

src/containers/AssessResult.js

@@ -3,8 +3,8 @@ import {connect} from 'react-redux';
 import AssessResult from '@components/AssessResult';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
-import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
-import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,SET_CALCU_VALUES} from '@types/assessResult';
+import {getIndexData} from '@store/async-actions/fetchModules';
+import {SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,SET_CALCU_VALUES} from '@types/assessResult';
 import {parseChartData,deepClone} from '@utils/tools';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
 import {saveMessage} from "../store/async-actions/print";
@@ -47,30 +47,6 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
   return {
-    getAssess(disId,disName){        //获取评估内容数据
-      dispatch(getAssessData(disId,disName)).then((res)=>{
-        if(res.data.code=='0'){
-          dispatch({
-            type:SET_ASSESS_DATA,
-            data:res.data.data,
-            name:disName
-          })
-        }else{
-          dispatch({
-            type:SET_ASSESS_DATA,
-            data:[],
-            name:disName
-          })
-        }
-      }).catch(error=>{
-        dispatch({
-          type:SET_ASSESS_DATA,
-          data:[],
-          name:disName
-        });
-        console.log(error);
-      });
-    },
     getIndexData(param){        //获取评估图表数据
       const {range,rangeType,index,pindex,getNew,disName} = param;
       dispatch(getIndexData(range,disName)).then((res)=>{

src/containers/DiagnosticList.js

@@ -11,6 +11,7 @@ import {CURRENT_CHRONIC} from '@store/types/currentIll';
 import {autoFillModules} from '@store/async-actions/fetchModules';
 import { initItemList } from '@store/async-actions/historyTemplates';
 import {MODI_LOADING} from '@store/types/homePage.js';
+import {SET_ASSESS_DATA} from '@types/assessResult';
 
 function mapStateToProps(state) {
     const {diagnosticList,assessResult,pushMessage } = state;
@@ -34,6 +35,13 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
     return {
+      setAssess(data,disName){        //获取评估内容数据
+        dispatch({
+          type:SET_ASSESS_DATA,
+          data:data,
+          name:disName
+        });
+      },
         delDiagnostic: (item) => {
             dispatch({
                 type: DEL_DIAGNOSTIC,

src/store/async-actions/fetchModules.js

@@ -261,7 +261,7 @@ export function saveMode(mode){
 
 //慢病-获取管理评估
 export function getAssessData(disId,disName){
-  return ()=>{
+  //return ()=>{
     const emrData = getEMRParams();
     const param = {
       diseaseId:disId,
@@ -275,7 +275,7 @@ export function getAssessData(disId,disName){
       symptom:emrData.current + emrData.main
     };
     return json(api.getAssess,param);
-  }
+  //}
 }
 
 //慢病-获取管理评估历史单条记录

src/store/async-actions/print.js

@@ -19,8 +19,9 @@ export const saveMessage = (bool) => {
     let jsonData = getAllDataList(baseList);
     const lisData = baseList.inspect.pushItem;
     const lisArr = transferIndexData(lisData);
+    const haveAssess = Object.keys(baseList.assessResult.data).length>0;
     const evaluation={
-      htmlContent:JSON.stringify(getEvaluations(baseList.assessResult,pushMessage)),
+      htmlContent:haveAssess?JSON.stringify(getEvaluations(baseList.assessResult,pushMessage)):'{}',
       //scaleList:[]
     };//getEvaluation();
     //console.log(baseList)
@@ -30,7 +31,7 @@ export const saveMessage = (bool) => {
         "hospitalDeptId": state.hospitalDeptId,
         "hospitalId": state.hospitalId,
         "patientId": state.patientId,         //患者id              
-        "dataJson": JSON.stringify(getAllDataList(baseList)),
+        "dataJson": JSON.stringify(Object.assign({haveAssess:haveAssess},jsonData)),
         "indexData":lisArr,
         "inquiryEvaluation":evaluation,
         "detailList": [{

src/utils/tools.js

@@ -734,7 +734,7 @@ function ifOtherClear(jsonData,jsonStr,baseList){
   }
 }
 function normalVal(min,max){
-  if(min == ''&&max==''){
+  if(!min&&!max){
     return null;
   }else if(!isNaN(min) && !isNaN(max)){
       return `正常值: (${min}~${max})`