bug提交

src/common/components/Textarea/index.less

@@ -23,6 +23,7 @@
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
+    word-break: break-all;
     textarea{
       width: 100%;
     }

src/components/AddAssistCheck/Textarea/index.jsx

@@ -28,9 +28,9 @@ class Textarea extends Component {
       clearTimeout(stimer);
     },config.delayPushTime);
     if(text.trim() != ''){
-      this.setState({val:''})
+      e.target.nextSibling.innerText = ''
     }else{
-      this.setState({val:'报告描述或意见'})
+      e.target.nextSibling.innerText = '报告描述或意见'
     }
     this.setState({
       timer
@@ -48,27 +48,30 @@ class Textarea extends Component {
       this.$dom.current.innerText = next.value||'';
     }
     if(next.value && next.value.trim() != ''){
-      $("#textareaWarring").html('')
+      this.$dom.current.nextSibling.innerText = ''
     }
   }
   componentDidMount(){
     const {value} = this.props;
     if(value){
       this.$dom.current.innerText = value||'';
-      this.setState({val:''})
+      this.$dom.current.nextSibling.innerText = '';
+    }else{
+      this.$dom.current.nextSibling.innerText = '报告描述或意见'
     }
   }
   handleFocus(e){
-    this.setState({val:''})
+    console.log(e.target.nextSibling)
+    // e.target.nextSibling.innerText = ''
   }
   handleBlur(e){
-    let str = this.$dom.current.innerText
+    let str = e.target.innerText
     if(str.trim() == ''){
-      this.setState({val:'报告描述或意见'})
+      e.target.nextSibling.innerText = '报告描述或意见'
     }
   }
   render() {
-    const {val} = this.state;
+    const {idx} = this.props;
     return (
       <div className={style.textWap}>
         <div className={style.divTextarea}
@@ -79,7 +82,7 @@ class Textarea extends Component {
             onBlur={this.handleBlur}
             onPropertyChange={this.handleInput}
         ></div>
-        <p className={style.textareaWarring} id="textareaWarring">{val}</p>
+        <p style={{position: "absolute",left: '0',top: '0',color: "#a5a3a3",zIndex: '5'}} className="textareaWarring"></p>
       </div>
     );
   }

src/components/AddAssistCheck/Textarea/index.less

@@ -12,6 +12,7 @@
   font-family: inherit;
   position: relative;
   z-index: 10;
+  word-break: break-all;
 }
 .textWap {
   overflow: hidden;

src/components/Operation/index.jsx

@@ -84,6 +84,7 @@ class Operation extends Component {
   keepHistory(){
     let baseList = store.getState();
     let jsonStr = getAllDataStringList(baseList);
+    console.log(jsonStr)
     if(filterDataArr(JSON.parse(jsonStr.chief)) == ''){
         Notify.info('主诉不能为空');
         return false;

src/components/PreviewBody/index.jsx

@@ -150,7 +150,7 @@ class PreviewBody extends Component {
         </table>
         <table style={{ width: "100%", borderCollapse: 'collapse' }}>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>主诉：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>主诉：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 filterDataArr(JSON.parse(dataStr.chief))
@@ -158,7 +158,7 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>现病史：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>现病史：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 filterDataArr(JSON.parse(dataStr.present))
@@ -166,7 +166,7 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>其他史：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>其他史：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 filterDataArr(JSON.parse(dataStr.other))
@@ -174,7 +174,7 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>查体：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>查体：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 filterDataArr(JSON.parse(dataStr.vital))
@@ -182,7 +182,7 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>化验：</td>
+            <td style={{ width: 70, textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>化验：</td>
             <td style={{ fontSize: '14px', padding: '4px 0px 8px 0px', lineHeight: '20px', maxWidth: '650px' }}>
               {
                 dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items) => {
@@ -231,17 +231,17 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>辅检：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>辅检：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item) => {
-                  return <div style={{ fontSize: '14px' }}>{item}</div>
+                  return <div style={{ fontSize: '14px',wordBreak:"break-all" }}>{item}</div>
                 })
               }
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>诊断：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>诊断：</td>
             <td style={{ fontSize: '14px', padding: '9px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item) => {
@@ -251,7 +251,7 @@ class PreviewBody extends Component {
             </td>
           </tr>
           <tr style={{ verticalAlign: 'top', borderBottom: "1px solid #e2e4e6" }}>
-            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px' }}>医嘱：</td>
+            <td style={{ textAlign: 'right', padding: '9px 5px 8px 0px', fontSize: '14px',width:'70px' }}>医嘱：</td>
             <td style={{ fontSize: '14px', padding: '1px 0px 8px 0px', lineHeight: '20px' }}>
               {
                 dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{ fontSize: '14px', marginBottom: "8px" }}><span>开单项目</span></p> : ''

src/store/actions/mainSuit.js

@@ -527,7 +527,7 @@ export const clearMainSuit = (state,action)=>{//回读和清除
   if(action.editClear){
     res.editClear = action.editClear;
   }
-  if(res.data.length>0){//回读
+  if(res.data.length > 0){//回读
     res.editClear = false;
   }
   return res;

src/store/actions/patInfo.js

@@ -1,29 +1,29 @@
 export const updatePatientMessage=(state,action)=>{
     const res=Object.assign({},state);
     const mock = {
-      doctorCode: "YS001",
-      doctorId: 1,
-      doctorName: "付",
-      hospitalCode: "A001",
-      hospitalDeptCode: "D01",
-      hospitalDeptId: 1,
-      hospitalDeptName: "全科",
-      hospitalId: 1,
-      hospitalName: "浙二医院",
-      modeClassify: 0,
-      modeValue: 1,
-      patientAge: 25,
-      patientCode: "1600",
-      patientId: 1,
-      patientIdNo: "9696969",
-      patientName: "沈强",
-      patientSex: "女",
-      recordId: "44",
-      selfDeptId: 5,
-      systemTime: "2018-12-20 11:52",
-      idNo: "9696969",
-      name: "沈强",
-      sex: 2
+      // doctorCode: "YS001",
+      // doctorId: 1,
+      // doctorName: "付",
+      // hospitalCode: "A001",
+      // hospitalDeptCode: "D01",
+      // hospitalDeptId: 1,
+      // hospitalDeptName: "全科",
+      // hospitalId: 1,
+      // hospitalName: "浙二医院",
+      // modeClassify: 0,
+      // modeValue: 1,
+      // patientAge: 25,
+      // patientCode: "1600",
+      // patientId: 1,
+      // patientIdNo: "9696969",
+      // patientName: "沈强",
+      // patientSex: "女",
+      // recordId: "44",
+      // selfDeptId: 5,
+      // systemTime: "2018-12-20 11:52",
+      // idNo: "9696969",
+      // name: "沈强",
+      // sex: 2
     };
     res.message = action.data;
     if(!action.data.selfDeptId){

src/store/async-actions/homePage.js

@@ -27,6 +27,7 @@ function modulesParseJson(data){
 export const getInitModules= (dispatch,getStore)=>{
   const state = getStore();
   const {message} = state.patInfo;
+  dispatch(initHistoryDetails(message));      //历史病历回读
   return json(api.getModules,{age:message.patientAge,sexType:message.sex}).then((res) => {
       if (res.data.code == '0') {
         const newObj = modulesParseJson(res.data.data);
@@ -57,24 +58,25 @@ export const getInitModules= (dispatch,getStore)=>{
           saveEmpty:initSaveText.currentEmpty,
         });
         dispatch(getOtherHisRecord());          //获取其他史最近记录
-        initHis(dispatch)
+        // initHis(dispatch)
       }else{
-        initHis(dispatch)
+        // initHis(dispatch)
       }
     }).catch(()=>{
-        initHis(dispatch)
+        // initHis(dispatch)
     });
 };
 
-export const initHis = (dispatch)=> {
-    let timer = setInterval(()=>{
-        let baseDate = store.getState();
-        if(JSON.stringify(baseDate.patInfo.message) != '{}') {
-          dispatch(initHistoryDetails(baseDate.patInfo.message));
-          clearInterval(timer)
-        }
-    },500)
-}
+// export const initHis = (dispatch)=> {
+//     let timer = setInterval(()=>{
+//         let baseDate = store.getState();
+//         console.log(baseDate.patInfo.message)
+//         if(JSON.stringify(baseDate.patInfo.message) != '{}') {
+//           dispatch(initHistoryDetails(baseDate.patInfo.message));
+//           clearInterval(timer)
+//         }
+//     },500)
+// }
 
 // 埋点事件，点击保存时调用
 export const saveClickNum = (dispatch,getState)=>{

src/utils/tools.js

@@ -314,7 +314,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
             }else{    //结构化历史病历回读
                 let dataJson = JSON.parse(reData.dataJson);
                 let dataJsonStr = reData.detailList;
-                // console.log(dataJson,dataJsonStr,'结构化历史病历回读')
+                console.log(dataJson.chief,dataJsonStr[0].content,'结构化历史病历回读')
                 // console.log(dataJson.mainSuitSelecteds,7887)
                 store.dispatch({
                     type: CLEAR_MAIN_SUIT,