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

src/common/components/MiniToast/index.less

@@ -3,7 +3,7 @@
   top:27px;
   width: 388px;
   background: #fff;
-  z-index: 66;
+  z-index: 40;
   border: 1px solid #EAEDF1;
   box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
   .infoTitle{

src/components/CheckBody/index.jsx

@@ -36,7 +36,7 @@ class CheckBody extends Component{
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
     const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
-    const showMoreBtn = data.length>config.showCheckNum&&(data.length>moreNum&&!data[0].full)&&!moreText;
+    const showMoreBtn = data.length>config.showCheckNum&&(data.length-1>moreNum&&!data[0].full)&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;
@@ -71,17 +71,14 @@ class CheckBody extends Component{
       }
       leftL = ele.offsetLeft+90
     }
-    getSearchLocation(getPageCoordinate(e).boxTop,leftL)
+    getSearchLocation(getPageCoordinate(e).boxTop,leftL);
     this.setState({
-      // boxLeft:getPageCoordinate(e).boxLeft,
-      // boxLeft:leftL,
-      // boxTop:getPageCoordinate(e).boxTop,
       tmpScroll: $("#addScrollEvent")[0].scrollTop,
       tmpTop:getPageCoordinate(e).boxTop
     });
     windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
       let scrollYs = $("#addScrollEvent")[0].scrollTop;
-      let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll
+      let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll;
       getSearchLocation(boxTop,this.state.boxLeft)
     },$("#addScrollEvent")[0])
   }
@@ -93,18 +90,14 @@ class CheckBody extends Component{
   getData(){
     //第一次聚焦查体时，主诉有数据则调接口，主诉无数据则显示提示；其他时间查体模板数据不调接口
     const {hasMain,isEmpty} = this.props;
-
+    if(!hasMain&&isEmpty){
+      Notify.error("无法操作，请先输入主诉");
+      return;
+    }
     //无主诉提示在EditableSpan里
     //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
     if(hasMain&&isEmpty!=false){
       this.props.getInit();
-      //隐藏区域有默认选中项，默认全部展开-有延迟，弃用
-      /*const that = this;
-      setTimeout(function(){
-        that.props.showAll&&that.setState({
-          showAll:true
-        });
-      },900)*/
 
     }
   }

src/components/DiagnosticList/index.jsx

@@ -81,7 +81,7 @@ class DiagnosticList extends Component {
         // item.treatIndex = index
         const  { showTreat, getTreatResult } = this.props;
         getTreatResult && getTreatResult(item);
-        showTreat && showTreat();
+        // showTreat && showTreat();//添加loading，移到async-actions中
         this.setState({
             treatTitle: item.name
         })
@@ -103,7 +103,7 @@ class DiagnosticList extends Component {
               showHistoryCaseModal && showHistoryCaseModal();
             }else{
               if(typeConfig==0){
-                Notify.info("暂无历史病例，已默认展示慢病相关内容");
+                Notify.info("暂无历史病历，已默认展示慢病相关内容");
                 const timer = setTimeout(function(){
                   autoFillModules && autoFillModules();
                   clearTimeout(timer);

src/components/InfoTitle/index.jsx

@@ -10,6 +10,7 @@ import { initItemList,setInitHistory } from '@store/async-actions/historyTemplat
 import HistoryCases from '@containers/HistoryCases';
 import $ from 'jquery';
 import Notify from '@commonComp/Notify';
+import {MODI_LOADING} from '@store/types/homePage.js';
 class InfoTitle extends Component {
     constructor(props){
         super(props);
@@ -19,15 +20,19 @@ class InfoTitle extends Component {
         this.showHistoryBox = this.showHistoryBox.bind(this)
     }
     showHistoryBox(){
+        const {showLoading,hideLoading}=this.props;
+        showLoading();
         // store.dispatch(initItemList());
         // store.dispatch(showHistory(true))
         initItemList().then((res)=>{
             const result = res.data;
             if(result.code==0 && result.data){
+                hideLoading();
                 store.dispatch(setInitHistory(result.data));
-                store.dispatch(showHistory(true))
+                store.dispatch(showHistory(true));
             }else{
-                Notify.info("暂无历史病例");
+                hideLoading();
+                Notify.info("暂无历史病历");
             }
         })
     }
@@ -66,9 +71,20 @@ function mapStateToProps(state) {
   }
 }
 
+function mapDispatchToProps(dispatch){
+    return{
+        showLoading(){
+            dispatch({type:MODI_LOADING,flag:true});
+        },
+        hideLoading(){
+            dispatch({type:MODI_LOADING,flag:false});
+        }
+    }
+}
+
 const InfoTitleCont = connect(
   mapStateToProps,
-  null
+  mapDispatchToProps
 )(InfoTitle);
 
 

src/components/ScaleTableHis/index.jsx

@@ -27,8 +27,6 @@ class ScaleTableHis extends React.Component{
   }
 
   getContent(datas){
-    const {title,formulaResult,data} = this.props;
-    // const datas = valueData&&valueData.group?valueData:mocks.newData;
     let content =  datas&&datas.group&&datas.group.map((v,i)=>{
                 return <div className={style['group']}>
                   <p className={style['groupName']}>{v.groupName}</p>
@@ -36,7 +34,7 @@ class ScaleTableHis extends React.Component{
                     return <div>
                       {it.row.map((item,index)=>{
                         if(item.controlType==0){
-                          return <div className={style['block']} style={{border:it.required==1&&!item.isSelect&&start?'1px solid #f00':'none'}}>
+                          return <div className={style['block']}>
                               <p className={style['miniName']}>{item.name}</p>
                               {item.details&&item.details.map((vv,ii)=>{
                                 return <div className={style['item']}>

src/containers/AssistCheck.js

@@ -8,7 +8,7 @@ import { getSearchList,getInstroduce } from '@store/async-actions/assistCheck';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 
-function mapStateToProps(state) {console.log(state)
+function mapStateToProps(state) {
     return {
         list:state.assistCheck.list,
         assistLabel:state.assistCheck.assistLabel,

src/containers/DiagnosticList.js

@@ -10,6 +10,7 @@ import { showHistory,sortHistory,activeHistory,visibleHistory } from '@store/act
 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';
 
 function mapStateToProps(state) {
     return {
@@ -75,7 +76,8 @@ function mapDispatchToProps(dispatch) {
             })
         },
         getTreatResult: (item) => {
-            dispatch(getTreatResult(item))
+            dispatch({type:MODI_LOADING,flag:true});
+            dispatch(getTreatResult(item));
         },
         getTips: (diagItem) => {
             dispatch(getTips(diagItem))

src/containers/MainSuit.js

@@ -203,7 +203,7 @@ function mapDispatchToProps(dispatch) {
         await dispatch(getInitModules);
         // 模板回来关闭；loading
         dispatch({type:MODI_LOADING,flag:false});
-        // 弹窗是否引用历史病例？
+        // 弹窗是否引用历史病历？
         // dispatch({type:SHOW_HISTORY_BOX});
         dispatch({type:SHOW_REFER_RECORD});
 

src/containers/OperationContainer.js

@@ -11,6 +11,7 @@ import {
 import {saveMessage,clearMessages} from "../store/async-actions/print";
 import {saveTemplateDetail} from '@store/async-actions/tabTemplate';
 import {saveClickNum,getInitModules} from '@store/async-actions/homePage';
+import {getOtherHisRecord} from '@store/async-actions/fetchModules';
 
 // function mapStateToProps({print}) {
 function mapStateToProps(state) {
@@ -51,6 +52,7 @@ function mapDispatchToProps(dispatch) {
         },
         clear: (flag) => {
             clearMessages();
+            dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
             // 清除时如果是慢病模板则重新获取模板
             if(flag){
                 dispatch(getInitModules);

src/store/async-actions/treat.js

@@ -1,11 +1,13 @@
 import { json } from "@utils/ajax";
-import { SET_TREAT } from '@store/types/diagnosticList';
-import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
+// import { SET_TREAT } from '@store/types/diagnosticList';
+import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR,SET_TREAT} from '@store/types/diagnosticList';
 import { SET_COMMONTREATMENT } from '@store/types/pushMessage'
 import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST, IS_FIRST_MAIN_DIAG, SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS, SET_FOLLOW_UP, DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP } from '@store/types/treat';
 import {storageLocal,getEMRParams} from '@utils/tools';
 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
 import { SAVE_FOLLOW_UP } from "@store/types/pushMessage";
+import {MODI_LOADING} from '@store/types/homePage.js';
+import { SHOW_TREAT} from '@store/types/treat.js';
 
 const api={
     push:'/push/pushInner',
@@ -194,6 +196,8 @@ export const getTreatResult = (item) =>{
 //获取治疗方案
 function getTreatment(item, dispatch, state,url,params, isChronic) {
     json(url, params).then((data) =>{
+        dispatch({type:MODI_LOADING,flag:false});
+        dispatch({type: SHOW_TREAT})
         let treat;
         if(data.data.data) {
              treat = data.data.data.treat || {}