From fbf53eb3a54f448f8d418b4fcce2e3423cd893f5 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 10 Apr 2020 15:08:34 +0800 Subject: [PATCH] update --- .../platform/operate/web/facade/MicroelementFacade.java | 16 ++++++++-------- .../platform/sync/data/service/SyncHsPatientService.java | 15 ++++++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 5d331b7..8bc5300 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -106,13 +106,13 @@ public class MicroelementFacade { //孕周 if (start != null && end != null) { - Date start1 = DateUtil.getWeekStart(start); - Date end2 = DateUtil.getWeekEnd(end); - query.setLastMensesStart(end2); - query.setLastMensesEnd(start1); + Date start1 = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end * 7) - 6); + Date end1 = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7)); + query.setLastMensesStart(start1); + query.setLastMensesEnd(end1); } - + System.out.println(query.convertToQuery().convertToMongoQuery().toString()); List models = microelementService.queryMicroelementList(query); if (CollectionUtils.isNotEmpty(models)) @@ -177,8 +177,8 @@ public class MicroelementFacade { Date currentDate = new Date(); Date start1 = DateUtil.addMonth(currentDate, -start); Date end2 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); - query.setBirthStart(start1); - query.setBirthEnd(end2); + query.setBirthStart(end2); + query.setBirthEnd(start1); } System.out.println(query.convertToQuery().convertToMongoQuery().toString()); List models = microelementService.queryMicroelementList(query); @@ -198,7 +198,7 @@ public class MicroelementFacade { data.put("vcCardNo",babyModel.getVcCardNo()); data.put("mcardNo",babyModel.getMcertNo()); data.put("microelements", model.getMicroelements()); - data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); + data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); data.put("mname", babyModel.getMname()); data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); dataList.add(data); diff --git a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncHsPatientService.java b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncHsPatientService.java index f7b15a2..51564f0 100644 --- a/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncHsPatientService.java +++ b/platform-sync-data/src/main/java/com/lyms/platform/sync/data/service/SyncHsPatientService.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.pojo.QhdWeightConfigModel; import com.lyms.platform.sync.data.util.DataUtil; import com.lyms.platform.sync.data.util.HsDataUtil; import com.lyms.platform.sync.data.util.JDBCUtil; @@ -19,6 +20,8 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -110,7 +113,8 @@ public class SyncHsPatientService implements InitializingBean { } Patients patients = new Patients(); - PersonModel person = new PersonModel(); + + int type = 1; Integer weeks = DataUtil.getInteger(map.get("WEEKS")); List> chanList = null; @@ -129,11 +133,9 @@ public class SyncHsPatientService implements InitializingBean { type = 3; } - Date dueDate = DateUtil.addDay(DateUtil.addMonth(DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")), 9), 7); - - patients.setDueDate(dueDate); - person.setCreated(new Date()); + PersonModel person = new PersonModel(); + mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(DataUtil.getString(map.get("P_CARDNO"))).and("yn").is(1)), PersonModel.class); person.setId(String.valueOf(map.get("PID"))); person.setType(type); person.setYn(YnEnums.YES.getId()); @@ -146,6 +148,9 @@ public class SyncHsPatientService implements InitializingBean { mongoTemplate.save(person); + Date dueDate = DateUtil.addDay(DateUtil.addMonth(DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")), 9), 7); + patients.setDueDate(dueDate); + patients.setPid(person.getId()); patients.setId(String.valueOf(map.get("PID"))); patients.setYn(DataUtil.getInteger(map.get("P_ISVALID"))); //是否有效 -- 1.8.3.1