360

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -468,6 +468,9 @@
     },
     methods: {
       getUserData() {
+        if(!this.usercodeSearch){
+          return;
+        }
         const params = {
           usercode: this.usercodeSearch
         }

CallCenterWeb.UI/RMYY/src/components/workOrder/repairbase/addRepairbase.vue

@@ -300,6 +300,9 @@
     },
     methods: {
       getUserData() {
+        if(!this.usercodeSearch){
+          return;
+        }
         const params = {
           usercode: this.usercodeSearch
         }

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -310,6 +310,9 @@
     },
     methods: {
       getUserData() {
+        if(!this.usercodeSearch){
+          return;
+        }
         const params = {
           usercode: this.usercodeSearch
         }

CallCenterWeb.UI/RMYY/src/views/callScreen/components/callScreen.vue

@@ -29,11 +29,11 @@
               <visit-list :callin-num="callinNum" :callid="callinCallid" />
             </div>
           </el-tab-pane>
-          <el-tab-pane label="药品信息" name="drugInfo">
+          <!-- <el-tab-pane label="药品信息" name="drugInfo">
             <div class="tab_body">
               <drug-list :callin-num="callinNum" :callid="callinCallid" />
             </div>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="知识库" name="second">
             <div class="tab_body">
               <knowledge-List ref="knowledgeListEl" :callin-num="callinNum" :callid="callinCallid" />

CallCenterWeb.UI/RMYY/src/views/callScreen/components/hisList.vue

@@ -33,22 +33,22 @@
       <el-table-column :show-overflow-tooltip="true" prop="DischargeDateTime" label="出院时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="" label="出院科室" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="出院诊断" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.Diagnosis.Name}}</span>
+          <span v-if="scope.row.Diagnosis">{{scope.row.Diagnosis.Name}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="" label="主管医生" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="" label="住院号" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.VisitNumber.CardID}}</span>
+          <span v-if="scope.row.VisitNumber">{{scope.row.VisitNumber.CardID}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -57,17 +57,17 @@
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="就诊病区" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AssignedPatientLocation.Areaname}}</span>
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.Areaname}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -76,12 +76,12 @@
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="就诊时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="就诊科室" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="接诊医生" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -90,29 +90,30 @@
       <el-table-column :show-overflow-tooltip="true" prop="AdmitDateTime" label="体检时间" align="center" />
       <el-table-column :show-overflow-tooltip="true" prop="" label="体检科室" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
+          <span v-if="scope.row.AssignedPatientLocation">{{scope.row.AssignedPatientLocation.PointOfCareName}}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" prop="" label="接诊医生" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.AttendingDoctor.FamilyName}}</span>
+          <span v-if="scope.row.AttendingDoctor">{{scope.row.AttendingDoctor.FamilyName}}</span>
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="请选择系统" :visible.sync="dialogVisible" width="30%">
+    <el-dialog title="请选择" :visible.sync="dialogVisible" width="30%">
       <div style="height: 300px;">
-        <el-select v-model="tourlid" placeholder="请选择系统">
+        <!-- <el-select v-model="tourlid" placeholder="请选择系统">
           <el-option v-for="(item,index) in urls" :key="index" :label="item.F_Name" :value="item.F_DictionaryValueId">
           </el-option>
-        </el-select>
-        <el-select v-model="jzlb" placeholder="请选择就诊类别">
+        </el-select> -->
+        <el-select v-model="jzlb" clearable placeholder="请选择就诊类别">
           <el-option value="1" label="门诊"></el-option>
           <el-option value="2" label="住院"></el-option>
           <el-option value="3" label="体检"></el-option>
         </el-select>
+        <el-input v-model="jzlsh" placeholder="请输入就诊流水号" style="width: 200px;" clearable></el-input>
+        <el-input v-model="zjh" placeholder="请输入身份证号" style="width: 200px;margin-top: 5px;" clearable></el-input>
       </div>
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" @click="goToView">确 定</el-button>
       </span>
     </el-dialog>
@@ -158,9 +159,11 @@
           pagesize: 5, // 每页几条数据
           total: 0 // 总共多少数据
         },
-        selectedUrl:'',
+        selectedUrl: '',
         urls: [],
-        jzlb:'',
+        jzlb: '1',
+        jzlsh: '',
+        zjh:'',
         tourlid: '',
         tourl: '',
         dialogVisible: false,
@@ -197,6 +200,7 @@
           GetModelList(params).then(response => {
             this.loading = false
             this.hismsg = response.rows[0]
+            this.zjh = this.hismsg.zjhm
             this.getRecord('I', response.rows[0].zsyh)
             this.getRecord('O', response.rows[0].zsyh)
             this.getRecord('E', response.rows[0].zsyh)
@@ -219,6 +223,11 @@
         })
       },
       goView() {
+        if (this.zhuyuanArr.length == 0 && this.menzhenArr.length == 0 && this.jizhenArr.length == 0 && this.tijianArr
+          .length == 0) {
+          this.$message.error('当前患者暂无就诊记录')
+          return;
+        }
         this.dialogVisible = true
         this.getUrls()
       },
@@ -236,17 +245,39 @@
       //   this.tourl = data.split(',')[1]
       //   console.log(this.tourlid,this.tourl)
       // },
-      goToView(){
+      goToView() {
+        if (!this.jzlb) {
+          this.$message.error('请选择就诊类别')
+          return;
+        }
+        var zhuyuanid = ''
+        var menzhenid = ''
+        var jizhenid = ''
+        var tijianid = ''
+        if (this.zhuyuanArr.length > 0) {
+          zhuyuanid = this.zhuyuanArr[0].AttendingDoctor.CardID
+        }
+        if (this.menzhenArr.length > 0) {
+          menzhenid = this.menzhenArr[0].AttendingDoctor.CardID
+        }
+        if (this.jizhenArr.length > 0) {
+          jizhenid = this.jizhenArr[0].AttendingDoctor.CardID
+        }
+        if (this.tijianArr.length > 0) {
+          tijianid = this.tijianArr[0].AttendingDoctor.CardID
+        }
         const params = {
-          id:this.tourlid,
-          userid:this.zhuyuanArr[0].AttendingDoctor.CardID || '',
-          zjh:this.hismsg.zjhm,
-          jzlb:this.jzlb,
+          userid: zhuyuanid || menzhenid || jizhenid || tijianid,
+          zjh: this.hismsg.zjhm || this.zjh,
+          jzlb: this.jzlb,
+          jzlsh: this.jzlsh
         }
-        GetUrl(params).then(res=>{
-          if(res.state == 'success'){
+        GetUrl(params).then(res => {
+          if (res.state == 'success') {
             this.dialogVisible = false
-            this.tourlid = ''
+            this.jzlb = ''
+            this.jzlsh = ''
+            this.zjh = ''
             window.open(res.data)
           }
         })
@@ -269,9 +300,12 @@
           GlobalPID: zsyh
         }
         GetRcord(params).then(res => {
+          if (res.QueryPatientVisitByIDResponse.patientVisits == "") {
+            return;
+          }
           const Obj = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
           if (recordtype === 'I') {
-            if (Obj instanceof Array == 'true') {
+            if (Obj instanceof Array === true) {
               this.zhuyuanArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
             } else {
               this.zhuyuanArr = []
@@ -279,7 +313,7 @@
             }
           }
           if (recordtype === 'O') {
-            if (Obj instanceof Array == 'true') {
+            if (Obj instanceof Array === true) {
               this.menzhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
             } else {
               this.menzhenArr = []
@@ -287,7 +321,7 @@
             }
           }
           if (recordtype === 'E') {
-            if (Obj instanceof Array == 'true') {
+            if (Obj instanceof Array === true) {
               this.jizhenArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
             } else {
               this.jizhenArr = []
@@ -295,7 +329,7 @@
             }
           }
           if (recordtype === 'P') {
-            if (Obj instanceof Array == 'true') {
+            if (Obj instanceof Array === true) {
               this.tijianArr = res.QueryPatientVisitByIDResponse.patientVisits.patientVisit
             } else {
               this.tijianArr = []

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -41,6 +41,7 @@
           <span v-if="scope.row.StateName=='待完成'" style="color: #ff5507;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待接单'" style="color: #ff0000;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.AssistanceState" label="协作" align="center" min-width>

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -47,6 +47,7 @@
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.F_CreateTime" prop="F_CreateTime" label="创建时间" align="center" />

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -55,6 +55,7 @@
           <span v-if="scope.row.StateName=='待派单'" style="color: #ff55ff;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待提交'" style="color: #ff007f;">{{scope.row.StateName}}</span>
           <span v-if="scope.row.StateName=='待分配'" style="color: #aa0000;">{{scope.row.StateName}}</span>
+          <span v-if="scope.row.StateName=='确认耗材中'" style="color: #55007f;">{{scope.row.StateName}}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="fieldListFlag.MYD" prop="MYD" label="满意度" align="center">