更新

admin-ui/src/components/dtree.vue

@@ -50,7 +50,7 @@ export default {
   },
   mounted() {
     console.log("asd:"+this.$store.state.user.deptId);
-    this.ajax({ url: '/system/user/deptTree' }).then((response) => {
+    this.ajax({ url: '/system/user/deptTree',loading: 'false' }).then((response) => {
       this.deptOptions = response.data;
     });
   },

admin-ui/src/components/dtreeDoctor.vue

@@ -41,9 +41,9 @@ export default {
     }
   },
   mounted() {
-    this.get({ url: '/system/user/listAll' }).then((response) => {
+    this.get({ url: '/system/user/listAll',loading: 'false' }).then((response) => {
       let children = response.data.filter((item) => item.userId != this.user.id).map((item) => ({ label: item.nickName, id: item.userId }));
-      this.deptOptions.push({ label: this.user.deptNameStr, id: '' });
+      this.deptOptions.push({ label: this.user.deptNameStr, id: this.user.deptId });
       this.deptOptions[0].children = children;
       this.deptOptions[0].children.unshift({ label: '我自己(科室主任)', id: this.user.id });
     });
@@ -57,7 +57,7 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.$emit('input', data.id);
-      this.$emit('handleQuery');
+      this.$emit('handleQuery', { deptId: data.id == this.user.deptId ? data.id : null });
     }
   }
 };

admin-ui/src/views/work/visit/index.vue

@@ -23,7 +23,7 @@
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table :data="response.rows" border height="calc(100vh - 240px)">
+        <el-table :data="response.rows" border height="calc(100vh - 240px)" v-loading="loading">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="患者姓名" align="center" prop="name" width="110" />
           <el-table-column label="性别" align="center" prop="state" width="70">
@@ -82,13 +82,15 @@ export default {
     return {
       user: this.$store.state.user,
       dateRange: [],
+      loading: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         physician: null,
         name: null,
         department: null,
-        deptId: null
+        deptId: null,
+        userId: null
       }
     };
   },
@@ -100,12 +102,14 @@ export default {
   },
   methods: {
     getList() {
+      this.loading = true;
       if (this.dateRange) {
         this.queryParams.dateBegin = this.dateRange[0];
         this.queryParams.dateEnd = this.dateRange[1];
       }
-      this.get({ url: '/work/visit/patientCard', data: this.queryParams }).then((response) => {
+      this.get({ url: '/work/visit/patientCard', data: this.queryParams, loading: 'false' }).then((response) => {
         this.response = response;
+        this.loading = false;
       });
     },
     op(tag, row, type) {
@@ -116,7 +120,11 @@ export default {
         this.iframe({ obj: listByUser, param: { patientId: row.patId, patientName: row.name, type: type }, title: row.name + '的' + (type == 0 ? '复诊提醒记录' : '出院随访记录'), width: '80%', height: '80%' });
       }
     },
-    handleQuery() {
+    handleQuery(e) {
+      if (e != undefined && e.deptId) {
+        this.queryParams.userId = null;
+        this.queryParams.deptId = e.deptId;
+      }
       this.queryParams.pageNum = 1;
       this.getList();
     },

app/common/http.js

@@ -1,6 +1,6 @@
 //const ip = 'http://127.0.0.1:9191';
-const ip = 'https://chenglantimes.com/api';
-//const ip = 'http://192.168.1.24:9292';
+const ip = 'https://sf.cxsrmyy.com:7997/api';
+//const ip = 'http://124.226.144.144:7997/api';
 /**
  * 封装的http请求
  */
@@ -57,10 +57,17 @@ const request = (opt) => {
 			}
 			/*******************系统内部错误***************************/
 			if (res.data.code === 500 || res.data.status === 404) {
-				uni.showModal({
-					content: res.data.msg || res.data.message,
-					showCancel: false
-				});
+				if (res.data.msg.includes('TooManyResultsException')) {
+					uni.showModal({
+						content:'该用户已被绑定过,请先解除绑定',
+						showCancel: false
+					});
+				}else{
+					uni.showModal({
+						content: res.data.msg || res.data.message,
+						showCancel: false
+					});
+				}	
 				opt.fail(res);
 				return;
 			}

app/pages/user/bind/add.vue

@@ -33,7 +33,7 @@
 export default {
 	data() {
 		return {
-			item: { type: 0, relationship: '自己' },
+			item: { type: 1, relationship: '自己' },
 			bindType: ['手机号', '身份证'],
 			relationship: []
 		};

ruoyi-admin/src/main/java/com/ruoyi/web/work/hl7/service/impl/HL7VisitServiceImpl.java

@@ -90,7 +90,7 @@ public class HL7VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> impleme
         LambdaQueryWrapper<Visit> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Visit::getDeptCode,deptCode).eq(Visit::getPatId,patId);
         Visit visitEntity = baseMapper.selectOne(wrapper); //根据科室部门代码和患者id查
-        if (visitEntity != null && !StringUtils.isEmpty(deptCode) && visitEntity.getDeptCode().equals(deptCode)) {
+        if (visitEntity != null) {
             // 如果已存在且科室代码匹配,保存诊断信息
             Long dbVisitId = visitEntity.getId(); //就诊dbVisitId
             dg1Service.saveDiagnosisInfo(dg1All,dbVisitId,pv1,patId);