diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java index b7c750e..128ff5a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java @@ -13,7 +13,7 @@ import java.util.Date; public class StopPregModel extends BaseModel { private String id; //孕妇建档id - private String pid; + private String patientId; //终止原因 private String stopReason; @@ -75,12 +75,12 @@ public class StopPregModel extends BaseModel { this.id = id; } - public String getPid() { - return pid; + public String getPatientId() { + return patientId; } - public void setPid(String pid) { - this.pid = pid; + public void setPatientId(String patientId) { + this.patientId = patientId; } public String getStopReason() { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java index fd3ff7f..71d3cae 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java @@ -18,7 +18,7 @@ import java.util.List; public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { private String id; //孕妇建档id - private String pid; + private String patientId; //终止原因 private List stopReason; @@ -38,8 +38,8 @@ public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); - if (null != pid) { - condition = condition.and("pid", pid, MongoOper.IS); + if (null != patientId) { + condition = condition.and("patientId", patientId, MongoOper.IS); } if (null != id) { condition = condition.and("id", new ObjectId(id), MongoOper.IS); @@ -67,12 +67,12 @@ public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { this.id = id; } - public String getPid() { - return pid; + public String getPatientId() { + return patientId; } - public void setPid(String pid) { - this.pid = pid; + public void setPatientId(String patientId) { + this.patientId = patientId; } public List getStopReason() { 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 3930258..83d3a8b 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 @@ -380,14 +380,24 @@ public class AntenatalExaminationFacade { MaternalDeliverModel model = modelList.get(0); dueDate = model.getDueDate(); } else { - //终止妊娠 - StopPregQuery query = new StopPregQuery(); - query.setYn(YnEnums.YES.getId()); - query.setPid(patients.getPid()); - stopPregs = stopPregnancyService.queryStopPreg(query); - if (CollectionUtils.isNotEmpty(stopPregs)) { - dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); + PatientsQuery query1 = new PatientsQuery(); + query1.setCardNo(exListQueryRequest.getCardNo()); + query1.setYn(YnEnums.YES.getId()); + List pats = patientsService.queryPatient(query1); + if (CollectionUtils.isNotEmpty(pats)) + { + + //终止妊娠 + StopPregQuery query = new StopPregQuery(); + query.setYn(YnEnums.YES.getId()); + query.setPatientId(patients.getId()); + stopPregs = stopPregnancyService.queryStopPreg(query); + if (CollectionUtils.isNotEmpty(stopPregs)) { + dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); + } } + + } PostReviewQuery postReviewQuery = new PostReviewQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index af8e4f7..7e4c9b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -91,6 +91,7 @@ public class StopPregnancyFacade { patientsQuery.setType(1); patientsQuery.setPid(request.getPid()); + Patients pat = null; List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { @@ -99,6 +100,13 @@ public class StopPregnancyFacade { { if (patient != null) { + + String hid = patient.getHospitalId(); + if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) + { + pat = patient; + } + patient.setModified(new Date()); //终止妊娠状态 patient.setDueStatus(1); @@ -113,7 +121,7 @@ public class StopPregnancyFacade { { patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); } - patient.setDueDate(new Date()); + patient.setFmDate(DateUtil.parseYMD(request.getStopDate())); patient.setType(3); //分娩状态 0未终止妊娠 1终止妊娠 @@ -129,7 +137,16 @@ public class StopPregnancyFacade { personService.updatePerson(pmodel, request.getPid()); } + if (pat != null) + { + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + objectResponse.setErrormsg("数据异常"); + return objectResponse; + } + StopPregModel model = getStopPregModel(request); + model.setPatientId(pat.getId()); model.setCreated(new Date()); model.setModified(new Date()); @@ -143,7 +160,6 @@ public class StopPregnancyFacade { private StopPregModel getStopPregModel(StopPregRequest request) { StopPregModel model = new StopPregModel(); - model.setPid(request.getPid()); model.setYn(YnEnums.YES.getId()); model.setInPerson(request.getInPerson()); model.setRemark(request.getRemark()); @@ -165,14 +181,14 @@ public class StopPregnancyFacade { Map map = new HashMap(); StopPregQuery query = new StopPregQuery(); query.setYn(YnEnums.YES.getId()); - query.setPid(pid); + query.setPatientId(pid); StopPregResult result = null; List stopPregs = stopPregnancyService.queryStopPreg(query); if (CollectionUtils.isNotEmpty(stopPregs)) { StopPregModel model = stopPregs.get(0); result = new StopPregResult(); - result.setPid(model.getPid()); + result.setPatientId(model.getPatientId()); result.setRemark(model.getRemark()); result.setId(model.getId()); result.setStopDate(DateUtil.getyyyy_MM_dd(model.getStopDate())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java index 6eb113d..c843005 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java @@ -9,7 +9,7 @@ import java.util.Map; public class StopPregResult { private String id; //孕妇建档id - private String pid; + private String patientId; //终止原因 private Map stopReason; @@ -31,12 +31,12 @@ public class StopPregResult { this.id = id; } - public String getPid() { - return pid; + public String getPatientId() { + return patientId; } - public void setPid(String pid) { - this.pid = pid; + public void setPatientId(String patientId) { + this.patientId = patientId; } public Map getStopReason() {