jiangjiazhi / regional-platform

Commit 1ff8964ae7b0faf727e55dc7d2ee9ce4c37f5a27

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

体重修改

Showing 6 changed files with 49 additions and 16 deletions

platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -172,9 +172,6 @@
172	172	if (null != parentIds) {
173	173	condition = condition.and("parentId", parentIds, MongoOper.IN);
174	174	}
175		- if (null != overTimes) {
176		- condition = condition.and("overTimes", overTimes, MongoOper.IN);
177		- }
178	175
179	176	if (null != pids) {
180	177	condition = condition.and("pid", pids, MongoOper.IN);
...	...	@@ -242,6 +239,22 @@
242	239
243	240
244	241
	242	+ if (null != overTimesStart) {
	243	+ if (null != c1) {
	244	+ c1 = c1.and("overTimes").gte(overTimesStart);
	245	+ } else {
	246	+ c1 = Criteria.where("overTimes").gte(overTimesStart);
	247	+ }
	248	+ }
	249	+ if (null != overTimesEnd) {
	250	+ if (c1 != null) {
	251	+ c1 = c1.lte(overTimesEnd);
	252	+ } else {
	253	+ c1 = Criteria.where("overTimes").lte(overTimesEnd);
	254	+ }
	255	+ }
	256	+
	257	+
245	258	if (org.apache.commons.lang.StringUtils.isNotBlank(trackHospitalId)) {
246	259	MongoCondition c = MongoCondition.newInstance();
247	260	MongoCondition con1 = MongoCondition.newInstance("trackHospitalId", trackHospitalId, MongoOper.IS);
248	261
249	262
250	263
...	...	@@ -507,16 +520,24 @@
507	520	}
508	521
509	522
510		- private Integer overTimes;
	523	+ private Integer overTimesStart;
	524	+ private Integer overTimesEnd;
511	525
512		- public Integer getOverTimes() {
513		- return overTimes;
	526	+ public Integer getOverTimesStart() {
	527	+ return overTimesStart;
514	528	}
515	529
516		- public void setOverTimes(Integer overTimes) {
517		- this.overTimes = overTimes;
	530	+ public void setOverTimesStart(Integer overTimesStart) {
	531	+ this.overTimesStart = overTimesStart;
518	532	}
519	533
	534	+ public Integer getOverTimesEnd() {
	535	+ return overTimesEnd;
	536	+ }
	537	+
	538	+ public void setOverTimesEnd(Integer overTimesEnd) {
	539	+ this.overTimesEnd = overTimesEnd;
	540	+ }
520	541
521	542	public Date getNextCheckTimeEnd() {
522	543	return nextCheckTimeEnd;

...	...	@@ -1456,6 +1456,7 @@
1456	1456	* @param patient
1457	1457	*/
1458	1458	public void addTrackDownInfo(Integer userId, Patients patient, String nextCheckTime) {
	1459	+ System.out.println("================================================="+nextCheckTime);
1459	1460	//添加产后追访信息
1460	1461	TrackDownRecord trackDownRecord = patient.build();
1461	1462	//根据patient查询是否存在追访信息

...	...	@@ -502,7 +502,8 @@
502	502	downRecordQuery.setCityId(downQueryRequest.getCityId());
503	503	downRecordQuery.setStreetId(downQueryRequest.getStreetId());
504	504	downRecordQuery.setKey(downQueryRequest.getKey());
505		- downRecordQuery.setOverTimes(downQueryRequest.getOverTimes());
	505	+ downRecordQuery.setOverTimesStart(downQueryRequest.getOverTimesStart());
	506	+ downRecordQuery.setOverTimesEnd(downQueryRequest.getOverTimesEnd());
506	507
507	508	//产检逾期天数
508	509	AntExRecordQuery antExRecordQuery = new AntExRecordQuery();

...	...	@@ -101,14 +101,23 @@
101	101
102	102	private boolean isArea;
103	103
104		- private Integer overTimes;
	104	+ private Integer overTimesStart;
	105	+ private Integer overTimesEnd;
105	106
106		- public Integer getOverTimes() {
107		- return overTimes;
	107	+ public Integer getOverTimesStart() {
	108	+ return overTimesStart;
108	109	}
109	110
110		- public void setOverTimes(Integer overTimes) {
111		- this.overTimes = overTimes;
	111	+ public void setOverTimesStart(Integer overTimesStart) {
	112	+ this.overTimesStart = overTimesStart;
	113	+ }
	114	+
	115	+ public Integer getOverTimesEnd() {
	116	+ return overTimesEnd;
	117	+ }
	118	+
	119	+ public void setOverTimesEnd(Integer overTimesEnd) {
	120	+ this.overTimesEnd = overTimesEnd;
112	121	}
113	122
114	123	public Integer getCheckOverDaysStart() {

...	...	@@ -1006,7 +1006,7 @@
1006	1006	//威海市妇幼热量单独计算
1007	1007	if ("2100001635".equals(hospitalId)) {
1008	1008	kmap = getWhComputeKul(week, Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi);
1009		- }else if ("216".equals(hospitalId)) { //临西县热量单独计算
	1009	+ }else if ("2100001306".equals(hospitalId)) { //临西县热量单独计算
1010	1010	kmap = getLxComputeKul(week, Double.parseDouble(patientWeight.getBeforeHeight()), Double.parseDouble(patientWeight.getNowWeight()), Double.parseDouble(patientWeight.getBeforeWeight()), patientWeight.getBregmatic(), bmi);
1011	1011	}
1012	1012	else {
...	...	@@ -1488,7 +1488,7 @@
1488	1488	String hospitalId = kmap.get("hospitalId");
1489	1489	String kcal = "";
1490	1490	//临西热量计算
1491		- if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId))
	1491	+ if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId))
1492	1492	{
1493	1493	kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+"";
1494	1494	}

...	...	@@ -820,6 +820,7 @@
820	820	@Override
821	821	public boolean addOrupdateTrackDownRecord(Integer userId, TrackDownRecord trackDownRecord) {
822	822	try {
	823	+ System.out.println("==========================================="+trackDownRecord.getId());
823	824	//先根据主键id进行查询
824	825	if (StringUtils.isNotEmpty(trackDownRecord.getId())) {
825	826	TrackDownRecord trackDownRecord1 = trackDownRecordService.getTrackDown(trackDownRecord.getId());