diff --git a/src/api/study.js b/src/api/study.js new file mode 100644 index 0000000..78f74c1 --- /dev/null +++ b/src/api/study.js @@ -0,0 +1,20 @@ +// 项目管理->详情->检查 +import request from '@/utils/request' + +// 检查列表->未提交 +export function getPatientStudyBeforeConfirmList(data) { + return request({ + url: '/Patient/getPatientStudyBeforeConfirmList', + method: 'post', + data + }) +} + +// 检查列表->已提交 +export function getTrialPatientStudyList(data) { + return request({ + url: '/Patient/getTrialPatientStudyList', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/settings.js b/src/settings.js index 63027ab..360c7b4 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,7 +1,7 @@ // eslint-disable-next-line no-undef module.exports = { - title: 'IRCIS', + title: 'HIRIS', /** * @type {boolean} true | false diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue index b163d99..5bd1dc8 100644 --- a/src/views/trials/trials-inspection/components/add-trials-list.vue +++ b/src/views/trials/trials-inspection/components/add-trials-list.vue @@ -103,11 +103,11 @@ export default { components: { Pagination, trialsSelect, confirmTrialsList }, props: { visible: { - require: true, + required: true, default: false, }, Patient: { - require: true, + required: true, default: () => { return {}; }, diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue index d23461f..f6eab96 100644 --- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue +++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue @@ -157,12 +157,23 @@ import { addSubjectPatientStudyBinding, submitVisitStudyBinding, } from "@/api/inspection.js"; + +const defaultSearchData = () => { + return { + EarliestStudyTime: null, + LatestStudyTime: null, + Asc: false, + SortField: "StudyTime", + PageIndex: 1, + PageSize: 20, + }; +}; export default { name: "confirmVisitList", components: { Pagination }, props: { Patient: { - require: true, + required: true, default: () => { return {}; }, @@ -182,14 +193,7 @@ export default { return { // 查询 dateValue: [], - searchData: { - EarliestStudyTime: null, - LatestStudyTime: null, - Asc: false, - SortField: "StudyTime", - PageIndex: 1, - PageSize: 20, - }, + searchData: defaultSearchData(), // 访视列表 total: 0, loading: false, @@ -289,6 +293,7 @@ export default { }, // 查询 handleSearch() { + this.searchData.PageIndex = 1; this.getList(); }, // 重置 @@ -298,13 +303,7 @@ export default { }, // 初始化 reset(flag = false) { - Object.keys(this.searchData).forEach((key) => { - this.searchData[key] = null; - }); - this.searchData.PageIndex = 1; - this.searchData.PageSize = 20; - this.searchData.Asc = false; - this.searchData.SortField = "StudyTime"; + this.searchData = defaultSearchData(); this.dateValue = []; this.$refs.confirmVisitList.clearSort(); if (flag) this.list = []; @@ -352,6 +351,16 @@ export default { }, // 确认提交 async confirmSubmit() { + let confirm = await this.$confirm( + this.$t("trials:adjustRecord:message:confirm"), + { + type: "warning", + distinguishCancelAndClose: true, + confirmButtonText: this.$t("common:button:confirm"), + cancelButtonText: this.$t("recompose:button:cancel"), + } + ); + if (confirm !== "confirm") return; let fd = await this.formatData(); if (!fd) return; let data = { diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue index d115230..b34639e 100644 --- a/src/views/trials/trials-inspection/components/research-trials-list.vue +++ b/src/views/trials/trials-inspection/components/research-trials-list.vue @@ -110,11 +110,11 @@ export default { components: { Pagination }, props: { visible: { - require: true, + required: true, default: false, }, Patient: { - require: true, + required: true, default: () => { return {}; }, @@ -167,7 +167,7 @@ export default { researchProgramNo: item.ResearchProgramNo, }; this.$router.push({ - path: "/trials/trials-panel/subject/subject-list", + path: "/trials/trials-panel/study", query, }); }, diff --git a/src/views/trials/trials-inspection/components/trials-select.vue b/src/views/trials/trials-inspection/components/trials-select.vue index 4873cf5..7d1fbfb 100644 --- a/src/views/trials/trials-inspection/components/trials-select.vue +++ b/src/views/trials/trials-inspection/components/trials-select.vue @@ -163,15 +163,15 @@ export default { name: "trialsSelect", props: { options: { - require: true, + required: true, default: () => [], }, data: { - require: true, + required: true, default: () => {}, }, status: { - require: true, + required: true, default: "trial", }, }, diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue index 9a29592..a135aad 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -130,16 +130,27 @@ import Pagination from "@/components/Pagination"; import { getPatientStudyList } from "@/api/inspection.js"; import { getToken } from "@/utils/auth"; + +const defaultSearchData = () => { + return { + Modalities: null, + EarliestStudyTime: null, + LatestStudyTime: null, + PatientId: null, + Asc: false, + SortField: "StudyTime", + }; +}; export default { name: "viewStudyList", components: { Pagination }, props: { visible: { - require: true, + required: true, default: false, }, Patient: { - require: true, + required: true, default: () => { return {}; }, @@ -148,14 +159,7 @@ export default { data() { return { // 查询 - searchData: { - Modalities: null, - EarliestStudyTime: null, - LatestStudyTime: null, - PatientId: null, - Asc: false, - SortField: "StudyTime", - }, + searchData: defaultSearchData(), dateValue: [], // 可加入项目列表 loading: false, @@ -198,6 +202,7 @@ export default { }, // 查询 handleSearch() { + this.searchData.PageIndex = 1; this.getList(); }, // 重置 @@ -207,11 +212,7 @@ export default { }, // 初始化 reset() { - Object.keys(this.searchData).forEach((key) => { - this.searchData[key] = null; - }); - this.searchData.Asc = false; - this.searchData.SortField = "StudyTime"; + this.searchData = defaultSearchData(); this.dateValue = []; }, // 查看影像 diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index dff2265..efc4c23 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -225,6 +225,19 @@ import addTrialsList from "./components/add-trials-list"; import viewStudyList from "./components/view-study-list"; import { getPatientList } from "@/api/inspection.js"; import { getDicomCalledAEList } from "@/api/dicomAE.js"; + +const defaultSearchData = () => { + return { + PatientIdStr: null, + PatientName: null, + CalledAEList: [], + ExperimentName: null, + Asc: false, + SortField: "LatestPushTime", + PageIndex: 1, + PageSize: 10, + }; +}; export default { name: "inspection", components: { @@ -237,16 +250,7 @@ export default { data() { return { // 查询 - searchData: { - PatientIdStr: null, - PatientName: null, - CalledAEList: [], - ExperimentName: null, - Asc: false, - SortField: "LatestPushTime", - PageIndex: 1, - PageSize: 10, - }, + searchData: defaultSearchData(), dicomAeList: [], // 检查列表 total: 0, @@ -298,18 +302,12 @@ export default { }, // 查询 handleSearch() { + this.searchData.PageIndex = 1; this.getList(); }, // 重置 handleReset() { - Object.keys(this.searchData).forEach((key) => { - this.searchData[key] = null; - }); - this.searchData.PageIndex = 1; - this.searchData.PageSize = 10; - this.searchData.CalledAEList = []; - this.searchData.Asc = false; - this.searchData.SortField = "LatestPushTime"; + this.searchData = defaultSearchData(); this.$refs.inspectionList.clearSort(); this.getList(); }, diff --git a/src/views/trials/trials-panel/study/components/edit-visit.vue b/src/views/trials/trials-panel/study/components/edit-visit.vue index fc3a38a..6468635 100644 --- a/src/views/trials/trials-panel/study/components/edit-visit.vue +++ b/src/views/trials/trials-panel/study/components/edit-visit.vue @@ -2,7 +2,9 @@ - + - + @@ -65,31 +67,46 @@ + \ No newline at end of file diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue index 7d917a7..d61a2a9 100644 --- a/src/views/trials/trials-panel/study/index.vue +++ b/src/views/trials/trials-panel/study/index.vue @@ -1,233 +1,19 @@