From ac59b4f72295be083b584421b339c96ae3eb62b8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Dec 2016 14:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AntExRecordService.java | 4 +++- .../biz/service/AntenatalExaminationService.java | 21 +++++++++++++-------- .../com/lyms/platform/pojo/AntExRecordModel.java | 10 ++++++++++ .../com/lyms/platform/query/AntExRecordQuery.java | 13 +++++++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index e592327..f357dbf 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -152,7 +152,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); antExRecordModel.setParentId(antEx.getParentId()); -// antExRecordModel.setId(antEx.getId()); + antExRecordModel.setfId(antEx.getId()); antExRecordModel.setType(1); antExRecordModel.setHospitalId(antEx.getHospitalId()); antExRecordModel.setCheckDoctor(antEx.getCheckDoctor()); @@ -187,6 +187,7 @@ public class AntExRecordService { antExRecordModel.setHospitalId(antExChuModel.getHospitalId()); antExRecordModel.setParentId(antExChuModel.getParentId()); antExRecordModel.setType(2); + antExRecordModel.setfId(antExChuModel.getId()); antExRecordModel.setPid(antExChuModel.getPid()); antExRecordModel.setModified(new Date()); Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); @@ -253,6 +254,7 @@ public class AntExRecordService { * @param antExRecordQuery */ public void batchUpdate(AntExRecordModel record, AntExRecordQuery antExRecordQuery) { + record.setModified(new Date()); antExRecordDao.batchUpdateRecord(record, antExRecordQuery.convertToQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index d6bb9f9..1e245a7 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -12,6 +12,7 @@ import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExRecordQuery; import com.lyms.platform.query.VisitQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -103,16 +104,20 @@ public class AntenatalExaminationService { AntExChuModel chu = findOne(id); antExRecordModel = antExRecordService.convert(chu); } - - if (null != antExRecordModel) { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setParentId(antExRecordModel.getParentId()); - antExRecordQuery.setcId(antExRecordModel.getCheckDoctor()); - Integer count = antExRecordService.count(antExRecordQuery); - if (null == count || 0 == count) { - antExRecordModel.setCreated(new Date()); - antExRecordService.addOneRecord(antExRecordModel); + antExRecordQuery.setfId(id); + List list = antExRecordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(list)) { + antExRecordService.batchUpdate(antExRecordModel,antExRecordQuery); + } else { + antExRecordQuery.setParentId(antExRecordModel.getParentId()); + antExRecordQuery.setcId(antExRecordModel.getCheckDoctor()); + Integer count = antExRecordService.count(antExRecordQuery); + if (null == count || 0 == count) { + antExRecordModel.setCreated(new Date()); + antExRecordService.addOneRecord(antExRecordModel); + } } } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index e59db39..6ab890b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -16,6 +16,8 @@ import java.util.List; public class AntExRecordModel extends BaseModel { private String id; + //原始表的id + private String fId; private String parentId; @@ -50,6 +52,14 @@ public class AntExRecordModel extends BaseModel { private Date created; + public String getfId() { + return fId; + } + + public void setfId(String fId) { + this.fId = fId; + } + public Date getModified() { return modified; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 34e7ba9..a536db2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -16,6 +16,8 @@ import java.util.Date; public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId; private String id; + private String fId; + //创建时间 private String hospitalId; //孕妇状态 @@ -32,6 +34,14 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private Date gteCreated; private String pid; + public String getfId() { + return fId; + } + + public void setfId(String fId) { + this.fId = fId; + } + public String getcId() { return cId; } @@ -146,6 +156,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (null != cId) { condition = condition.and("checkDoctor", cId, MongoOper.IS); } + if (null != cId) { + condition = condition.and("fId", fId, MongoOper.IS); + } if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); -- 1.8.3.1