diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractBabyDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractBabyDao.java index bc3415f..5c50c56 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractBabyDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractBabyDao.java @@ -14,4 +14,6 @@ public interface DischargeAbstractBabyDao { void batchSave(List dischargeAbstractBabyModelList); List query(MongoQuery mongoQuery); + + void update(DischargeAbstractBabyModel dischargeAbstractBabyModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractMotherDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractMotherDao.java index 5e2fd94..2242a2e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractMotherDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/DischargeAbstractMotherDao.java @@ -14,4 +14,6 @@ public interface DischargeAbstractMotherDao { DischargeAbstractMotherModel save(DischargeAbstractMotherModel dischargeAbstractMotherModel); List query(MongoQuery mongoQuery); + + void update(DischargeAbstractMotherModel dischargeAbstractMotherModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractBabyDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractBabyDaoImpl.java index ec4c209..c8f149f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractBabyDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractBabyDaoImpl.java @@ -2,6 +2,8 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.biz.dal.DischargeAbstractBabyDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.DischargeAbstractBabyModel; import org.springframework.stereotype.Repository; @@ -25,4 +27,9 @@ public class DischargeAbstractBabyDaoImpl extends BaseMongoDAOImpl query(MongoQuery mongoQuery) { return super.find(mongoQuery.convertToMongoQuery()); } + + @Override + public void update(DischargeAbstractBabyModel dischargeAbstractBabyModel) { + super.update(new MongoQuery(new MongoCondition("id", dischargeAbstractBabyModel.getId(), MongoOper.IS)).convertToMongoQuery(), dischargeAbstractBabyModel); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractMotherDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractMotherDaoImpl.java index 856add3..99e0854 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractMotherDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DischargeAbstractMotherDaoImpl.java @@ -2,6 +2,8 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.biz.dal.DischargeAbstractMotherDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.DischargeAbstractMotherModel; import org.springframework.stereotype.Repository; @@ -20,4 +22,9 @@ public class DischargeAbstractMotherDaoImpl extends BaseMongoDAOImpl query(MongoQuery mongoQuery) { return super.find(mongoQuery.convertToMongoQuery()); } + + @Override + public void update(DischargeAbstractMotherModel dischargeAbstractMotherModel) { + super.update(new MongoQuery(new MongoCondition("id", dischargeAbstractMotherModel.getId(), MongoOper.IS)).convertToMongoQuery(), dischargeAbstractMotherModel); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractBabyService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractBabyService.java index a216911..ebe3ad3 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractBabyService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractBabyService.java @@ -25,4 +25,8 @@ public class DischargeAbstractBabyService { public List query(DischargeAbstractBabyQuery dischargeAbstractBabyQuery) { return dischargeAbstractBabyDao.query(dischargeAbstractBabyQuery.convertToQuery()); } + + public void update(DischargeAbstractBabyModel dischargeAbstractBabyModel) { + dischargeAbstractBabyDao.update(dischargeAbstractBabyModel); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractMotherService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractMotherService.java index b9fb4b8..a17467f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractMotherService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DischargeAbstractMotherService.java @@ -25,4 +25,8 @@ public class DischargeAbstractMotherService { public List query(DischargeAbstractMotherQuery dischargeAbstractMotherQuery) { return dischargeAbstractMotherDao.query(dischargeAbstractMotherQuery.convertToQuery()); } + + public void update(DischargeAbstractMotherModel dischargeAbstractMotherModel) { + dischargeAbstractMotherDao.update(dischargeAbstractMotherModel); + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index 3bf4949..6769eb8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -140,7 +140,7 @@ public class DischargeAbstractBabyModel extends BaseModel { /** * @auther HuJiaqi * @createTime 2016年12月05日 17时44分 - * @discription 创建时间 + * @discription 创建时间,每次操作都会更新 */ private Date createDate; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java index e46a4f3..eeda24a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java @@ -49,7 +49,7 @@ public class DischargeAbstractMotherModel extends BaseModel { /** * @auther HuJiaqi * @createTime 2016年12月05日 17时03分 - * @discription 创建时间 + * @discription 创建时间,每次操作都会更新 */ private Date createDate; @@ -60,6 +60,11 @@ public class DischargeAbstractMotherModel extends BaseModel { */ private String patientId; + /** + * @auther HuJiaqi + * @createTime 2016年12月13日 10时23分 + * @discription 操作人id,每次操作都会更新 + */ private Integer operatorId; public String getId() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index a541df9..1d840b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -60,8 +60,11 @@ public class DischargeAbstractFacade { dischargeAbstractMotherModel.setCreateDate(new Date()); dischargeAbstractMotherModel.setOperatorId(dischargeAbstractSaveRequest.getOperatorId()); dischargeAbstractMotherModel.setAfterMakeBabyDays(DateUtil.getDays(DateUtil.parseYMD(dischargeAbstractSaveRequest.getFmDate()), new Date())); - dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel); - + if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) { + dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel); + } else { + dischargeAbstractMotherService.update(dischargeAbstractMotherModel); + } // 保存孩子信息 List babyList = dischargeAbstractSaveRequest.getBabyList(); List dischargeAbstractBabyModelList = new ArrayList<>(); @@ -73,10 +76,16 @@ public class DischargeAbstractFacade { dischargeAbstractBabyModel.setCreateDate(new Date()); dischargeAbstractBabyModel.setbCGAndHBVVaccinationDate(DateUtil.parseYMD(baby.getbCGAndHBVVaccinationDate())); dischargeAbstractBabyModel.sethBIGInjectDate(DateUtil.parseYMD(baby.gethBIGInjectDate())); - dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); + if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { + dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); + } else { + dischargeAbstractBabyService.update(dischargeAbstractBabyModel); + } } } - dischargeAbstractBabyService.batchSave(dischargeAbstractBabyModelList); + if (dischargeAbstractBabyModelList.size() > 0) { + dischargeAbstractBabyService.batchSave(dischargeAbstractBabyModelList); + } dischargeAbstractSaveResult.setErrorcode(ErrorCodeConstants.SUCCESS); dischargeAbstractSaveResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index 32ecd74..9e7dfa3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -11,6 +11,15 @@ public class DischargeAbstractSaveRequest { /** * @auther HuJiaqi + * @createTime 2016年12月13日 11时00分 + * @discription 母id + */ + private String id; + + private Integer operatorId; + + /** + * @auther HuJiaqi * @createTime 2016年12月05日 15时46分 * @discription 出院时间 */ @@ -50,6 +59,13 @@ public class DischargeAbstractSaveRequest { /** * @auther HuJiaqi + * @createTime 2016年12月13日 11时00分 + * @discription 子id + */ + private String id; + + /** + * @auther HuJiaqi * @createTime 2016年12月05日 17时56分 * @discription 新生儿情况 */ @@ -160,6 +176,14 @@ public class DischargeAbstractSaveRequest { */ private String orderScreenDescription; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getDescription() { return description; } @@ -283,13 +307,19 @@ public class DischargeAbstractSaveRequest { public String getOrderScreenDescription() { return orderScreenDescription; } - public void setOrderScreenDescription(String orderScreenDescription) { this.orderScreenDescription = orderScreenDescription; } + } - private Integer operatorId; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public Integer getOperatorId() { return operatorId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java index f4ff167..73fb86f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java @@ -6,6 +6,14 @@ package com.lyms.platform.operate.web.result; * @discription */ public class DischargeAbstractBabyQueryModel { + + /** + * @auther HuJiaqi + * @createTime 2016年12月13日 10时20分 + * @discription 子id + */ + private String id; + /** * @auther HuJiaqi * @createTime 2016年12月05日 17时56分 @@ -118,6 +126,14 @@ public class DischargeAbstractBabyQueryModel { */ private String orderScreenDescription; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getDescription() { return description; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java index 4a88f01..0349462 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java @@ -9,6 +9,13 @@ public class DischargeAbstractMotherQueryModel { /** * @auther HuJiaqi + * @createTime 2016年12月13日 11时07分 + * @discription 母id + */ + private String id; + + /** + * @auther HuJiaqi * @createTime 2016年12月05日 15时46分 * @discription 出院时间 */ @@ -28,6 +35,14 @@ public class DischargeAbstractMotherQueryModel { */ private Integer afterMakeBabyDays; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getLeaveHospitalDate() { return leaveHospitalDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java index 6e1d9fa8..2587a5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java @@ -10,6 +10,7 @@ import java.util.List; * @discription */ public class DischargeAbstractQueryResult extends BaseResponse { + /** * @auther HuJiaqi * @createTime 2016年12月06日 13时42分