Browse Source

1-隐藏复制为出入院诊断
2-存仁馆医嘱默认打开草药

yanqiliang 4 days ago
parent
commit
af585addbd

+ 5 - 0
.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "objectscript.conn": {
+        "active": false
+    }
+}

+ 12 - 7
src/pages/workstation/OutPatientStationTabs.jsx

@@ -684,6 +684,10 @@ class OutpatientStationTabs extends React.Component {
     }
 
     //获取动态step组件
+    getDefaultChangeComponent = (componentSource) => {
+        return componentSource && componentSource.code === '03050037' && this.state.userData?.hospCode === 'QYCRGMZB' ? '1' : '2';
+    }
+
     loadStepComponent() {
         var params = {
             params: [{
@@ -712,7 +716,8 @@ class OutpatientStationTabs extends React.Component {
                     this.setState({
                         dataSource: res.result,
                         componentSource: code,
-                        current: current
+                        current: current,
+                        changeComponent: this.getDefaultChangeComponent(code)
                     })
                 }
             }
@@ -968,7 +973,7 @@ class OutpatientStationTabs extends React.Component {
                         that.setState({
                             componentSource: data,
                             // current: index,
-                            changeComponent: '2',
+                            changeComponent: that.getDefaultChangeComponent(data),
                             // medicineStatus:false,
                             isShowOutPatientModal: true,
                             isShowTriageSystemModal: true,
@@ -999,7 +1004,7 @@ class OutpatientStationTabs extends React.Component {
                 that.setState({
                     componentSource: data,
                     // current: parseInt(e.target.innerText) - 1,
-                    changeComponent: '2',
+                    changeComponent: that.getDefaultChangeComponent(data),
                     // medicineStatus:false,
                     isShowOutPatientModal: true,
                     isShowTriageSystemModal: true
@@ -1013,7 +1018,7 @@ class OutpatientStationTabs extends React.Component {
         this.setState({
             componentSource: data,
             // current: index,
-            changeComponent: '2',
+            changeComponent: this.getDefaultChangeComponent(data),
             // medicineStatus:false,
             isShowOutPatientModal: true,
             isShowTriageSystemModal: true,
@@ -1052,7 +1057,7 @@ class OutpatientStationTabs extends React.Component {
                                     that.setState({
                                         componentSource: data,
                                         // current: index,
-                                        changeComponent: '2',
+                                        changeComponent: that.getDefaultChangeComponent(data),
                                         // medicineStatus:false,
                                         isShowOutPatientModal: true,
                                         isShowTriageSystemModal: true,
@@ -1070,7 +1075,7 @@ class OutpatientStationTabs extends React.Component {
                             that.setState({
                                 componentSource: data,
                                 // current: index,
-                                changeComponent: '2',
+                                changeComponent: that.getDefaultChangeComponent(data),
                                 // medicineStatus:false,
                                 isShowOutPatientModal: true,
                                 isShowTriageSystemModal: true,
@@ -3290,7 +3295,7 @@ class OutpatientStationTabs extends React.Component {
         console.log(data)
         this.setState({
             componentSource: data,
-            changeComponent: '2',
+            changeComponent: this.getDefaultChangeComponent(data),
             isShowOutPatientModal: true,
             isShowTriageSystemModal: true
         })

+ 0 - 9
src/pages/workstation/component/DiagnosisStepPage.jsx

@@ -3396,15 +3396,6 @@ class DiagnosisStepPage extends React.Component {
 									onClick={this.saveDiagnosisMsg.bind(this)} >
 									{this.display('DiagTablesave')}
 								</Button>
-								<Divider type="vertical" />
-								<Button type='primary' style={{ cursor: 'pointer' }} disabled={this.state.disBtn == 'N'} onClick={this.copyDiagnosis.bind(this, 'ADD')} >
-									{this.display('DiagTablecopyIn')}
-								</Button>
-								<Divider type="vertical" />
-								<Button type='primary' style={{ cursor: 'pointer' }} disabled={this.state.disBtn == 'N'} onClick={this.copyDiagnosis.bind(this, 'DIS')} >
-									{this.display('DiagTablecopyOut')}
-								</Button>
-								<Divider type="vertical" />
 							</div>
 							<Table columns={this.state.diagColumns.length > 0 ? this.state.diagColumns : this.columns} style={{ height: 'calc(100% - 34px)', width: '100%' }}
 								className="diagTable"