diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index d539b76..f56f0fc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -172,9 +172,6 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if (null != parentIds) { condition = condition.and("parentId", parentIds, MongoOper.IN); } - if (null != overTimes) { - condition = condition.and("overTimes", overTimes, MongoOper.IN); - } if (null != pids) { condition = condition.and("pid", pids, MongoOper.IN); @@ -242,6 +239,22 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ + if (null != overTimesStart) { + if (null != c1) { + c1 = c1.and("overTimes").gte(overTimesStart); + } else { + c1 = Criteria.where("overTimes").gte(overTimesStart); + } + } + if (null != overTimesEnd) { + if (c1 != null) { + c1 = c1.lte(overTimesEnd); + } else { + c1 = Criteria.where("overTimes").lte(overTimesEnd); + } + } + + if (org.apache.commons.lang.StringUtils.isNotBlank(trackHospitalId)) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("trackHospitalId", trackHospitalId, MongoOper.IS); @@ -507,16 +520,24 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ } - private Integer overTimes; + private Integer overTimesStart; + private Integer overTimesEnd; - public Integer getOverTimes() { - return overTimes; + public Integer getOverTimesStart() { + return overTimesStart; } - public void setOverTimes(Integer overTimes) { - this.overTimes = overTimes; + public void setOverTimesStart(Integer overTimesStart) { + this.overTimesStart = overTimesStart; } + public Integer getOverTimesEnd() { + return overTimesEnd; + } + + public void setOverTimesEnd(Integer overTimesEnd) { + this.overTimesEnd = overTimesEnd; + } public Date getNextCheckTimeEnd() { return nextCheckTimeEnd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 289bb84..20e2f7f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1456,6 +1456,7 @@ public class AntenatalExaminationFacade { * @param patient */ public void addTrackDownInfo(Integer userId, Patients patient, String nextCheckTime) { + System.out.println("================================================="+nextCheckTime); //添加产后追访信息 TrackDownRecord trackDownRecord = patient.build(); //根据patient查询是否存在追访信息 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c7f4e48..4fd926f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -502,7 +502,8 @@ public class TrackDownFacade { downRecordQuery.setCityId(downQueryRequest.getCityId()); downRecordQuery.setStreetId(downQueryRequest.getStreetId()); downRecordQuery.setKey(downQueryRequest.getKey()); - downRecordQuery.setOverTimes(downQueryRequest.getOverTimes()); + downRecordQuery.setOverTimesStart(downQueryRequest.getOverTimesStart()); + downRecordQuery.setOverTimesEnd(downQueryRequest.getOverTimesEnd()); //产检逾期天数 AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java index 18491bf..b3d3a09 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java @@ -101,14 +101,23 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { private boolean isArea; - private Integer overTimes; + private Integer overTimesStart; + private Integer overTimesEnd; - public Integer getOverTimes() { - return overTimes; + public Integer getOverTimesStart() { + return overTimesStart; } - public void setOverTimes(Integer overTimes) { - this.overTimes = overTimes; + public void setOverTimesStart(Integer overTimesStart) { + this.overTimesStart = overTimesStart; + } + + public Integer getOverTimesEnd() { + return overTimesEnd; + } + + public void setOverTimesEnd(Integer overTimesEnd) { + this.overTimesEnd = overTimesEnd; } public Integer getCheckOverDaysStart() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 5a85d7b..188b13c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1006,7 +1006,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //威海市妇幼热量单独计算 if ("2100001635".equals(hospitalId)) { kmap = getWhComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); - }else if ("216".equals(hospitalId)) { //临西县热量单独计算 + }else if ("2100001306".equals(hospitalId)) { //临西县热量单独计算 kmap = getLxComputeKul(week, Double.parseDouble(patientWeight.getBeforeHeight()), Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi); } else { @@ -1488,7 +1488,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient String hospitalId = kmap.get("hospitalId"); String kcal = ""; //临西热量计算 - if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) + if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId)) { kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+""; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 920b620..9d4d54c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -820,6 +820,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public boolean addOrupdateTrackDownRecord(Integer userId, TrackDownRecord trackDownRecord) { try { + System.out.println("==========================================="+trackDownRecord.getId()); //先根据主键id进行查询 if (StringUtils.isNotEmpty(trackDownRecord.getId())) { TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId());