Bladeren bron

Merge branch 'lcq' into newVersion6.0

morphone1995 4 jaren geleden
bovenliggende
commit
fea079c0aa

+ 1 - 1
index.html

@@ -5,7 +5,7 @@
     <!--[if lt IE 9]>
     <script src="/static/polyfill/html5shiv.min.js"></script>
     <![endif]-->
-    <title>ICSS</title>
+    <title>CDSS</title>
 </head>
 <body>
 <div id="root" style="min-width: 1024px;overflow-y: hidden;"></div>

+ 2 - 1
src/components/DiagResultSearch/index.jsx

@@ -42,9 +42,10 @@ class DiagResultSearch extends Component {
   }
 
   getSearchList(searchResult) {
+    // console.log(searchResult,'=searchResult=====');
     return <div className={style['search-result']}>
       {
-        searchResult && searchResult.map((item,idx) => {
+        searchResult.length !== 0  && searchResult.map((item,idx) => {
           return (<div key={idx} className={style['search-result-item']}>
             <DiagnosticItem setHighter={this.props.setHighter} title={true} item={item} clearInput={this.clearInput} type='search'/>
           </div>)

+ 1 - 1
src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -41,7 +41,7 @@ class HistoryCaseContainer extends React.Component {
           activeIndex: 0,
           showEditIcon: false,
           showDelIcon: false,
-          desc: false // 正序/逆序
+          desc: true // 正序/逆序
         }
         this.handleCaseClick=this.handleCaseClick.bind(this)
         this.handleQuoteClick=this.handleQuoteClick.bind(this)

+ 1 - 1
src/components/Information/index.jsx

@@ -30,7 +30,7 @@ class Information extends Component {
             <td>医生:{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</td>
           </tr>
           <tr>
-            <td>性别:{baseObj.sex === 0 ? '女' : '男'}</td>
+            <td>性别:{baseObj.sex === 2 ? '女' : '男'}</td>
             <td>科室:{baseObj ? baseObj.deptName : (noData ? '' : preInfo.hospitalDeptName)}</td>
           </tr>
           <tr>

+ 28 - 19
src/components/PatInfo/index.jsx

@@ -13,49 +13,57 @@ class PatInfo extends Component {
           label: 'patientIdNo',
           id: 'patientIdNo',
           value: '330127198912311234',
-          title: '卡号'
+          title: '卡号',
+          maxlength: 50
         },
         {
           label: 'patientName',
           id: 'patientName',
           value: '王明明',
-          title: '姓名'
+          title: '姓名',
+          maxlength: 50
         },
         {
           label: 'patientAge',
           id: 'patientAge',
           value: '50',
-          title: '年龄'
+          title: '年龄',
+          maxlength: 11
         },
         {
           label: 'patientSex',
           id: 'patientSex',
-          value: 0,
-          title: '性别'
+          value: 2,
+          title: '性别',
+          maxlength: 11
         },
         {
           label: 'systemTime',
           id: 'systemTime',
           value: timesYMDTime(new Date().getTime()),
-          title: '就诊时间'
+          title: '就诊时间',
+          maxlength: 100
         },
         {
           label: 'hospitalDeptName',
           id: 'hospitalDeptName',
           value: '全科',
-          title: '科室'
+          title: '科室',
+          maxlength: 50
         },
         {
           label: 'doctorName',
           id: 'doctorName',
           value: '付医生',
-          title: '医生'
+          title: '医生',
+          maxlength: 50
         },
         {
           label: 'recordId',
           id: 'recordId',
           value: '4332',
-          title: '门诊号'
+          title: '门诊号',
+          maxlength: 50
         }
 
       ]
@@ -74,7 +82,7 @@ class PatInfo extends Component {
     // console.log(nextProps,'nextProps');
     const { patInfoData } = nextProps.patInfo
     this.setState({
-      patientInfo:patInfoData
+      // patientInfo:patInfoData
     })
   }
 
@@ -89,20 +97,20 @@ class PatInfo extends Component {
     if (patientItem.id === 'patientSex'){     
       if (e.target.value === '1') {
         patientItem.value = 1
-      } else if (e.target.value === '0'){
-        patientItem.value = 0
+      } else if (e.target.value === '2'){
+        patientItem.value = 2
       } else {
-        patientItem.value = 0  // 默认为女
+        patientItem.value = 2 // 默认为女
       }
-    }else{
+    } else if (patientItem.id === 'patientAge'){
+      patientItem.value = e.target.value.replace(/[^\d]+/, '')
+    } else {
       patientItem.value = e.target.value;
     }
     this.setState({
       patientInfo: newInfo
-    },()=>{
-        initPatInfoData && initPatInfoData(this.state.patientInfo)
     })
-    
+    initPatInfoData && initPatInfoData(newInfo)
   }
 
   render(){
@@ -117,12 +125,13 @@ class PatInfo extends Component {
                   {item.id === 'patientSex' && (
                     <select id={item.id} value={item.value} onChange={this.handleChange}>
                       <option value='1'>男</option>
-                      <option value='0'>女</option>
+                      <option value='2'>女</option>
                     </select>
                   )}
+                  {item.id === 'patientAge' && (<input id={item.id} type="text" autocomplete="off" maxlength={11}  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} />) }                  
+                  {item.id !== 'patientAge' && item.id !== 'patientSex' && item.id !== 'systemTime' && (<input id={item.id} type="text" maxlength={item.maxlength} autocomplete="off" value={item.value} onChange={this.handleChange} />) }                  
                 </div>
               )
             })

+ 1 - 0
src/components/PatInfo/index.less

@@ -26,6 +26,7 @@
       white-space: nowrap;
       text-overflow: ellipsis;
       overflow: hidden;
+      color: #000
     }
     select {
       // appearance:none;

+ 5 - 3
src/components/PreviewBody/Inspect/index.jsx

@@ -7,7 +7,9 @@ const PreviewInspect = (props) => {
       <td className={style['patInfoSec']}>检验:</td>
       <td className={style['patInfoSec']}>
         <table style={style.assistTable}>
-        <tr style={{lineHeight: '36px'}}>化验结果数据</tr>
+        {
+          (dataJson.labelListSmall.length !== 0 || dataJson.labelListBig.length !== 0) && ( <tr style={{ lineHeight: '36px' }}>检验结果数据</tr>)
+        }
         {
           dataJson && dataJson.labelListSmall && dataJson.labelListSmall.map((item) => {
             // console.log(item, item,'=====');
@@ -28,7 +30,7 @@ const PreviewInspect = (props) => {
                       {/* {normalVal(item.minValue, item.maxValue)} */}
                       {normalVal(3.9, 6.1)}
                     </td>
-                    <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间:' + dateTime) : '验时间:' + toTime(item.time)
+                    <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间:' + dateTime) : '验时间:' + toTime(item.time)
                     }</td>
                   </tr>
                 // </table>
@@ -44,7 +46,7 @@ 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 className={style.assistTableTdFor}>{item.time == '' ? ('导入时间:' + dateTime) : '验时间:' + toTime(item.time)
                   }</td>
                 </tr>
               // </table>

+ 1 - 1
src/components/PreviewBody/index.jsx

@@ -111,7 +111,7 @@ class PreviewBody extends Component {
           <ItemPart dataStr={dataStr.vital} title={'查体:'} type={1}></ItemPart>
           {/* <PreviewInspect dataJson={come?dataJson.lis:lis_data} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetails}></PreviewInspect> */}
           <PreviewInspect dataJson={dataStr.lis} toTime={this.toTime} dateTime={this.state.dateTime} showDetails={this.showDetailsCopy}></PreviewInspect>
-          <ItemPart dataStr={dataStr.pacs} title={'检:'} type={2}></ItemPart>
+          <ItemPart dataStr={dataStr.pacs} title={'检:'} type={2}></ItemPart>
           <ItemPart dataStr={dataStr.diag} title={'诊断:'} type={2} lastDot={true}></ItemPart>
           <MedicalAdvice advice={dataStr.advice}></MedicalAdvice>
           {/* <tr className={style['patInfoFst']}>

+ 2 - 0
src/store/async-actions/historyTemplates.js

@@ -17,10 +17,12 @@ export const initItemList = (item) => {
       name: '',
       current: 1,
       size: 9999,
+      desc : ['gmt_create']
     }; 
     if (item === 'up') {
       params.desc = ['gmt_create'];
     }else if(item === 'down'){
+      delete params.desc;
       params.asc = ['gmt_create'];
     }
     return axios.json('/demo/templateInfo/getTemplatePageAlls', params);