v6

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -41,6 +41,7 @@ class HistoryCaseContainer extends React.Component {
           activeIndex: 0,
           showEditIcon: false,
           showDelIcon: false,
+          desc: false // 正序/逆序
         }
         this.handleCaseClick=this.handleCaseClick.bind(this)
         this.handleQuoteClick=this.handleQuoteClick.bind(this)
@@ -70,21 +71,22 @@ class HistoryCaseContainer extends React.Component {
     }
 
     // 操作后获取获取列表数据
-    getTemplatePageAlls() {
+    getTemplatePageAlls(val) {
       return new Promise((resolve,reject)=>{
-        initItemList().then(res => {
+        initItemList(val).then(res => {
           const result = res.data
           if (result.code == 0 && result.data) {
             store.dispatch(setInitHistory(result.data));
             resolve('ok')
           }
-        })
+        })       
       })
     }
 
 
     // 点击当前的历史病历
     handleCaseClick(idx,val) {
+  
       const { items } = this.props;
       let tmpItems = []
       $("#hislistLeft li").eq(idx).css({
@@ -267,14 +269,34 @@ class HistoryCaseContainer extends React.Component {
   }
 
     // 排序
-    handleSortClick(){
-      const { items } = this.props;
-      let length = items &&  items.length
-      let index = length - this.state.currentIndex -1
-      this.props.handleSortClick()
-      this.setState({
-        currentIndex: index
-      })
+  handleSortClick(){
+    this.setState({
+      desc: !this.state.desc
+    },()=>{         
+        let desc = this.state.desc ? 'up' : 'down'
+        this.getTemplatePageAlls(desc).then(res => {
+          if (res === 'ok') {
+            const { items } = this.props;
+            if (items.length === 0) {
+              this.setState({
+                activeHis: {}
+              })
+              store.dispatch(showHistory(false));
+              return
+            }
+            this.handleCaseClick(0, items[0])
+          }
+        })
+    })
+
+     
+      // const { items } = this.props;
+      // let length = items &&  items.length
+      // let index = length - this.state.currentIndex -1
+      // this.props.handleSortClick()
+      // this.setState({
+      //   currentIndex: index
+      // })
     }
 
     render(){

src/components/Operation/index.jsx

@@ -98,11 +98,23 @@ class Operation extends Component {
 
   saveAll(type) {
     let keepState = readyKeepHistory();
-    // console.log(keepState,'keepState');
+    // console.log(keepState, '====keepState');
     if(keepState == 1){
         Notify.info('主诉不能为空');
         return;
-    }
+    }   
+    if (keepState == 2) {
+      Notify.info('姓名不能为空');
+      return;
+    }   
+    if (keepState == 3) {
+      Notify.info('年龄不能为空');
+      return;
+    }   
+    if (keepState == 4) {
+      Notify.info('性别不能为空');
+      return;
+    }   
     // }else if(keepState == 2){
     //     Notify.info('诊断不能为空');
     //     return;
@@ -328,6 +340,7 @@ class Operation extends Component {
   makeSure() {
     const { save, clear, saveDataAll,saveDataAlls,diagShowTmp ,chronicMagItem,chronicDesease,admin,floderListAdmin} = this.props;
     const { type,deptId,sex,title,fstName,folderId,folderNameVal } = this.state;
+    // console.log(type,'======type');
     if (type == 1) {
       diagShowTmp(false)
       this.setState({ title: '' })
@@ -338,16 +351,19 @@ class Operation extends Component {
       }
       save();
     } else if (type == 2) {
+      // type === 2 清除数据
       diagShowTmp(false);
       this.setState({ title: '' })
       // 慢病标识
       const chronicFlag = chronicMagItem || chronicDesease?true:false;
+      // console.log(chronicFlag,'chronicFlag');
       clear(chronicFlag);
       //更新滚动条
       const that = this;
       setTimeout(function(){
         that.context.scrollArea&&that.context.scrollArea.refresh();
       });
+      // console.log(1111111111111);
     } else if (type == 3) {
       if (this.state.title.trim() == '') {
         Notify.error('请输入模板名称')

src/components/PatInfo/index.jsx

@@ -1,5 +1,8 @@
 import React, { Component } from "react";
 import style from "./index.less";
+import {
+  timesYMDTime
+} from '@utils/tools';
 
 class PatInfo extends Component {
   constructor(props){
@@ -33,7 +36,7 @@ class PatInfo extends Component {
         {
           label: 'systemTime',
           id: 'systemTime',
-          value: '2020-08-10',
+          value: timesYMDTime(new Date().getTime()),
           title: '就诊时间'
         },
         {
@@ -63,62 +66,59 @@ class PatInfo extends Component {
     const { getMessage, initPatInfoData } = this.props;
     getMessage && getMessage()
     initPatInfoData && initPatInfoData(this.state.patientInfo)
+
+    // console.log(timesYMDTime(new Date().getTime()),'电脑时间');
+
   }
   componentWillReceiveProps(nextProps){
+    // console.log(nextProps,'nextProps');
     const { patInfoData } = nextProps.patInfo
     this.setState({
       patientInfo:patInfoData
     })
-    // const {message} = nextProps.patInfo
-    // let { patientInfo} = this.state
-    // if (Object.keys(message).legnth !== 0){     
-    //   patientInfo.forEach(item =>{
-    //     item.value = message[item.label]
-    //   })
-    //   this.setState({
-    //     patientInfo
-    //   })
-    // }
   }
 
   handleChange(e){
     const { initPatInfoData } = this.props;
-    let { patientInfo } = this.state
-    let patientItem = patientInfo.find(item =>{
+    
+    let { patientInfo } = this.state;
+    let newInfo = Object.assign([], patientInfo);
+    // console.log(newInfo,'newInfo');
+    let patientItem = newInfo.find(item =>{
       return item.id === e.target.id
-    })
+    })  
+    // 处理性别
+    if (patientItem.id === 'patientSex'){     
+      if (e.target.value === '男') {
+        patientItem.value = 1
+      } else if (e.target.value === '女'){
+        patientItem.value = 0
+      } else {
+        patientItem.value = 0  // 默认为女
+      }
+    }
     patientItem.value = e.target.value;
-    initPatInfoData && initPatInfoData(this.state.patientInfo)
-    // this.setState({
-    //   patientInfo
-    // })
+    // console.log(e.target.value, '性别', patientItem)
+    this.setState({
+      patientInfo: newInfo
+    },()=>{
+        initPatInfoData && initPatInfoData(this.state.patientInfo)
+    })
+    
   }
 
   render(){
     const {message} = this.props.patInfo;
-
      return (
-      //  <table className={style["table"]}>
-      //    <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>
-      //      <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>
-      //  </table>
        <div className={style["infoContainer"]}>         
          {
             this.state.patientInfo.map((item, index) => {
               return (
                 <div className={style["infoItem"]} key={item.id}>
                   <label for={item.label}>{item.title}：</label>
-                  {item.id === 'patientSex' ? (<input id={item.id} type="text" autocomplete="off" value={item.value === 0 ? '女' : '男'} onChange={this.handleChange} />) : (<input id={item.id} type="text" autocomplete="off" value={item.value} onChange={this.handleChange} />) }
+                  {item.id === 'patientSex' && (<input id={item.id} type="text" autocomplete="off" value={item.value == 1 ? '男' : '女'} onChange={this.handleChange} />)}
+                  {item.id === 'systemTime' && (<input id={item.id} type="text" autocomplete="off"  disabled value={item.value } onChange={this.handleChange} />)}
+                  {item.id !== 'patientSex' && item.id !== 'systemTime' &&  (<input id={item.id} type="text" autocomplete="off" value={item.value} onChange={this.handleChange} />) }                  
                 </div>
               )
             })

src/containers/OperationContainer.js

@@ -102,7 +102,7 @@ function mapDispatchToProps(dispatch) {
     },
     clear: (flag) => {
       clearMessages();
-      dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
+      // dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
       // 清除时如果是慢病模板则重新获取模板
       if (flag) {
         dispatch(getInitModules);

src/store/actions/patInfo.js

@@ -75,11 +75,12 @@ export const clearMedicalName = (state, action) => {
 // reInitPatInfo
 export const reInitPatInfo = (state, action) => {
   const res = Object.assign({}, state);
+  // console.log(action.params, 'action.params');
   res.patInfoData[0].value = action.params && action.params.cardNo;
   res.patInfoData[1].value = action.params && action.params.patName;
   res.patInfoData[2].value = action.params && action.params.age;
   res.patInfoData[3].value = action.params && action.params.sex;
-  res.patInfoData[4].value = action.params && action.params.gmtCreate;
+  res.patInfoData[4].value = action.params && action.params.inquiryDate;
   res.patInfoData[5].value = action.params && action.params.deptName;
   res.patInfoData[6].value = action.params && action.params.doctorName;
   res.patInfoData[7].value = action.params && action.params.inquiryCode;

src/store/async-actions/diagnosticSearch.js

@@ -3,6 +3,7 @@ import { GET_SEARCH_RESULT } from '@store/types/diagnosticSearch';
 import { GET_SEARCH } from '@store/types/emergencyHis';
 import {  Notify } from '@commonComp';
 import { formatFormParmas } from '@utils/tools';
+import store from '@store';
 
 export const getSearchList = (val,flag) => {
     if(val.trim() == ''){
@@ -21,6 +22,7 @@ export const getSearchList = (val,flag) => {
    
     return (dispatch, getState) => {
         const state = getState();
+        let baseList = state;
         const diagnosticList = flag?state.emergencyHis.searchData:state.diagnosticList.diagnosticList;
         let noIds = []
         for(let i = 0; i < diagnosticList.length; i++) {

src/store/async-actions/historyTemplates.js

@@ -7,24 +7,18 @@ import store from '@store';
 import { billing, getMRAnalyse} from '@store/async-actions/pushMessage';
 
 export const initItemList = (item) => {
-  // let baseList = store.getState();
-  // let state = baseList.patInfo.message;
-  // const param = {
-  //     "hospitalId": state.hospitalId,
-  //     "patientId": state.patientId,
-  //     "disName":item&&item.name?item.name : 'dis',
-  //     "disType":item?1:0,
-  //     "current": 1,
-  //     "size": 9999
-  //   }
-  //   return axios.json('/inquiryInfo/hisInquirys',param);
-  const params = {
-    sex: "",
-    name: '',
-    current: 1,
-    size: 9999
-  } 
-  return axios.json('/demo/templateInfo/getTemplatePageAlls', params);
+    let params = {
+      sex: '',
+      name: '',
+      current: 1,
+      size: 9999,
+    }; 
+    if (item === 'up') {
+      params.desc = ['gmt_create'];
+    }else if(item === 'down'){
+      params.asc = ['gmt_create'];
+    }
+    return axios.json('/demo/templateInfo/getTemplatePageAlls', params);
 };
 export const getHistempDetail = (item) => {
   const param = {
@@ -35,6 +29,7 @@ export const getHistempDetail = (item) => {
             const data =res.data;
             if(data.code == 0){
                 let tmpData = data.data
+                // console.log(tmpData, 'tmpData');
                 // pushAllDataList(item.sign,'push',tmpData,'history')       //引用
                 pushHistoryDataList(tmpData);       //引用
                 // if(didPushParamChange()) {

src/store/async-actions/mainSuit.js

@@ -15,7 +15,7 @@ export const getCommSymptoms = ()=>{//获取常见症状
     const {message} = state.patInfo;
     //从state中拿到门诊号
     const deptCode = message.selfDeptId;
-    const deptName = message.selfDeptName;//标准化
+    const deptName = message && message.selfDeptName;//标准化
     const params = {
       // 'deptId':deptCode,
       'deptName':deptName,

src/store/async-actions/print.js

@@ -6,13 +6,14 @@ import {MODI_LOADING} from '@store/types/homePage.js';
 import Notify from '@commonComp/Notify';
 import {tellPred} from '@store/async-actions/preIcss.js';
 import {
-    getAllDataList,
-    getAllDataStringList,
-    pushAllDataList,
-    filterDataArr,
-    filterOtherDataArr,
-    timestampToTime,
-    formatTextInfo
+  getAllDataList,
+  getAllDataStringList,
+  pushAllDataList,
+  filterDataArr,
+  filterOtherDataArr,
+  timestampToTime,
+  formatTextInfo,
+  delHistoryDataList,
 } from '@utils/tools';
 export const getConceptDetails = (bool) => {
     let baseList = store.getState();
@@ -151,13 +152,12 @@ export const saveMedicalData = () =>{
         "deptName": formatFormParmas('hospitalDeptName', patInfoData),
         "doctorName": formatFormParmas('doctorName', patInfoData),
         "inquiryCode": formatFormParmas('recordId', patInfoData),
-        "inquiryDate": inquiryDate,
+        "inquiryDate": '2020-08-16 14:55:45',
         "modeName": modeName,
         "patName": formatFormParmas('patientName', patInfoData),
         "preview": JSON.stringify(preview),  // 左侧病历预览信息
         "sex": sex,
     }
-    console.log(params,'=============发送的params');
     json('/demo/templateInfo/saveTemplateInfo', params).then(res=>{
         let data = res.data
         if (data.code == 0) {            
@@ -353,7 +353,8 @@ function getEvaluations(base,pushMessage){
 }
 
 export const clearMessages = () => {
-    let baseList = store.getState();
-    let whichSign = baseList.typeConfig.mode;
-    pushAllDataList(whichSign,'clear');
+    // let baseList = store.getState();
+    // let whichSign = baseList.typeConfig.mode;
+    // pushAllDataList(whichSign,'clear');
+    delHistoryDataList()
 };

src/store/reducers/assistCheck.js

@@ -8,6 +8,7 @@ import {
   ADD_ASSIST_LABEL,
   CHECK_OFF_ON,
   REASSISTCHECKDATA,
+  CLEARASSISTCHECKDATA,
 } from '../types/assistCheck';
 import store from '@store';
 const initSearchList = {
@@ -152,13 +153,17 @@ export default (state = initSearchList, action) => {
   }
   if (action.type == REASSISTCHECKDATA) {
     const newState = Object.assign({}, state);
-    // console.log(action, '=====action==========');
-    // console.log(newState, '====newState===========');
-    // newState.labelListBig = action.params[8].content.labelListBig;
     newState.assistLabel = action.params[9].contentValue;
     newState.dataArr = action.params[9].contentValue;
     newState.dataString = action.params[9].content;
     return newState;
   }
+  if (action.type == CLEARASSISTCHECKDATA) {
+    let newState = Object.assign({}, state);
+    newState.assistLabel = [];
+    newState.dataArr = [];
+    newState.dataString = [];
+    return newState;
+  }
   return state;
 }

src/store/reducers/checkBody.js

@@ -24,6 +24,7 @@ import {
   DELETE_CHECK_SELECTED_TAGS,
   SETCHECKTEXTMODEVALUE,
   RECHECKBODYTEXTDATA,
+  CLEARCHECKBODYTEXTDATA,
 } from '../types/checkBody.js';
 import {
   recoveTag,
@@ -113,6 +114,9 @@ export default function(state=initState,action){
       return setTextModeValue(state, action);
     case RECHECKBODYTEXTDATA:
       return reCheckBodyData(state, action);
+    case CLEARCHECKBODYTEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/reducers/currentIll.js

@@ -31,6 +31,7 @@ import {
   SHOW_COMMON_ON_CURRENT,
   DELETE_CURRENT_SELECTED_TAGS,
   RECURRENTDATA,
+  CLEARCURRENTDATA,
 } from '../types/currentIll';
 import {
   confirm,
@@ -137,6 +138,9 @@ export default function(state=initState,action){
     case SHOW_COMMON_ON_CURRENT:
       res.showCommon = action.show;
       return res;
+    case CLEARCURRENTDATA:
+       res.saveText = [];
+      return res;
     // 回显现病史
     case RECURRENTDATA:
       return reCurrentData(state, action);

src/store/reducers/diagnosticList.js

@@ -18,6 +18,7 @@ import {
   SHOW_LOADING,
   ADD_TREAT,
   REDIAGDATA,
+  CLEARDIAGDATA,
 } from '../types/diagnosticList';
 import {
   addDiagnostic,
@@ -93,6 +94,12 @@ export default function (state=initState, action) {
         return res;
       case REDIAGDATA:
         return reDiagData(state, action);
+      case CLEARDIAGDATA:
+        let newState = Object.assign({}, state);
+        newState.diagnosticStr = '';
+        newState.diagnosticList = [];
+        newState.diagnosticStrNoType = '';
+        return newState;
       default:
         return state;
     }

src/store/reducers/familyHistory.js

@@ -1,4 +1,8 @@
-import { SETFAMILYTEXTMODEVALUE, REFAMILYTEXTDATA } from '../types/familyHistory';
+import {
+  SETFAMILYTEXTMODEVALUE,
+  REFAMILYTEXTDATA,
+  CLEARFAMILYTEXTDATA,
+} from '../types/familyHistory';
 import { setTextModeValue, reFamilyData } from '../actions/familyHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
@@ -18,6 +22,9 @@ export default function (state = initState, action) {//console.log(state)
       return setTextModeValue(state, action);
     case REFAMILYTEXTDATA:
       return reFamilyData(state, action);
+    case CLEARFAMILYTEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/reducers/inspect.js

@@ -16,6 +16,7 @@ import {
   DEL_ONE_PIC,
   CHECK_ON_OFF,
   REINSPECTDATA,
+  CLEARINSPECTDATA,
 } from '../types/inspect';
 import store from '@store';
 import { getStringPlus,  getPushLists,  getPushList,getCurrentDate} from '@utils/tools.js';
@@ -270,6 +271,12 @@ export default (state = initSearchList, action) => {
       return newState;
 
     }
+    if (action.type == CLEARINSPECTDATA) {
+      let newState = Object.assign({}, state);
+      newState.labelListBig = [];
+      newState.labelListSmall = [];
+      return newState;
+    }
     return state;
 }
 

src/store/reducers/mainSuit.js

@@ -34,6 +34,7 @@ import {
   CLEAR_ADD_SEARCH,
   DELETE_MAIN_SELECTED_TAGS,
   REMAINSUITDATA,
+  CLEARMAINSUITDATA,
 } from '../types/mainSuit';
 import {
   getCommSymptoms,
@@ -179,6 +180,9 @@ export default function(state=initState,action){
     // 回显主述
     case REMAINSUITDATA:
       return reMainsuitData(state, action);
+    case CLEARMAINSUITDATA:
+      res.saveText = [];
+      return res;
     default:
       return state;
   }

src/store/reducers/marriageHistory.js

@@ -1,4 +1,8 @@
-import { SETMARRIAGETEXTMODEVALUE, REMARRIAGETEXTDATA } from '../types/marriageHistory';
+import {
+  SETMARRIAGETEXTMODEVALUE,
+  REMARRIAGETEXTDATA,
+  CLEARMARRIAGETEXTDATA,
+} from '../types/marriageHistory';
 import { setTextModeValue, reMarriageData } from '../actions/marriageHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
@@ -18,6 +22,9 @@ export default function (state = initState, action) {//console.log(state)
       return setTextModeValue(state, action);
     case REMARRIAGETEXTDATA:
       return reMarriageData(state, action);
+    case CLEARMARRIAGETEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/reducers/menstruationHistory.js

@@ -1,4 +1,8 @@
-import { SETMENSTRUATIONTEXTMODEVALUE, REMENSTRUATIONTEXTDATA } from '../types/menstruationHistory';
+import {
+  SETMENSTRUATIONTEXTMODEVALUE,
+  REMENSTRUATIONTEXTDATA,
+  CLEARMENSTRUATIONTEXTDATA,
+} from '../types/menstruationHistory';
 import { setTextModeValue, reMenstruationData } from '../actions/menstruationHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
@@ -18,6 +22,9 @@ export default function (state = initState, action) {//console.log(state)
       return setTextModeValue(state, action);
     case REMENSTRUATIONTEXTDATA:
       return reMenstruationData(state, action);
+    case CLEARMENSTRUATIONTEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/reducers/newAdvice.js

@@ -16,6 +16,7 @@ import {
   SEARCH_TYPE_NEW,
   CHECK_OFF_ON,
   RENEWADVICEDATA,
+  CLEARNEWADVICEDATA,
 } from '../types/newAdvice';
 import store from '@store';
 import { getStringPlus,  getPushLists,  getPushList,getCurrentDate} from '@utils/tools.js';
@@ -265,6 +266,12 @@ export default (state = initSearchList, action) => {
       newState.labelListSmall = action.params[11].content.labelListSmall;
       return newState;
     }
+    if (action.type == CLEARNEWADVICEDATA) {
+    const newState = Object.assign({}, state);
+    newState.labelListBig = [];
+    newState.labelListSmall = [];
+    return newState;
+    }
     return state;
 }
 

src/store/reducers/pastHistory.js

@@ -1,4 +1,4 @@
-import { SETPASTTEXTMODEVALUE, REPASTTEXTDATA } from '../types/pastHistory';
+import { SETPASTTEXTMODEVALUE, REPASTTEXTDATA, CLEARPASTTEXTDATA } from '../types/pastHistory';
 import { setTextModeValue, rePastData } from '../actions/pastHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
@@ -13,11 +13,14 @@ const initState = {
 
 export default function (state = initState, action) {//console.log(state)
   const res = Object.assign({}, state);
-  switch (action.type) {     
+  switch (action.type) {
     case SETPASTTEXTMODEVALUE:
       return setTextModeValue(state, action);
-    case REPASTTEXTDATA: 
+    case REPASTTEXTDATA:
       return rePastData(state, action);
+    case CLEARPASTTEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/reducers/patInfo.js

@@ -5,6 +5,7 @@ import {
   SETMEDICALNAME,
   CLEARMEDICALNAME,
   REINITPATINFO,
+  CLEARINITPATINFO,
 } from '../types/patInfo';
 import {
   updatePatientMessage,
@@ -14,6 +15,7 @@ import {
   clearMedicalName,
   reInitPatInfo,
 } from '../actions/patInfo';
+import { timesYMDTime } from '@utils/tools';
 
 const initState = {
     message: {},
@@ -22,6 +24,7 @@ const initState = {
     medicalName: '' //病历名称
 };
 export default function(state = initState,action){
+  const res = Object.assign({}, state);
   switch (action.type) {
     case GET_PATIENT_MESSAGE:
       return updatePatientMessage(state, action);
@@ -35,6 +38,58 @@ export default function(state = initState,action){
       return clearMedicalName(state, action);
     case REINITPATINFO:
       return reInitPatInfo(state, action);
+    case CLEARINITPATINFO:
+      res.patInfoData = [
+        {
+          label: 'patientIdNo',
+          id: 'patientIdNo',
+          value: '330127198912311234',
+          title: '卡号',
+        },
+        {
+          label: 'patientName',
+          id: 'patientName',
+          value: '王明明',
+          title: '姓名',
+        },
+        {
+          label: 'patientAge',
+          id: 'patientAge',
+          value: '50',
+          title: '年龄',
+        },
+        {
+          label: 'patientSex',
+          id: 'patientSex',
+          value: 0,
+          title: '性别',
+        },
+        {
+          label: 'systemTime',
+          id: 'systemTime',
+          value: timesYMDTime(new Date().getTime()),
+          title: '就诊时间',
+        },
+        {
+          label: 'hospitalDeptName',
+          id: 'hospitalDeptName',
+          value: '全科',
+          title: '科室',
+        },
+        {
+          label: 'doctorName',
+          id: 'doctorName',
+          value: '付医生',
+          title: '医生',
+        },
+        {
+          label: 'recordId',
+          id: 'recordId',
+          value: '4332',
+          title: '门诊号',
+        },
+      ];
+      return res;
     default:
       return state;
   }

src/store/reducers/personalHistory.js

@@ -1,4 +1,8 @@
-import { SETPERSONALTEXTMODEVALUE, REPERSONTEXTDATA } from '../types/personalHistory';
+import {
+  SETPERSONALTEXTMODEVALUE,
+  REPERSONTEXTDATA,
+  CLEARPERSONTEXTDATA,
+} from '../types/personalHistory';
 import { setTextModeValue, rePersonalData } from '../actions/personalHistory';
 import config from '@config/index';
 const block = Object.assign(JSON.parse(config.textLabel), { full: true });//空白时保留一个自由文本标签
@@ -18,6 +22,9 @@ export default function (state = initState, action) {//console.log(state)
       return setTextModeValue(state, action);
     case REPERSONTEXTDATA:
       return rePersonalData(state, action);
+    case CLEARPERSONTEXTDATA:
+      res.saveText = [];
+      return res;
     default:
       return res;
   }

src/store/types/assistCheck.js

@@ -9,3 +9,4 @@ export const CHECK_OFF_ON = 'CHECK_OFF_ON';
 
 
 export const REASSISTCHECKDATA = 'REASSISTCHECKDATA';
+export const CLEARASSISTCHECKDATA = 'CLEARASSISTCHECKDATA';

src/store/types/checkBody.js

@@ -25,3 +25,4 @@ export const REPUSH_CHECK_LABELS = 'REPUSH_CHECK_LABELS';   //重新获取查体
 export const SETCHECKTEXTMODEVALUE = 'SET_CHECK_TEXT_MODE_VALUE';  //文本模式下输入值
 
 export const RECHECKBODYTEXTDATA = 'RECHECKBODYTEXTDATA';
+export const CLEARCHECKBODYTEXTDATA = 'CLEARCHECKBODYTEXTDATA';

src/store/types/currentIll.js

@@ -32,4 +32,5 @@ export const RECOVER_TAG_CURRENT = 'RECOVER_TAG_CURRENT';     //恢复已删除
 export const SHOW_COMMON_ON_CURRENT = 'SHOW_COMMON_ON_CURRENT';     //现病史中显示常用症状
 export const DELETE_CURRENT_SELECTED_TAGS='DELETE_CURRENT_SELECTED_TAGS';
 
-export const RECURRENTDATA = 'RECURRENTDATA';
+export const RECURRENTDATA = 'RECURRENTDATA';
+export const CLEARCURRENTDATA = 'CLEARCURRENTDATA';

src/store/types/diagnosticList.js

@@ -19,4 +19,5 @@ export const SHOW_LOADING = 'SHOW_LOADING';    //显示loading
 export const ADD_TREAT = Symbol('ADD_TREAT') ;   //设置治疗
 
 
-export const REDIAGDATA = 'REDIAGDATA';
+export const REDIAGDATA = 'REDIAGDATA';
+export const CLEARDIAGDATA = 'CLEARDIAGDATA';

src/store/types/familyHistory.js

@@ -2,4 +2,5 @@ export const SETFAMILYTEXTMODEVALUE = 'SET_FAMILY_TEXT_MODE_VALUE';  //文本模
 
 
 
-export const REFAMILYTEXTDATA = 'REFAMILYTEXTDATA';
+export const REFAMILYTEXTDATA = 'REFAMILYTEXTDATA';
+export const CLEARFAMILYTEXTDATA = 'CLEARFAMILYTEXTDATA';

src/store/types/inspect.js

@@ -19,3 +19,4 @@ export const CHECK_ON_OFF = 'CHECK_ON_OFF';
 
 
 export const REINSPECTDATA = 'REINSPECTDATA';
+export const CLEARINSPECTDATA = 'CLEARINSPECTDATA';

src/store/types/mainSuit.js

@@ -35,4 +35,5 @@ export const CLEAR_ADD_SEARCH = 'CLEAR_ADD_SEARCH';   //添加症状-搜索
 export const DELETE_MAIN_SELECTED_TAGS='DELETE_MAIN_SELECTED_TAGS';
 
 
-export const REMAINSUITDATA = 'REMAINSUITDATA';
+export const REMAINSUITDATA = 'REMAINSUITDATA';
+export const CLEARMAINSUITDATA = 'CLEARMAINSUITDATA';

src/store/types/marriageHistory.js

@@ -2,4 +2,5 @@ export const SETMARRIAGETEXTMODEVALUE = 'SET_MARRIAGE_TEXT_MODE_VALUE';  //文
 
 
 
-export const REMARRIAGETEXTDATA = 'REMARRIAGETEXTDATA';
+export const REMARRIAGETEXTDATA = 'REMARRIAGETEXTDATA';
+export const CLEARMARRIAGETEXTDATA = 'CLEARMARRIAGETEXTDATA';

src/store/types/menstruationHistory.js

@@ -1,4 +1,5 @@
 export const SETMENSTRUATIONTEXTMODEVALUE = 'SET_MENSTRUATION_TEXT_MODE_VALUE';  //文本模式下输入值
 
 
-export const REMENSTRUATIONTEXTDATA = 'REMENSTRUATIONTEXTDATA';
+export const REMENSTRUATIONTEXTDATA = 'REMENSTRUATIONTEXTDATA';
+export const CLEARMENSTRUATIONTEXTDATA = 'CLEARMENSTRUATIONTEXTDATA';

src/store/types/newAdvice.js

@@ -19,3 +19,4 @@ export const CHECK_OFF_ON = 'CHECK_OFF_ON';
 
 
 export const RENEWADVICEDATA = 'RENEWADVICEDATA';
+export const CLEARNEWADVICEDATA = 'CLEARNEWADVICEDATA';

src/store/types/pastHistory.js

@@ -1,3 +1,4 @@
 export const SETPASTTEXTMODEVALUE = 'SET_PAST_TEXT_MODE_VALUE';  //文本模式下输入值
 
-export const REPASTTEXTDATA = 'REPASTTEXTDATA';
+export const REPASTTEXTDATA = 'REPASTTEXTDATA';
+export const CLEARPASTTEXTDATA = 'CLEARPASTTEXTDATA';

src/store/types/patInfo.js

@@ -3,4 +3,5 @@ export const GET_HOSPITAL_MESSAGE = 'GET_HOSPITAL_MESSAGE'
 export const SETINITPATINFO = 'SET_INITPAT_INFO'
 export const SETMEDICALNAME = 'SET_MEDICAL_NAME'
 export const CLEARMEDICALNAME = 'CLEAR_MEDICAL_NAME'
+export const CLEARINITPATINFO = 'CLEARINITPATINFO';
 export const REINITPATINFO = 'REINITPATINFO';

src/store/types/personalHistory.js

@@ -1,3 +1,4 @@
 export const SETPERSONALTEXTMODEVALUE = 'SET_PERSONAL_TEXT_MODE_VALUE';  //文本模式下输入值
 
-export const REPERSONTEXTDATA = 'REPERSONTEXTDATA';
+export const REPERSONTEXTDATA = 'REPERSONTEXTDATA';
+export const CLEARPERSONTEXTDATA = 'CLEARPERSONTEXTDATA';

src/utils/tools.js

@@ -1,20 +1,30 @@
 import store from '@store';
-import { REINITPATINFO } from '@store/types/patInfo';
-import { CLEAR_MAIN_SUIT, CLEAR_SEARCH, REMAINSUITDATA } from '@store/types/mainSuit';
-import { CLEAR_CURRENT_ILL, CURRENT_CLEAR, RECURRENTDATA } from '@store/types/currentIll';
-import { REPASTTEXTDATA } from '@store/types/pastHistory';
-import { REPERSONTEXTDATA } from '@store/types/personalHistory';
-import { REFAMILYTEXTDATA } from '@store/types/familyHistory';
-import { REMARRIAGETEXTDATA } from '@store/types/marriageHistory';
-import { REMENSTRUATIONTEXTDATA } from '@store/types/menstruationHistory';
-import { REINSPECTDATA } from '@store/types/inspect';
-import { REASSISTCHECKDATA } from '@store/types/assistCheck';
-import { RENEWADVICEDATA } from '@store/types/newAdvice';
+import { REINITPATINFO, CLEARINITPATINFO } from '@store/types/patInfo';
+import {
+  CLEAR_MAIN_SUIT,
+  CLEAR_SEARCH,
+  REMAINSUITDATA,
+  CLEARMAINSUITDATA,
+} from '@store/types/mainSuit';
+import {
+  CLEAR_CURRENT_ILL,
+  CURRENT_CLEAR,
+  RECURRENTDATA,
+  CLEARCURRENTDATA,
+} from '@store/types/currentIll';
+import { REPASTTEXTDATA, CLEARPASTTEXTDATA } from '@store/types/pastHistory';
+import { REPERSONTEXTDATA, CLEARPERSONTEXTDATA } from '@store/types/personalHistory';
+import { REFAMILYTEXTDATA, CLEARFAMILYTEXTDATA } from '@store/types/familyHistory';
+import { REMARRIAGETEXTDATA, CLEARMARRIAGETEXTDATA } from '@store/types/marriageHistory';
+import {REMENSTRUATIONTEXTDATA,CLEARMENSTRUATIONTEXTDATA,} from '@store/types/menstruationHistory';
+import { REINSPECTDATA, CLEARINSPECTDATA } from '@store/types/inspect';
+import { REASSISTCHECKDATA, CLEARASSISTCHECKDATA } from '@store/types/assistCheck';
+import { RENEWADVICEDATA, CLEARNEWADVICEDATA } from '@store/types/newAdvice';
 import {CLEAROTHERHISTORY,OTHERHIS_CLEAR} from '@store/types/otherHistory';
-import { CLEARCHECKBODY, SET, CHECKBODY_CLEAR, RECHECKBODYTEXTDATA } from '@store/types/checkBody';
+import { CLEARCHECKBODY, SET, CHECKBODY_CLEAR, RECHECKBODYTEXTDATA,CLEARCHECKBODYTEXTDATA } from '@store/types/checkBody';
 import {clearAssistData,addAssistLabel} from '@store/actions/assistCheck';
 import { clearAllLabel, addLabel} from '@store/actions/inspect';
-import { CLEAR_ALL_DIAG, REDIAGDATA } from '@store/types/diagnosticList';
+import { CLEAR_ALL_DIAG, REDIAGDATA, CLEARDIAGDATA } from '@store/types/diagnosticList';
 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS,BILLING_ADVICE,PUSHCHANGE,SET_MR_ANALYSE} from '@store/types/pushMessage';
 import {ISREAD, SETREADDITEMS,SET_SELECTED_AREA,SET_CURRENT_MODULE} from "../store/types/homePage";
 import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
@@ -174,14 +184,20 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 
  // 返回文本信息 转换preview 数据  转为json
 const formatTextInfo = (baseList) =>{
-  console.log(baseList,'=========baseList==========');
+  // console.log(baseList,'=========baseList==========');
   let labelList = {
     labelListSmall: [],
     labelListBig: [],
   };
   labelList.labelListSmall = baseList.inspect.labelListSmall;
   labelList.labelListBig = baseList.inspect.labelListBig;
-  console.log(labelList, 'labelList========');
+
+  let newAdviceLabelList = {
+    labelListSmall: [],
+    labelListBig: [],
+  };
+  newAdviceLabelList.labelListSmall = baseList.newAdvice.labelListSmall;
+  newAdviceLabelList.labelListBig = baseList.newAdvice.labelListBig;
 
   let assistLabelList = {
     dataString: baseList.assistCheck.dataString,
@@ -203,7 +219,7 @@ const formatTextInfo = (baseList) =>{
     marriageHistory: JSON.stringify(baseList.marriageHistory.saveText),
     menstruationHistory: JSON.stringify(baseList.menstruationHistory.saveText),
     vital: JSON.stringify(baseList.checkBody.saveText),
-    lis: inspectLabelList, // 化验
+    lis: labelList, // 化验
     pacs: assistLabelList,
     diag: diagnosticList,
     advice: newAdviceLabelList,
@@ -215,7 +231,7 @@ const pushHistoryDataList = (reData) =>{
  store.getState().inspect.context.scrollArea&&store.getState().inspect.context.scrollArea.scrollTop()
  let dataJson = JSON.parse(reData.preview)
   // console.log(dataJson, '=dataJson');
- // 回显头部表单数据 
+  // 回显头部表单数据 
  store.dispatch({
    type: REINITPATINFO,
    params: reData,
@@ -280,6 +296,57 @@ const pushHistoryDataList = (reData) =>{
 
 }
 
+// 清空数据 _lcq_2020.08.18
+const delHistoryDataList = () =>{
+  store.getState().inspect.context.scrollArea && store.getState().inspect.context.scrollArea.scrollTop();
+  store.dispatch({
+    type: CLEARINITPATINFO,
+  });
+  store.dispatch({
+    type: CLEARMAINSUITDATA,
+  });
+  store.dispatch({
+    type: CLEARCURRENTDATA,
+  });
+  store.dispatch({
+    type: CLEARPASTTEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARPERSONTEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARFAMILYTEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARMARRIAGETEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARMENSTRUATIONTEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARCHECKBODYTEXTDATA,
+  });
+  store.dispatch({
+    type: CLEARINSPECTDATA,
+  });
+  store.dispatch({
+    type: CLEARASSISTCHECKDATA,
+  });
+  store.dispatch({
+    type: CLEARDIAGDATA,
+  });
+  store.dispatch({
+    type: CLEARNEWADVICEDATA,
+  });
+
+
+
+
+  store.dispatch({
+    type: ISREAD,
+  });
+}
+
 
 
 
@@ -1036,6 +1103,15 @@ function timestampToTime(timestamp) {     //excel导入2019年5月1日会转换
   return Y+M+D+h+m+s;
 }
 
+function timesYMDTime(timestamp) {
+  //excel导入2019年5月1日会转换成时间戳
+  var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+  var Y = date.getFullYear() + '-';
+  var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+  var D = date.getDate() ;
+  return Y + M + D 
+}
+
 /**
  * 
  * @param {需要年月日传个true，不需要不传或者false} flg 
@@ -1113,14 +1189,31 @@ function inspectAndAssist(){
 }
 function readyKeepHistory(){
   let baseList = store.getState();
+  const {
+    patInfo: { patInfoData },
+  } = baseList;
   let jsonStr = getAllDataStringList(baseList);
+  let patientName = formatFormParmas('patientName', patInfoData);  // 姓名
+  let patientAge = formatFormParmas('patientAge', patInfoData);  // 年龄
+  let patientSex = formatFormParmas('patientSex', patInfoData);  // 性别
   if(filterDataArr(JSON.parse(jsonStr.chief)) == ''){
       return 1;//主诉不能为空
-  }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
-      return 2;//诊断不能为空
-  }else{
+  }
+  if(patientName === '') {
+    return 2
+  }
+  if (patientAge === '') {
     return 3;
   }
+  if (patientSex === '') {
+    return 4;
+  }
+
+  // }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
+  //     return 2;//诊断不能为空
+  // }else{
+  //   return 3;
+  // }
 }
 //评估图表数据转换
 function parseChartData(indexData){
@@ -1928,64 +2021,67 @@ function formatFormParmas(val,arr){
   return item.value
 }
 module.exports = {
-    getIds,
-    getWindowInnerWidth,
-    getWindowInnerHeight,
-    getLabelIndex,
-    fullfillText,
-    checkFullfillText,
-    dateParser,
-    isNotNull,
-    isNull,
-    deepClone,
-    isIE,
-    storageLocal,
-    getUrlArgObject,
-    getAllDataList,
-    getAllDataStringList,
-    pushAllDataList,
-    filterArr,
-    filterDataArr,
-    filterOtherDataArr,
-    preventDefault,
-    handleEnter,
-    didPushParamChange,
-    getEMRParams,
-    getMRInfo,
-    windowEventHandler,
-    isAllClear,
-    normalVal,
-    getPageCoordinate,
-    windowRemoveEventHandler,
-    timestampToTime,
-    formatContinueDots,
-    inspectAndAssist,
-    getCurrentDate,
-    ifOtherClear,
-    readyKeepHistory,
-    parseChartData,
-    getCalendarDate,
-    downloadExportedData,
-    getStatusImg,
-    parseNameVal,
-    getStringPlus,
-    getPushLists,
-    getPushList,
-    getAllString,
-    resetTagtype,
-    handleLocalDelTag,
-    shiftLocalDelTag,
-    setPosition,
-    isAllPartClear,
-    getDomUpDown,
-    setFontColorSize,
-    moveEnd,
-    getLifeLabels,
-    getValuedLabels,
-    removeRepeat,
-    handleMouseUp,
-    checkDeptContent,
-    formatTextInfo,
-    getArrow,
-    formatFormParmas
+  getIds,
+  getWindowInnerWidth,
+  getWindowInnerHeight,
+  getLabelIndex,
+  fullfillText,
+  checkFullfillText,
+  dateParser,
+  isNotNull,
+  isNull,
+  deepClone,
+  isIE,
+  storageLocal,
+  getUrlArgObject,
+  getAllDataList,
+  getAllDataStringList,
+  pushAllDataList,
+  filterArr,
+  filterDataArr,
+  filterOtherDataArr,
+  preventDefault,
+  handleEnter,
+  didPushParamChange,
+  getEMRParams,
+  getMRInfo,
+  windowEventHandler,
+  isAllClear,
+  normalVal,
+  getPageCoordinate,
+  windowRemoveEventHandler,
+  timestampToTime,
+  formatContinueDots,
+  inspectAndAssist,
+  getCurrentDate,
+  ifOtherClear,
+  readyKeepHistory,
+  parseChartData,
+  getCalendarDate,
+  downloadExportedData,
+  getStatusImg,
+  parseNameVal,
+  getStringPlus,
+  getPushLists,
+  getPushList,
+  getAllString,
+  resetTagtype,
+  handleLocalDelTag,
+  shiftLocalDelTag,
+  setPosition,
+  isAllPartClear,
+  getDomUpDown,
+  setFontColorSize,
+  moveEnd,
+  getLifeLabels,
+  getValuedLabels,
+  removeRepeat,
+  handleMouseUp,
+  checkDeptContent,
+  formatTextInfo,
+  getArrow,
+  formatFormParmas,
+  pushHistoryDataList,
+  timesYMDTime,
+  delHistoryDataList,
 };