样式调整

src/components/EMRContainer/index.less

@@ -5,7 +5,7 @@
  }
 .EMR-container{
   background: #fff;
-  margin:60px 20px 0 0;
+  margin:165px 20px 0 0;
   // margin-right:@push-width + 10px;
   /*padding: 0px 0 10px 0 ;*/
   box-sizing: border-box;

src/components/InfoTitle/index.jsx

@@ -54,14 +54,14 @@ class InfoTitle extends Component {
         const {le} = this.state;
         return <div className={style['title-wrapper']}  style={{left:le}}>
             <PatInfoContainer />
-            <div className={style['activeWrap']}>
+            {/* <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>
+            </div> */}
             <HistoryCases></HistoryCases>
             <Loading show={loading} text={loadingText} type={loadingType}/>
         </div>;

src/components/InfoTitle/index.less

@@ -11,7 +11,9 @@
   top: 50px;
   right: 468px;
   min-width: 548px;
-  padding-right: 122px;
+  // padding-right: 122px;
+  padding: 30px 20px;
+  box-sizing: border-box;
   .activeWrap {
     position: absolute;
     right: 0;

src/components/PatInfo/index.jsx

@@ -4,26 +4,51 @@ import style from "./index.less";
 class PatInfo extends Component {
   constructor(props){
     super(props)
+    this.handleName = this.handleName.bind(this)
   }
   componentWillMount() {
     const { getMessage } = this.props;
     getMessage && getMessage()
   }
-
+  handleName(){
+    const { setParams } = this.props;
+    setParams({name:'萨达实打实'})
+  }
   render(){
     const {message} = this.props.patInfo;
      return <table className={style["table"]}>
-      <tr>
+      {/* <tr>
         <td key='1' className={`${style.tdBorderB} ${style.tdBorderR}`} title={'卡号:' + (message.patientIdNo||'')}>卡号：{message.patientIdNo}</td>
         <td key='2' className={`${style.tdBorderB} ${style.tdBorderR}`} title={'姓名:' + (message.patientName||'')}>姓名：{message.patientName}</td>
         <td key='3' className={`${style.tdBorderB} ${style.tdBorderR}`} title={'年龄：'+(message.patientAge||'')}>年龄：{message.patientAge}</td>
         <td key='4' className={`${style.tdBorderB} ${style.tdBorderR}`} title={'性别：'+(message.patientSex||'')}>性别：{message.patientSex}</td>
-      </tr>
-      <tr>
+        </tr>
+        <tr>
         <td key='5' className={`${style.tdBorderR}`} style={{whiteSpace: 'nowrap'}} title={'就诊时间：'+(message.systemTime&&message.systemTime.substring(0, 10)||'')}>就诊时间：{message.systemTime&&message.systemTime.substring(0, 10)}</td>
         <td key='6' className={`${style.tdBorderR}`} title={'科室：'+(message.hospitalDeptName||'')}>科室：{message.hospitalDeptName}</td>
         <td key='7' className={`${style.tdBorderR}`} title={'医生：'+(message.doctorName||'')}>医生：{message.doctorName}</td>
         <td key='8' className={`${style.tdBorderR}`} title={'门诊号：'+(message.recordId||'')}>门诊号：{message.recordId}</td>
+      </tr> */}
+      <tr>
+        <td key='1' className={`${style.tdBorderB} ${style.tdBorderR}`}>
+          <span>姓名：</span>
+          <input type="text" className={style['name']} onChange={this.handleName} value={message.patientName}/>
+        </td>
+        <td key='2' className={`${style.tdBorderB} ${style.tdBorderR}`}>
+          <span>性别：</span>
+          <input type="text" className={style['sex']} onChange={this.handleName} value={message.patientSex} readOnly/>
+          <ul className={style['sexSelect']}>
+            <li>请选择</li>
+            <li>男</li>
+            <li>女</li>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+        <td key='3' colSpan="2" className={`${style.tdBorderB} ${style.tdBorderR}`}>
+          <span>年龄：</span>
+          <input type="text" className={style['age']} value={message.patientAge}/>
+        </td>
       </tr>
     </table>;
   }

src/components/PatInfo/index.less

@@ -10,21 +10,39 @@
     padding-left: 10px;
     width: 200px;
     white-space: nowrap;
+    input {
+      border: 1px solid #E6E6E6;
+      height: 36px;
+      line-height: 36px;
+      border-radius: 5px;
+      padding: 0 10px;
+      box-sizing: border-box;
+    }
+    .name {
+      width: 224px;
+    }
+    .age {
+      width: 224px;
+      margin-top: 24px;
+    }
   }
   .tdBorderB {
-    border-bottom: 1px solid @person-table-color;
+    // border-bottom: 1px solid @person-table-color;
     max-width: 110px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
   .tdBorderR {
-    border-right: 1px solid @person-table-color;
+    // border-right: 1px solid @person-table-color;
     max-width: 110px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
+  .sexSelect {
+    display: none;
+  }
 }
 .newSize{
   td{

src/components/PushItems/PushDiag/index.less

@@ -14,7 +14,7 @@
     margin-right: 5px;
 }
 .push-diag-box {
-    padding: 5px 0 15px 15px;
+    padding: 5px 0 5px 15px;
     position: relative;
 }
 .push-diag-item {

src/components/PushItems/RecommendInspect/index.less

@@ -3,7 +3,7 @@
     
         
 .inspectItem{
-padding: 10px 0px 4px 0px;
+padding: 10px 0px 0px 0px;
 overflow: hidden;
 .title{
   float: left;
@@ -21,7 +21,7 @@ overflow: hidden;
     font-size: 14px;
     line-height: 14px;
     display: inline-block;
-    margin: 0 6px 6px 6px;
+    margin: 3px 6px 6px 6px;
     cursor: pointer;
     input[type='checkbox']{
       float: left;

src/components/PushItems/index.jsx

@@ -204,7 +204,7 @@ class PushItems extends Component {
               <PushDiag
                 titleBg="#FAEBEC"
                 icon={doubtImg}
-                title="初步诊断"
+                title="初步判断"
                 diagList={doubt}
               />
             )}
@@ -212,7 +212,7 @@ class PushItems extends Component {
               <PushDiag
                 titleBg="#FAEBEC"
                 icon={possibleImg}
-                title="可能诊断"
+                title="可能判断"
                 diagList={possible}
               />
             )}
@@ -220,7 +220,7 @@ class PushItems extends Component {
               <PushDiag
                 titleBg="#FAEBEC"
                 icon={likelyImg}
-                title="鉴别诊断"
+                title="鉴别判断"
                 diagList={likely}
               />
             )}
@@ -234,7 +234,7 @@ class PushItems extends Component {
                   <div className={style["doubt"]}>
                     <h1>
                       <img src={doubtImg} />
-                      初步诊断
+                      初步判断
                     </h1>
                     <div className={style["no-push"]}>无</div>
                   </div>

src/components/PushItems/index.less

@@ -97,7 +97,7 @@
     }
     .contentBox {
       font-size: 14px;
-      padding:6px 0px 6px 15px;
+      padding:0px 0px 0px 15px;
     }
   }
 }

src/containers/EditableSpan.js

@@ -11,7 +11,7 @@ import {SETTEXTFOCUS,RESET,SETDROPSHOW,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODU
 import config from '@config/index';
 import store from '@store';
 
-function mapStateToProps(state){//console.log(state)
+function mapStateToProps(state){console.log(state)
   return {
     mainSaveText:state.mainSuit.saveText,
     isRead:state.homePage.isRead,

src/containers/OperationContainer.js

@@ -12,7 +12,7 @@ import { saveMessage, clearMessages } from "../store/async-actions/print";
 import { saveTemplateDetail, getDepartments, saveAdminTemplateDetail, getFloderList,newFloder,orderFloder } from '@store/async-actions/tabTemplate';
 import { getDptLis,folderModal,folderOrder } from '@store/actions/tabTemplate';
 import { saveClickNum, getInitModules } from '@store/async-actions/homePage';
-import { getOtherHisRecord } from '@store/async-actions/fetchModules';
+// import { getOtherHisRecord } from '@store/async-actions/fetchModules';
 import { RECOVER_TAG_MAIN } from '@store/types/mainSuit';
 import { RECOVER_TAG_CURRENT } from '@store/types/currentIll';
 import { RECOVER_TAG_OTHER } from '@store/types/otherHistory';
@@ -89,7 +89,7 @@ function mapDispatchToProps(dispatch) {
     },
     clear: (flag) => {
       clearMessages();
-      dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
+      // dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
       // 清除时如果是慢病模板则重新获取模板
       if (flag) {
         dispatch(getInitModules);

src/containers/PatInfoContainer.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 import {initPersonInfo} from '../store/async-actions/patInfo';
+import {SET_PARAMS} from '@store/types/patInfo.js';
 import PatInfo from '../components/PatInfo';
 
 function mapStateToProps({patInfo}) {
@@ -11,6 +12,12 @@ function mapDispatchToProps(dispatch) {
     return {
         getMessage: () => {
             dispatch(initPersonInfo)
+        },
+        setParams: (data) => {
+            dispatch({
+                type:SET_PARAMS,
+                data
+              });
         }
     }
 }

src/containers/TypeConfigContainer.js

@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import Banner from "../components/Banner";
 import { SHOW_CONFIG_MODAL, CLOSE_CONFIG_MODAL, CONFIRM_TYPE } from "../store/types/typeConfig";
 import {pushAllDataList} from '@utils/tools';
-import {saveMode,getOtherHisRecord} from '@store/async-actions/fetchModules';
+import {saveMode} from '@store/async-actions/fetchModules';
 import { allCheckedShow } from '@store/actions/tabTemplate';
 import {Notify} from '@commonComp';
 

src/store/actions/patInfo.js

@@ -49,4 +49,16 @@ export const updateHospitalMessage=(state,action)=>{
     }
     res.hospitalMsg = tmpObj || {};
     return res;
-};
+};
+
+export const setParams=(state,action)=>{
+  const res=Object.assign({},state);
+  let tmpObj = res.message
+  console.log(action)
+  for(let k in action.data){
+    tmpObj[k] = action.data[k]
+  }
+  res.message = tmpObj;
+  return res;
+
+}

src/store/async-actions/homePage.js

@@ -4,7 +4,7 @@ import {SET_CURRENT} from '@store/types/currentIll';
 import {SET_MAINSUIT} from '@store/types/mainSuit';
 import config from '@config/index.js';
 import {formatContinueDots,getUrlArgObject,storageLocal,fullfillText,checkFullfillText} from '@utils/tools';
-import {getOtherHisRecord,getInitData} from '@store/async-actions/fetchModules.js';
+// import {getOtherHisRecord,getInitData} from '@store/async-actions/fetchModules.js';
 import {initHistoryDetails} from '@store/async-actions/patInfo';
 
 const api = {
@@ -42,9 +42,11 @@ export const getInitModules= (dispatch,getStore)=>{
   const param = {
     age:message.patientAge,
     sexType:message.sex,
-    mouduleType:chronicId?2:(message.selfDeptId?1:0),//慢病2  科室1 其他0
+    mouduleType:1,//慢病2  科室1 其他0
+    relationId:420671, //慢病id  科室id  其他0
+    // mouduleType:chronicId?2:(message.selfDeptId?1:0),//慢病2  科室1 其他0
     // relationId:chronicId?chronicId:(message.hospitalDeptId?message.hospitalDeptId:0), //慢病id  科室id  其他0
-    relationId:chronicId?chronicId:(message.selfDeptId?message.selfDeptId:0), //慢病id  科室id  其他0
+    // relationId:chronicId?chronicId:(message.selfDeptId?message.selfDeptId:0), //慢病id  科室id  其他0
   }
   // return json(api.getModules,{age:message.patientAge,sexType:message.sex}).then((res) => {
   return json(api.getModules,param).then((res) => {
@@ -89,7 +91,7 @@ export const getInitModules= (dispatch,getStore)=>{
             // 慢病现病史没有空模板
           });
         }
-        dispatch(getOtherHisRecord());          //获取其他史最近记录
+        // dispatch(getOtherHisRecord());          //获取其他史最近记录
       }
     })
 };

src/store/async-actions/patInfo.js

@@ -92,6 +92,8 @@ export const initHospitalInfo = (dispatch, getState) => {
 }
 //参数转换
 export const initPersonInfo = (dispatch, getState) => {
+    getPatientMessage(dispatch, getState);
+    return
     json('/tranFieldInfo/getInfoByUuid', {
         "uuid": getUrlArgObject('hospitalId'),
     }).then((res) => {
@@ -171,6 +173,7 @@ function getDoctorConfig(id,dispatch){
     }
   });
 }
+// getPatientMessage(dispatch, getState);
 
 //技术部需求，先获取第一个接口再去第二个
 export async function getPatientMessage(dispatch, getState){
@@ -184,45 +187,45 @@ export async function getPatientMessage(dispatch, getState){
     recordId:urlDatas.recordId
   };
 
-  let res1 = await json(api.getPatInfo, params);
-  /*console.log(res1);
-  console.log(1);*/
-  let res2 = await json(api.getPatBaseInfo, params);
-  /*console.log(res2);
-  console.log(2);*/
-  let data1 = {},data2 = {};
-  if(res1.data.code=='0'){
-    data1 = res1.data.data;
-    data1.doctorId&&getDoctorConfig(data1.doctorId,dispatch);
-  }else{
-    dispatch({type:MODI_LOADING,flag:false});
-    dispatch({type:SHOW_LOADING,flag:true,text:res1.data.msg,lType:'warning'});
-    return;
-  }
-  if(res2.data.code=='0'){
-    data2 = res2.data.data;
-  }else{
-    dispatch({type:MODI_LOADING,flag:false});
-    dispatch({type:SHOW_LOADING,flag:true,text:res2.data.msg,lType:'warning'});
-    return;
-  }
-  //患者或医生信息有误，禁止操作
-  if(Object.keys(data1).length>0&&Object.keys(data2).length>0&&data1.doctorId){
-    dispatch({type:SHOW_LOADING,flag:false});
-  }else{
-    dispatch({type:MODI_LOADING,flag:false});
-    dispatch({type:SHOW_LOADING,flag:true,text:"获取医生信息失败",lType:'warning'});
-    return;
-  }
-  getAdminCheckout(data1.doctorId,data1.hospitalId,dispatch);
-  dispatch({
-    type: GET_PATIENT_MESSAGE,
-    data:Object.assign(data1,data2)
-  });
+  // let res1 = await json(api.getPatInfo, params);
+  // /*console.log(res1);
+  // console.log(1);*/
+  // let res2 = await json(api.getPatBaseInfo, params);
+  // /*console.log(res2);
+  // console.log(2);*/
+  // let data1 = {},data2 = {};
+  // if(res1.data.code=='0'){
+  //   data1 = res1.data.data;
+  //   data1.doctorId&&getDoctorConfig(data1.doctorId,dispatch);
+  // }else{
+  //   dispatch({type:MODI_LOADING,flag:false});
+  //   dispatch({type:SHOW_LOADING,flag:true,text:res1.data.msg,lType:'warning'});
+  //   return;
+  // }
+  // if(res2.data.code=='0'){
+  //   data2 = res2.data.data;
+  // }else{
+  //   dispatch({type:MODI_LOADING,flag:false});
+  //   dispatch({type:SHOW_LOADING,flag:true,text:res2.data.msg,lType:'warning'});
+  //   return;
+  // }
+  // //患者或医生信息有误，禁止操作
+  // if(Object.keys(data1).length>0&&Object.keys(data2).length>0&&data1.doctorId){
+  //   dispatch({type:SHOW_LOADING,flag:false});
+  // }else{
+  //   dispatch({type:MODI_LOADING,flag:false});
+  //   dispatch({type:SHOW_LOADING,flag:true,text:"获取医生信息失败",lType:'warning'});
+  //   return;
+  // }
+  // getAdminCheckout(data1.doctorId,data1.hospitalId,dispatch);
+  // dispatch({
+  //   type: GET_PATIENT_MESSAGE,
+  //   data:Object.assign(data1,data2)
+  // });
   localStorage.removeItem('deletedTags');
   dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
-  dispatch(getCommonList(5));     //获取常用化验标签列表
-  dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
+  // dispatch(getCommonList(5));     //获取常用化验标签列表
+  // dispatch(getCommonList(6));     //获取常用辅检标签列表if(allModules.length == 0){//模板为空才回读
   // dispatch(initHistoryDetails());      //历史病历回读
   // initHospitalInfo(dispatch, getState) //不需要的
 }

src/store/async-actions/pushMessage.js

@@ -302,6 +302,7 @@ export const getMRAnalyse = () => {
   let flg = isAllClear(jsonStr);
   if(flg) {
     return (dispatch, getState) => {
+      return
       const param = getMRInfo()
       json(api.getMRAnalyse, param)
       .then((res) =>{

src/store/reducers/getInfoByUuid.js

@@ -1,7 +1,11 @@
 import {GET_INFO_BY_UUID} from '@store/types/getInfoByUuid';
 import { getUrlArgObject } from '@utils/tools';
 const initPersonList = {
-    
+    // deptNo: "D01",
+    // doctorNo: "YS001",
+    // hospitalId: "A001",
+    // patientNo: "1600",
+    // recordId: "44"
 }
 
 export default (state = initPersonList, action) => {

src/store/reducers/patInfo.js

@@ -1,48 +1,36 @@
-import {GET_PATIENT_MESSAGE,GET_HOSPITAL_MESSAGE} from '../types/patInfo';
-import {updatePatientMessage,updateHospitalMessage} from '../actions/patInfo';
-
+import {GET_PATIENT_MESSAGE,GET_HOSPITAL_MESSAGE,SET_PARAMS} from '../types/patInfo';
+import {updatePatientMessage,updateHospitalMessage,setParams} from '../actions/patInfo';
+// age: 28
+// mouduleType: 1
+// relationId: 420671
+// sexType: 1
 const initState = {
     message: {
-      address: null,
-      birthday: "1992-01-01 20:04:03",
-      code: "1600",
-      contactPhone: null,
-      contacts: null,
-      country: null,
-      doctorCode: "YS001",
-      doctorId: 1,
-      doctorName: "付医生",
-      hospitalCode: "A001",
-      hospitalDeptCode: "D01",
-      hospitalDeptId: 1,
+      sex: '',//必填
+      patientAge: '',//必填
+      hospitalCode: "A001",//必填
+      patientSex: "",
+      selfDeptName: "全科",
+      selfDeptId: 420671,
+      doctorId: '',
       hospitalDeptName: "全科",
-      hospitalId: 1,
-      hospitalName: "浙江大学医学院附属邵逸夫医院",
       id: 1,
-      idNo: "130705199206061818",
-      idType: null,
-      identityNum: "130705199206061818",
-      matrimony: null,
-      name: "ssss",
-      nationality: null,
-      operation: null,
-      patientAge: 28,
-      patientCode: "1600",
-      patientId: 1,
-      patientIdNo: "130705199206061818",
-      patientIdentityNum: "130705199206061818",
-      patientName: "王明明sss",
-      patientPhone: null,
-      patientSex: "男",
-      phone: null,
-      postcode: null,
-      recordId: "44",
-      remark: null,
-      selfDeptId: 420671,
-      selfDeptName: "全科",
-      sex: 1,
-      systemTime: "2020-11-11 16:39",
-      workUnit: null
+      hospitalId: '',
+      patientId: "",
+      patientCode: "",
+      code: "",
+      hospitalName: "",
+      birthday: "",
+      doctorCode: "",
+      doctorName: "",
+      hospitalDeptCode: "",
+      hospitalDeptId: "",
+      name: "",
+      patientIdNo: "",
+      patientIdentityNum: "",
+      patientName: "",
+      recordId: "",
+      systemTime: "",
     },
     hospitalMsg:{}
 };
@@ -52,6 +40,8 @@ export default function(state = initState,action){
       return updatePatientMessage(state,action);
     case GET_HOSPITAL_MESSAGE:
       return updateHospitalMessage(state,action);
+    case SET_PARAMS:
+      return setParams(state,action);
     default:
       return state;
   }

src/store/reducers/typeConfig.js

@@ -2,13 +2,21 @@ import { SHOW_CONFIG_MODAL, CLOSE_CONFIG_MODAL, CONFIRM_TYPE, SET_READ_MODE} fro
 import { showConfigModal, closeConfigModal, confirmType, setReadMode} from "../actions/typeConfig";
 import config from '@config/index';
 
+// const initState = {
+//   visible: false,
+//   isPreIcss:false,//是否为引用预问诊数据
+//   typeConfig: config.defaultValue,
+//   readConfig:-1,    //回读/引用回来的配置
+//   readMode:-1,  //回读/引用回来的模式，-1即没有回读模式
+//   mode:config.defaultValue[0],       //设置的模式， 0:智能推送模式， 1：纯文本模式,用于切换选中状态
+// };
 const initState = {
-  visible: false,
-  isPreIcss:false,//是否为引用预问诊数据
-  typeConfig: config.defaultValue,
-  readConfig:-1,    //回读/引用回来的配置
-  readMode:-1,  //回读/引用回来的模式，-1即没有回读模式
-  mode:config.defaultValue[0],       //设置的模式， 0:智能推送模式， 1：纯文本模式,用于切换选中状态
+  isPreIcss: false,
+  mode: 0,
+  readConfig: 1,
+  readMode: -1,
+  typeConfig: {0: 0, 1: 0, 2: 0, 3: 0, 4: 1},
+  visible: false
 };
 export default function(state = initState, action) {
   switch (action.type) {

src/store/types/patInfo.js

@@ -1,2 +1,3 @@
 export const GET_PATIENT_MESSAGE = 'GET_PATIENT_MESSAGE'
-export const GET_HOSPITAL_MESSAGE = 'GET_HOSPITAL_MESSAGE'
+export const GET_HOSPITAL_MESSAGE = 'GET_HOSPITAL_MESSAGE'
+export const SET_PARAMS = 'SET_PARAMS'