bug 修复

src/components/AddAssistCheck/index.jsx

@@ -259,7 +259,9 @@ class AddAssistCheck extends React.Component {
                 </ScrollArea>
               </div>
               <div className={`${styles.pointerFinger} ${setFontColorSize(2,2)}`}>
-                <p>报告日期：<span>
+                {/* <p>报告日期： */}
+                <p>
+                  <span>
                   <input type="text" 
                       class="canEdit"
                       // onDoubleClick={(e)=>this.setEdit(e)}
@@ -271,7 +273,8 @@ class AddAssistCheck extends React.Component {
                       onInput={(e)=>{this.handleInput(e,item,idx)}}
                       // onBlur={()=>{this.handleBlur()}}
                       />
-                </span></p>
+                </span>
+                </p>
                 <span className={styles.closeIcon} id="assiClose" onClick={() => { this.handleDelClick(idx,item) }}></span>
               </div>
               <DelToast show={idx==id&&item.name==activeName?visible:false}

src/components/AddInspect/SlidePic/index.jsx

@@ -169,7 +169,8 @@ class SlideSelect extends Component {
               <span className={styles.smallname}></span>
               <span className={styles.edit}></span>
               <span className={styles.maxmin}></span>
-              <span className={styles.pass}>检验时间：
+              {/* <span className={styles.pass}>检验时间： */}
+              <span className={styles.pass}>
                 <input type="text" 
                     class="canEdit" 
                     // onDoubleClick={(e)=>this.setEdit(e)}
@@ -209,7 +210,8 @@ class SlideSelect extends Component {
               /><img style={{display:style==1||style==2?'inline-block':'none'}} src={style==1?down:style==2?up:''} />{item.units}
           </span>
           <span className={styles.maxmin}>{normalVal(item.minValue,item.maxValue)}</span>
-          <span className={styles.pass}>检验时间：
+          <span className={styles.pass}>
+          {/* <span className={styles.pass}>检验时间： */}
             <input type="text" 
                 class="canEdit" 
                 // onDoubleClick={(e)=>this.setEdit(e)}

src/components/Operation/index.jsx

@@ -590,7 +590,7 @@ class Operation extends Component {
         <div className={style.outBox}>
           <div className={style.innerInp}>
             <span>病历名称：</span>
-            <input type="text" className={style.innerInput} placeholder="请输入病历名称" value={this.state.medicalName} onChange={this.handleMedicalChange} autocomplete="off" /> 
+            <input type="text" className={style.innerInput} placeholder="请输入病历名称" value={this.state.medicalName} maxlength={30} onChange={this.handleMedicalChange} autocomplete="off" /> 
           </div>
           {this.state.showValit ? (<div className={style.valit}>请输入病历名称</div>) : null}
         </div>

src/components/PreviewBody/Inspect/index.jsx

@@ -3,7 +3,7 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
-  // console.log(dataJson.labelListSmall,'dataJson.labelListSmall');
+  // console.log(dateTime,'dateTime');
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
@@ -31,8 +31,8 @@ const PreviewInspect = (props) => {
                       {/* {normalVal(3.9, 6.1)} */}
                     </td>
                     {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
-                  <td className={style.assistTableTdFor}>{item.time == '' ?  + dateTime  :  item.time
-                    }</td>
+                  {/* <td className={style.assistTableTdFor}>{item.time == '' ?   dateTime  :  item.time}</td> */}
+                  <td className={style.assistTableTdFor}>{item.time }</td>
                   </tr>
                 // </table>
               )
@@ -47,8 +47,9 @@ const PreviewInspect = (props) => {
                   <td className={style.assistTableTdFst}>{item.uniqueName}</td>  
                   <td className={style.assistTableTdSec}></td>
                   <td className={style.assistTableTdTrd}></td>                                             
-                  <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time)
-                  }</td>
+                  {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
+                  {/* <td className={style.assistTableTdFor}>{item.time == '' ? dateTime : toTime(item.time) */}
+                  <td className={style.assistTableTdFor}>{item.time == '' ? dateTime : toTime(item.time)}</td>
                 </tr>
               // </table>
             )

src/components/PreviewBody/ItemPart/index.jsx

@@ -3,6 +3,7 @@ import { filterDataArr } from '@utils/tools';
 
 const ItemPart = (props) => {
   let {dataStr,title,type,dataJson,other_yjs,lastDot} = props;
+  // console.log(dataStr,'dataStr===============');
   if(lastDot){
     dataStr=dataStr.trim().replace(/；$/g,'');
   }

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -36,6 +36,7 @@ class MedicalAdvice extends Component {
                       <td className={style.adviceTableTdFst}>{item.name}</td>
                       {/* <td className={style.assistTableTdSec}></td> */}
                       <td className={style.assistTableTdTrd}>手术/操作</td>
+                      <td className={style.assistTableTdSec}></td>
                       <td className={style.assistTableTdSec}>{item.value}</td>
                       <td className={style.assistTableTdFor}>{item.time}</td>
                     </tr>

src/components/PreviewBody/index.less

@@ -115,6 +115,9 @@ table{
     top: 6px !important;
   }
 }
+// .assistTableTdSix {
+//   width:3%;
+// }
 .assistTableTdTrd {
   width:18%;
 }

src/store/actions/patInfo.js

@@ -1,3 +1,4 @@
+import { timesYMDTime } from '@utils/tools';
 export const updatePatientMessage=(state,action)=>{
     const res=Object.assign({},state);
     // const mock = {
@@ -75,12 +76,13 @@ export const clearMedicalName = (state, action) => {
 // reInitPatInfo
 export const reInitPatInfo = (state, action) => {
   const res = Object.assign({}, state);
-  // console.log(action.params, 'action.params');
+  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.inquiryDate;   //2020/9/14
+  // res.patInfoData[4].value = action.params && action.params.inquiryDate;   //2020/9/14
+  res.patInfoData[4].value = timesYMDTime(new Date().getTime());  
   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/print.js

@@ -162,8 +162,8 @@ export const saveMedicalData = () =>{
         "deptName": formatFormParmas('hospitalDeptName', patInfoData),
         "doctorName": formatFormParmas('doctorName', patInfoData),
         "inquiryCode": formatFormParmas('recordId', patInfoData), 
-        "inquiryDate": formatFormParmas('systemTime', patInfoData),   // 2020/9/14 编辑状态保存原有时间 _lcq
-        // "inquiryDate": inquiryDate,
+        // "inquiryDate": formatFormParmas('systemTime', patInfoData),   // 2020/9/14 编辑状态保存原有时间 _lcq
+        "inquiryDate": inquiryDate,
         "modeName": modeName,
         "patName": formatFormParmas('patientName', patInfoData),
         "preview": JSON.stringify(preview),  // 左侧病历预览信息

src/utils/tools.js

@@ -1808,7 +1808,8 @@ function getAllString(checkedListImport,assistLabel,flg){
       "result": tempArr[i].value||"",
     }
     tmpArr.push(obj)
-    tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? '报告日期：' + tempArr[i].time : '') + '^;')
+    // tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? '报告日期：' + tempArr[i].time : '') + '^;')
+    tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? tempArr[i].time : '') + '^;')
   }
   return tmpObj = {
     arr:tmpArr,