Merge branch 'testNew' into masterCdss

src/common/components/BlockInp/index.jsx

@@ -52,6 +52,7 @@ class BlockInp extends PureComponent {
   handleInput(e){
     const {handleInput,handlePush,boxMark} = this.props;
     const text = e.target.innerText || e.target.innerHTML.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
+    // console.log(text,999999999999)
     const stimer = this.state.timer;//console.log(e.target,text)
     this.setState({
       inpText:text,

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/DiagnosticList/index.jsx

@@ -289,6 +289,10 @@ class DiagnosticList extends Component {
         hasEnterImg: false
       })
     }
+    handleFocus(){
+      const {getBilling} = this.props;
+      getBilling&&getBilling({mode:10});
+    }
     handleInput(e,index){
       const {editDiagName,getBilling} = this.props;
       let name = (e.target.value).trim()
@@ -327,7 +331,7 @@ class DiagnosticList extends Component {
                                        onMouseLeave = {this.handleMouseLeaveDrug.bind(this)}
                                     >
                                       <span title={item.name} className={style['diag-name-box']} style={{'max-width': '300px'}}>
-                                        <input type="text" value={item.name} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index)}/>
+                                        <input type="text" value={item.name} onFocus={(e)=>{this.handleFocus()}} onBlur={(e)=>{this.handleBlur(e,item,index)}} onInput={(e)=>this.handleInput(e,index)}/>
                                       </span>
                                       {/* <img className={`${style['info-img']}`}
                                           title='点击i图标可查看详细说明'

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/PatInfo/Select/index.jsx

@@ -8,8 +8,8 @@ import { embedPush } from '../../../store/async-actions/pushMessage'
 export default class Select extends Component {
   constructor(props) {
     super(props);
-    this.state = { 
-      isOpen: false, 
+    this.state = {
+      isOpen: false,
       value: "",
       options: [
         {
@@ -47,7 +47,8 @@ export default class Select extends Component {
     window.removeEventListener("click", this.onClickOutsideHandler);
   }
 
-  componentWillReceiveProps(nextProps){
+  componentWillReceiveProps(nextProps) {
+    // console.log(nextProps, '================nextProps');
     if (nextProps.default.value !== this.state.value.value) {
       this.setState({
         value: nextProps.default
@@ -70,7 +71,7 @@ export default class Select extends Component {
     }
   };
 
-  onChange(e,val) {
+  onChange(e, val) {
     const state = store.getState();
     e.stopPropagation()
     this.setState({
@@ -87,21 +88,22 @@ export default class Select extends Component {
       mode: 1
     }))
   };
-  handleMouseEnter(){
+  handleMouseEnter() {
     // console.log('鼠标进入');
     this.setState({
       isEnter: true
     })
   }
-  handleMouseLeave(){
+  handleMouseLeave() {
     // console.log('鼠标进入');
     this.setState({
       isEnter: false
     })
   }
   render() {
-    const { isOpen, value, options} = this.state;
-    const { label,  placeholder } = this.props;
+    const { isOpen, value, options } = this.state;
+    const { label, placeholder } = this.props;
+    // console.log(options, '===============options');
     return (
       <div className={style.selectBox}>
         {label && <label className={style.label}>{label}:</label>}
@@ -110,15 +112,15 @@ export default class Select extends Component {
           <input
             className={[style.selfInput, isOpen ? style.selfInput : ''].join('')}
             readonly=""
-            value={value.value=== 2? '女' : '男'}
+            value={value.value == 2 ? '女' : '男'}
             onClick={this.onClickHandler}
             placeholder={placeholder}
           />
           <div className={this.state.isEnter ? style.downActive : style.down} onClick={this.onClickHandler} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-            <img src={selectSex} alt=""/>
+            <img src={selectSex} alt="" />
           </div>
-          <div  className={[isOpen ? '' : style.optionsHidden, isOpen ? style.options :''].join('')}>
-            {options &&
+          <div className={[isOpen ? '' : style.optionsHidden, isOpen ? style.options : ''].join('')}>
+            {/* {options &&
               options.map((item) => {
                 return (
                   <div
@@ -126,10 +128,12 @@ export default class Select extends Component {
                     className={style.item}
                     onClick={(e)=>this.onChange( e, item)}
                   >
-                    {item.value === 2 ? '女' : '男'}
+                    {+item.value == 2 ? '女' : '男'}
                   </div>
                 );
-              })}
+              })} */}
+            <div className={style.item} onClick={(e) => this.onChange(e, options[0])}>男</div>
+            <div className={style.item} onClick={(e) => this.onChange(e, options[1])}>女</div>
           </div>
         </div>
       </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/containers/BlockInpContainer.js

@@ -14,7 +14,7 @@ import BlockInp from '@common/components/BlockInp';
 import {didPushParamChange,isAllPartClear,getAllDataList,getAllDataStringList,isAllClear} from '@utils/tools';
 import {embedPush} from '@store/async-actions/pushMessage';
 
-function mapStateToProps(state){
+function mapStateToProps(state){//console.log(state,999999999)
   const {homePage} = state;
   return {
     isRead:homePage.isRead,

src/containers/DiagnosticList.js

@@ -42,6 +42,9 @@ function mapDispatchToProps(dispatch) {
           idx:idx,
           name:name
         });
+        dispatch({
+            type: GET_DIAGNOSTIC_STR
+        });
       },
       setAssess(data,disName){        //获取评估内容数据
         dispatch({
@@ -49,6 +52,9 @@ function mapDispatchToProps(dispatch) {
           data:data,
           name:disName
         });
+        dispatch({
+            type: GET_DIAGNOSTIC_STR
+        });
       },
         delDiagnostic: (item,idx) => {
             dispatch({

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/config.js

@@ -17,7 +17,7 @@ const imageUrlPrefix = 'http://192.168.2.241:82';
 function geturl(){
     if(window.location.href.indexOf('localhost')>-1){
         return {
-            gourl:'http://localhost:8080/cdss.html',
+            gourl:'http://localhost:8083/cdss.html',
             imgurl:host.replace('6060','22')
         }
     }else if(window.location.href.indexOf('192.168.2.236')>-1){

src/utils/tools.js

@@ -801,6 +801,7 @@ function filterDataArr(arrTmp){   //数据处理
           return '';
       }
       return it.replace(config.punReg,function(word){
+        console.log(9898)
         return word.substr(0,1);
       });
     });
@@ -926,7 +927,7 @@ function getEMRParams(){
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
     diag.push({"dateValue": "","name": diagnosticList.diagnosticList[i].name,"uniqueName": ""})
   }
-  if(diagnosticList.length>0)diagnosticList.diseaseName.uniqueName = ''
+  if(diagnosticList.diagnosticList.length>0)diagnosticList.diseaseName.uniqueName = ''
   let templis = (inspect.labelListSmall).concat(inspect.labelListBig)
   templis = templis.filter((item)=>!item.check)
   let temppacs = assistCheck.assistLabel
@@ -953,15 +954,16 @@ function getEMRParams(){
     "age": formatFormParmas('patientAge', patInfoData),
     "sex": sex,
     "deptName": formatFormParmas('hospitalDeptName', patInfoData),
-    "chief": filterDataArr(mainSuit.saveText)||'',    //主诉
-    "symptom": filterDataArr(currentIll.saveText)||'',  //现病史
-    "vital": filterDataArr(checkBody.saveText)||'',  //查体
-    "pasts": filterDataArr(pastHistory.saveText)||'',  //既往史
+    "chief": mainSuit.saveText[0]||'',    //主诉
+    "symptom": currentIll.saveText[0]||'',  //现病史
+    "vital": checkBody.saveText[0]||'',  //查体
+    "pasts": pastHistory.saveText[0]||'',  //既往史
+    // "pasts": filterDataArr(pastHistory.saveText)||'',  //既往史
     "marriage": '',
-    "personal": filterDataArr(personalHistory.saveText)||'',  //个人史
-    "family": filterDataArr(familyHistory.saveText)||'',  //家族史
-    "marital": filterDataArr(marriageHistory.saveText)||'',  //婚育史
-    "menstrual": filterDataArr(menstruationHistory.saveText)||'',  //月经史
+    "personal": personalHistory.saveText[0]||'',  //个人史
+    "family": familyHistory.saveText[0]||'',  //家族史
+    "marital": marriageHistory.saveText[0]||'',  //婚育史
+    "menstrual": menstruationHistory.saveText[0]||'',  //月经史
     "diseaseName":diagnosticList.diseaseName,
     "operationName":newAdvice.operationName,
     "infectious": "",
@@ -1808,7 +1810,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,