diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 5467cd6..cdf9cdb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -273,6 +273,17 @@ public class Patients extends BaseModel { // 是否发放过优惠券 private Boolean isSendCoupon; + //建档天数 + private Integer buildDays; + + public Integer getBuildDays() { + return buildDays; + } + + public void setBuildDays(Integer buildDays) { + this.buildDays = buildDays; + } + public Integer getIsAutoFm() { return isAutoFm; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index d9beb4f..355abcc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -133,6 +133,25 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String[] pc; private String[] pv; + private Integer buildDaysStart; + private Integer buildDaysEnd; + + public Integer getBuildDaysStart() { + return buildDaysStart; + } + + public void setBuildDaysStart(Integer buildDaysStart) { + this.buildDaysStart = buildDaysStart; + } + + public Integer getBuildDaysEnd() { + return buildDaysEnd; + } + + public void setBuildDaysEnd(Integer buildDaysEnd) { + this.buildDaysEnd = buildDaysEnd; + } + public String getoRiskFactor() { return oRiskFactor; } @@ -1327,6 +1346,24 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } } + + if (null != buildDaysStart) { + if (null != c1) { + c1 = c1.and("buildDays").gte(buildDaysStart); + } else { + c1 = Criteria.where("buildDays").gte(buildDaysStart); + } + } + + if (null != buildDaysEnd) { + if (null != c1) { + c1 = c1.lte(buildDaysEnd); + } else { + c1 = Criteria.where("buildDays").lte(buildDaysEnd); + } + } + + if (null != lastRhTimeStart) { if (null != c1) { c1 = c1.and("lastRhTime").gte(lastRhTimeStart); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java index 9c5ae17..1ef26d9 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java @@ -93,7 +93,7 @@ public class SaveMessageService { } } } catch (Exception e) { - logger.error("get msg is exist error",e); + logger.error("get msg is exist error,url="+ConfigInterface.MSG_BASE_URL + "/biz-push-web/push",e); } return false; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index ae2f9f4..d20a8b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -367,7 +367,7 @@ public class TestController { List postReviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(postReviewModels)) { - System.out.println("postReviewModels="+postReviewModels.size()+";patientid="+pat.getId()); + System.out.println("postReviewModels=" + postReviewModels.size() + ";patientid=" + pat.getId()); for(PostReviewModel postReviewModel : postReviewModels) { Patients patients = patientsService.findOnePatientById(postReviewModel.getParentId()); @@ -384,6 +384,33 @@ public class TestController { } + /** + * 建档天数计算 + * @param hospitalId + * @return + */ + @RequestMapping(value = "/updatePatBuildDays", method = RequestMethod.GET) + @ResponseBody + public String updatePatBuildDays(@RequestParam(required = true) String hospitalId) { + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setHospitalId(hospitalId); + List pats = patientsService.queryPatient(patientsQuery1); + System.out.println("main="+pats.size()); + if (CollectionUtils.isNotEmpty(pats)) { + for (Patients pat : pats) { + if (StringUtils.isNotEmpty(pat.getPid())) + { + pat.setBuildDays(DateUtil.getDays(pat.getLastMenses(), new Date())); + patientsService.updatePatient(pat); + } + + } + } + return "updatePatBuildDays finish"; + } + + @RequestMapping(value = "/rebuildDefaultRoles", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e4a2825..670f5fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1074,7 +1074,7 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); - + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date())); patient.setMensStartDay(yunRequest.getMensStartDay()); patient.setMensEndDay(yunRequest.getMensEndDay()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 9fa5f9f..ebee532 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -931,6 +931,17 @@ public class PatientFacade { PatientManagerResult patientManagerResult = new PatientManagerResult(); PatientsQuery patientsQuery = new PatientsQuery(); + + if (patientManagerRequest.getBuildWeekStart() != null) + { + patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart()*7); + } + + if (patientManagerRequest.getBuildWeekEnd() != null) + { + patientsQuery.setBuildDaysEnd((patientManagerRequest.getBuildWeekEnd()+1) * 7 - 1); + } + patientsQuery.setYn(YnEnums.YES.getId()); if (!patientManagerRequest.isExcel()) { patientsQuery.setNeed("need"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index d211c42..b2898f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -68,6 +68,26 @@ public class PatientManagerRequest extends BasePageQueryRequest { private boolean isExcel; + //建档孕周 + private Integer buildWeekStart; + private Integer buildWeekEnd; + + public Integer getBuildWeekStart() { + return buildWeekStart; + } + + public void setBuildWeekStart(Integer buildWeekStart) { + this.buildWeekStart = buildWeekStart; + } + + public Integer getBuildWeekEnd() { + return buildWeekEnd; + } + + public void setBuildWeekEnd(Integer buildWeekEnd) { + this.buildWeekEnd = buildWeekEnd; + } + public String getStreetRegisterId() { return streetRegisterId; }