Merge branch 'testedMerge' into dev5.4.1

src/components/InfoTitle/index.jsx

@@ -3,7 +3,7 @@ import PatInfoContainer from '@containers/PatInfoContainer.js';
 import style from "./index.less";
 import { connect } from 'react-redux';
 import historyCase from '@common/images/history.png';
-import health from '@common/images/health.png'
+import health from '@common/images/prec.png'
 import store from '@store';
 import { showHistory } from '@store/actions/historyTemplates';
 import { initItemList,setInitHistory } from '@store/async-actions/historyTemplates';
@@ -54,11 +54,13 @@ class InfoTitle extends Component {
         const {le} = this.state;
         return <div className={style['title-wrapper']} >
             <PatInfoContainer sizeFlag={winWidth <= 1065?true:false}/>
-            <div className={style["operations"]} onClick={this.showHistoryBox}>
-                <span><img src={historyCase} />&nbsp;历史病历</span>
-            </div>
-            <div className={style["health"]} >
-                <span><img src={health} />&nbsp;健康档案</span>
+            <div className={style['activeWrap']}>
+                <div className={style["operations"]} onClick={this.showHistoryBox}>
+                    <span><img src={historyCase} />&nbsp;历史病历</span>
+                </div>
+                <div className={style["health"]} >
+                    <span><img src={health} />&nbsp;预问诊信息</span>
+                </div>
             </div>
             <HistoryCases></HistoryCases>
             <Loading show={loading}/>

src/components/InfoTitle/index.less

@@ -11,15 +11,23 @@
   top: 50px;
   right: 470px;
   min-width: 548px;
+  padding-right: 122px;
+  .activeWrap {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 122px;
+    line-height: 28px;
+  }
 }
 .operations, .health{
   float: left;
 //   border: 1px @border-color solid; 
-  height: 61px;
-  width: 12%;
+  // height: 61px;
+  width: 122px;
   border-left: 0px solid #fff;
   text-align: center;
-  line-height: 61px;
+  // line-height: 61px;
   color: @blue;
   span{
     cursor: pointer;
@@ -35,10 +43,10 @@
   }
 }
 .health{
-    opacity: 0.3;
-    color: rgba(0,0,0,0.6);
-    filter:alpha(opacity=30);
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
+    // opacity: 0.3;
+    // color: rgba(0,0,0,0.6);
+    // filter:alpha(opacity=30);
+    // -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=30);";
 }
 .font{
   font-size: 13px;

src/components/PatInfo/index.less

@@ -1,6 +1,6 @@
 @import "~@less/variables.less";
 .table{
-  width: 76%;
+  width: 100%;
 //   border:1px @border-color solid;
   float: left;
   td{
@@ -32,5 +32,6 @@
     font-size: 13px;
     white-space: nowrap;
     text-overflow: ellipsis;
+    max-width: 180px;
   }
 }

src/store/async-actions/patInfo.js

@@ -15,6 +15,7 @@ const api = {
     getPatBaseInfo: '/patientInfo/getPatientInfo',
     getHospitalInfo:'/hospitalInfo/getHospitalInfo',
     getPreMsg:'/api/prec/inquiryInfo/getInquiryDetail',
+    getPreMsgLis:'/api/prec/inquiryInfo/hisInquirys',
     getDoctorConfig:'/doctorPageMode/getDoctorPageModes',       //获取医生设置
 };
 
@@ -23,7 +24,7 @@ export const getPreMsg = (dispatch, getState) => {
     // let baseList = getState();
     // let state = baseList.patInfo.message;
     const inCode = config.preIcss.recordIdVal===-1?getUrlArgObject("recordId"):config.preIcss.recordIdVal;
-    json(api.getPreMsg, {
+    json(api.getPreMsgLis, {
         "hospitalCode": getUrlArgObject('hospitalId'),
         "inquiryCode":inCode,
         "patientCode": getUrlArgObject("patientNo"),
@@ -32,13 +33,14 @@ export const getPreMsg = (dispatch, getState) => {
         const data = res.data;
         if (data.code == 0) {
             let result = data.data;
+            console.log(result)
             let preIcss = {
               chief:result.chiefComplaint?new Array(result.chiefComplaint):[],
               current:result.xbs?new Array(result.xbs):[],
               other:result.qts?new Array(result.qts):[],
               checkBody:result.supplement?result.supplement:''
             }
-            dispatch({type:SETPRE,show:true});
+            // dispatch({type:SETPRE,show:true});
             dispatch({type:SETPREDATA,preData:preIcss});
         } else {
             // console.log(res)
@@ -92,15 +94,15 @@ export const initHistoryDetails = (dispatch) => {
             "inquiryCode": state.recordId,
         }).then((res) => {
             const data = res.data;
+            let pre = baseList.homePage.sysConfig.connect_prec;
+            (pre==1)&&getPreMsg(dispatch)
             if (data.code == 0) {
                 const detail = data.data;
                 if(detail.dataJson){
                   pushAllDataList(detail.sign,'push',detail,'history');
                 }else{
-                  let pre = baseList.homePage.sysConfig.connect_prec;
-                  (pre==1)&&getPreMsg(dispatch)
-                  // (pre==1)&&dispatch({type:SETPRE,show:true});
-
+                  // let pre = baseList.homePage.sysConfig.connect_prec;
+                  // (pre==1)&&getPreMsg(dispatch)
                 }
                 dispatch({
                   type:ISREAD