diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java index 581aada3b..7bf298ba4 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/criticalvalue/appservice/impl/CriticalValueAppServiceImpl.java @@ -13,7 +13,7 @@ public class CriticalValueAppServiceImpl implements ICriticalValueAppService { @Override public CriticalValue reportCriticalValue(CriticalValue cv) { cv.setStatus("PENDING"); - cv.setDelFlag("0"); + cv.setDeleteFlag("0"); cv.setReportTime(new Date()); criticalValueService.save(cv); return cv; @@ -47,7 +47,7 @@ public class CriticalValueAppServiceImpl implements ICriticalValueAppService { @Override public List getPendingList() { return criticalValueService.list(new LambdaQueryWrapper() - .eq(CriticalValue::getStatus, "PENDING").eq(CriticalValue::getDelFlag, "0") + .eq(CriticalValue::getStatus, "PENDING").eq(CriticalValue::getDeleteFlag, "0") .orderByDesc(CriticalValue::getReportTime)); } @Override @@ -56,14 +56,14 @@ public class CriticalValueAppServiceImpl implements ICriticalValueAppService { return criticalValueService.list(new LambdaQueryWrapper() .in(CriticalValue::getStatus, "PENDING", "RECEIVED") .lt(CriticalValue::getReportTime, threshold) - .eq(CriticalValue::getDelFlag, "0")); + .eq(CriticalValue::getDeleteFlag, "0")); } @Override public Map getStatistics(String startDate, String endDate) { long total = criticalValueService.count(new LambdaQueryWrapper() - .eq(CriticalValue::getDelFlag, "0")); + .eq(CriticalValue::getDeleteFlag, "0")); long closed = criticalValueService.count(new LambdaQueryWrapper() - .eq(CriticalValue::getStatus, "CLOSED").eq(CriticalValue::getDelFlag, "0")); + .eq(CriticalValue::getStatus, "CLOSED").eq(CriticalValue::getDeleteFlag, "0")); long overdue = getOverdueList().size(); Map result = new HashMap<>(); result.put("total", total); diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/criticalvalue/domain/CriticalValue.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/criticalvalue/domain/CriticalValue.java index 471a94167..2ebf581d1 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/criticalvalue/domain/CriticalValue.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/criticalvalue/domain/CriticalValue.java @@ -35,5 +35,4 @@ public class CriticalValue extends HisBaseEntity { private String handleResult; private Date closeTime; private String status; - private String delFlag; } diff --git a/healthlink-his-ui/src/views/criticalvalue/api.js b/healthlink-his-ui/src/views/criticalvalue/api.js new file mode 100644 index 000000000..02e55143c --- /dev/null +++ b/healthlink-his-ui/src/views/criticalvalue/api.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function reportCriticalValue(data) { return request({ url: '/healthlink-his/api/v1/critical-value/report', method: 'post', data }) } +export function confirmCriticalValue(id, params) { return request({ url: '/healthlink-his/api/v1/critical-value/confirm/' + id, method: 'put', params }) } +export function processCriticalValue(id, params) { return request({ url: '/healthlink-his/api/v1/critical-value/process/' + id, method: 'put', params }) } +export function closeCriticalValue(id) { return request({ url: '/healthlink-his/api/v1/critical-value/close/' + id, method: 'put' }) } +export function getPendingList() { return request({ url: '/healthlink-his/api/v1/critical-value/pending', method: 'get' }) } +export function getOverdueList() { return request({ url: '/healthlink-his/api/v1/critical-value/overdue', method: 'get' }) } +export function getStatistics(params) { return request({ url: '/healthlink-his/api/v1/critical-value/statistics', method: 'get', params }) } diff --git a/healthlink-his-ui/src/views/criticalvalue/pending/index.vue b/healthlink-his-ui/src/views/criticalvalue/pending/index.vue index a8bfd934b..cd05dc9dd 100644 --- a/healthlink-his-ui/src/views/criticalvalue/pending/index.vue +++ b/healthlink-his-ui/src/views/criticalvalue/pending/index.vue @@ -1,31 +1,84 @@ +