diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 410aea7..9d33d1a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -34,6 +34,17 @@ public class SieveApplyOrderModel extends BaseModel { //操作人 private String operator; + //申请时间 + private Date applyTime; + + public Date getApplyTime() { + return applyTime; + } + + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + public String getOperator() { return operator; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 823f94c..34184b6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -64,6 +64,38 @@ public class SieveModel extends BaseModel { private Date modified; private Integer yn; + //结果录入时间 + private Date resultTime; + //诊断结果时间 + private Date diagnosisTime; + + //申请时间 + private Date applyTime; + + public Date getResultTime() { + return resultTime; + } + + public void setResultTime(Date resultTime) { + this.resultTime = resultTime; + } + + public Date getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(Date diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + + public Date getApplyTime() { + return applyTime; + } + + public void setApplyTime(Date applyTime) { + this.applyTime = applyTime; + } + public int getOrder() { return order; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index 544e874..50ea845 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -33,6 +33,27 @@ public class SieveResultModel{ private Date created; private Date modified; + //结果录入时间 + private Date resultTime; + //诊断结果时间 + private Date diagnosisTime; + + public Date getResultTime() { + return resultTime; + } + + public void setResultTime(Date resultTime) { + this.resultTime = resultTime; + } + + public Date getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(Date diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + public String getStzhz13() { return stzhz13; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index c08459c..c0bba6d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -63,6 +63,67 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { //查询号 private String queryNo; + //结果录入时间 + private Date resultTimeStart; + private Date resultTimeEnd; + + + //诊断结果时间 + private Date diagnosisTimeStart; + private Date diagnosisTimeEnd; + + //申请时间 + private Date applyTimeStart; + private Date applyTimeEnd; + + public Date getApplyTimeStart() { + return applyTimeStart; + } + + public void setApplyTimeStart(Date applyTimeStart) { + this.applyTimeStart = applyTimeStart; + } + + public Date getApplyTimeEnd() { + return applyTimeEnd; + } + + public void setApplyTimeEnd(Date applyTimeEnd) { + this.applyTimeEnd = applyTimeEnd; + } + + public Date getResultTimeStart() { + return resultTimeStart; + } + + public void setResultTimeStart(Date resultTimeStart) { + this.resultTimeStart = resultTimeStart; + } + + public Date getResultTimeEnd() { + return resultTimeEnd; + } + + public void setResultTimeEnd(Date resultTimeEnd) { + this.resultTimeEnd = resultTimeEnd; + } + + public Date getDiagnosisTimeStart() { + return diagnosisTimeStart; + } + + public void setDiagnosisTimeStart(Date diagnosisTimeStart) { + this.diagnosisTimeStart = diagnosisTimeStart; + } + + public Date getDiagnosisTimeEnd() { + return diagnosisTimeEnd; + } + + public void setDiagnosisTimeEnd(Date diagnosisTimeEnd) { + this.diagnosisTimeEnd = diagnosisTimeEnd; + } + public String getQueryNo() { return queryNo; } @@ -215,6 +276,55 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (null != resultTimeStart) { + if (null != c1) { + c1 = c1.and("resultTime").gte(resultTimeStart); + } else { + c1 = Criteria.where("resultTime").gte(resultTimeStart); + } + } + + if (null != resultTimeEnd) { + if (c1 != null) { + c1 = c1.lte(resultTimeEnd); + } else { + c1 = Criteria.where("resultTime").lte(resultTimeEnd); + } + } + + if (null != diagnosisTimeStart) { + if (null != c1) { + c1 = c1.and("diagnosisTime").gte(diagnosisTimeStart); + } else { + c1 = Criteria.where("diagnosisTime").gte(diagnosisTimeStart); + } + } + + if (null != diagnosisTimeEnd) { + if (c1 != null) { + c1 = c1.lte(diagnosisTimeEnd); + } else { + c1 = Criteria.where("diagnosisTime").lte(diagnosisTimeEnd); + } + } + + if (null != applyTimeStart) { + if (null != c1) { + c1 = c1.and("applyTime").gte(applyTimeStart); + } else { + c1 = Criteria.where("applyTime").gte(applyTimeStart); + } + } + + if (null != applyTimeEnd) { + if (c1 != null) { + c1 = c1.lte(applyTimeEnd); + } else { + c1 = Criteria.where("applyTime").lte(applyTimeEnd); + } + } + + if (null != dueWeekStart) { if (null != c1) { c1 = c1.and("dueWeek").gte(dueWeekStart); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 5304df1..bc2d8f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -390,6 +390,7 @@ public class ApplyOrderFacade { List sieveModels = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(sieveModels)) { SieveModel sieveModel = sieveModels.get(0); + sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime()); sieveModel.setStatus(2); if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) { sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 903233e..afb470c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -108,6 +108,9 @@ public class SieveFacade { sieveModel.setId(list.get(0).getId()); sieveModel.setHospitalId(hospitalId); sieveModel.setZtfx(sieveAddRequest.getMax()); + sieveModel.setDiagnosisTime(sieveResultModel.getDiagnosisTime()); + sieveModel.setResultTime(sieveResultModel.getResultTime()); + sieveService.updateOneChanQianDiaSieve(sieveModel); SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId()); SieveService.handOrder(sieveModel1); @@ -263,6 +266,34 @@ public class SieveFacade { sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6)); } + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyTime())) { + String[] dates = cqSieveQueryRequest.getApplyTime().split(" - "); + + sieveQuery.setApplyTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + sieveQuery.setApplyTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } + + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getDiagnosisTime())) { + String[] dates = cqSieveQueryRequest.getDiagnosisTime().split(" - "); + + sieveQuery.setDiagnosisTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + sieveQuery.setDiagnosisTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } + + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getResultTime())) { + String[] dates = cqSieveQueryRequest.getResultTime().split(" - "); + + sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } + } + + sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index f0369ce..319c15d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -50,6 +50,38 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ //查询号 private String queryNo; + //结果录入时间 + private String resultTime; + //诊断结果时间 + private String diagnosisTime; + + //申请时间 + private String applyTime; + + public String getApplyTime() { + return applyTime; + } + + public void setApplyTime(String applyTime) { + this.applyTime = applyTime; + } + + public String getResultTime() { + return resultTime; + } + + public void setResultTime(String resultTime) { + this.resultTime = resultTime; + } + + public String getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(String diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + public String getQueryNo() { return queryNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index ae82ff6..7ff4015 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.pojo.SieveResultModel; import org.apache.commons.lang.StringUtils; @@ -28,6 +29,27 @@ public class SieveAddRequest implements IBasicRequestConvert { //录入人员 private String publishName; + //结果录入时间 + private String resultTime; + //诊断结果时间 + private String diagnosisTime; + + public String getResultTime() { + return resultTime; + } + + public void setResultTime(String resultTime) { + this.resultTime = resultTime; + } + + public String getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(String diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + public String getCspj() { return cspj; } @@ -119,6 +141,8 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setCspj(cspj); sieveModel.setStzhz13(stzhz13); sieveModel.setPublishName(publishName); + sieveModel.setDiagnosisTime(DateUtil.parseYMD(diagnosisTime)); + sieveModel.setResultTime(DateUtil.parseYMD(resultTime)); return sieveModel; } public Integer getMax(){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index fca6f3c..94873a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.SieveApplyOrderModel; @@ -26,6 +27,9 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert