diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index dbe6944..dd37c3b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -193,43 +193,68 @@ public class BabyBookbuildingFacade { Patients patients = null; PersonModel resperson = null; - if (request.getMommyPhone() != null || request.getMommyCertificateNum() != null) + String babyPersonId = ""; + //更新儿童基本信息的内容 + PersonModel babyPerson = new PersonModel(); + babyPerson.setName(request.getBabyName()); + babyPerson.setBirth(DateUtil.parseYMD(request.getBabyBirthday())); + babyPerson.setPhone(request.getMommyPhone()); + babyPerson.setCardNo(request.getMommyCertificateNum()); + babyPerson.setType(2); + babyPerson.setYn(YnEnums.YES.getId()); + babyPerson.setModified(new Date()); + if (StringUtils.isNotEmpty(request.getPid())) { + babyPersonId = request.getPid(); + personService.updatePerson(babyPerson,request.getPid()); + } + else { - //查询儿童基本信息 - PersonModelQuery personModelQuery = new PersonModelQuery(); -// personModelQuery.setPhone(request.getMommyPhone()); - personModelQuery.setYn(YnEnums.YES.getId()); - personModelQuery.setName(request.getBabyName()); - personModelQuery.setType(2); - personModelQuery.setCardNo(request.getMommyCertificateNum()); - List personModels = personService.queryPersons(personModelQuery); - - //更新儿童基本信息的内容 - PersonModel pmodel = new PersonModel(); - pmodel.setName(request.getBabyName()); - pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday())); - pmodel.setPhone(request.getMommyPhone()); - pmodel.setCardNo(request.getMommyCertificateNum()); - pmodel.setType(2); - pmodel.setYn(YnEnums.YES.getId()); - pmodel.setModified(new Date()); - if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null) - { - resperson = personModels.get(0); - personService.updatePerson(pmodel,personModels.get(0).getId()); - } - else - { - pmodel.setYn(YnEnums.YES.getId()); - pmodel.setCreated(new Date()); - resperson = personService.addPerson(pmodel); - } + babyPerson.setYn(YnEnums.YES.getId()); + babyPerson.setCreated(new Date()); + resperson = personService.addPerson(babyPerson); + babyPersonId = resperson.getId(); } +// Patients patients = null; +// PersonModel resperson = null; +// if (request.getMommyPhone() != null || request.getMommyCertificateNum() != null) +// { +// //查询儿童基本信息 +// PersonModelQuery personModelQuery = new PersonModelQuery(); +//// personModelQuery.setPhone(request.getMommyPhone()); +// personModelQuery.setYn(YnEnums.YES.getId()); +// personModelQuery.setName(request.getBabyName()); +// personModelQuery.setType(2); +// personModelQuery.setCardNo(request.getMommyCertificateNum()); +// List personModels = personService.queryPersons(personModelQuery); +// +// //更新儿童基本信息的内容 +// PersonModel pmodel = new PersonModel(); +// pmodel.setName(request.getBabyName()); +// pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday())); +// pmodel.setPhone(request.getMommyPhone()); +// pmodel.setCardNo(request.getMommyCertificateNum()); +// pmodel.setType(2); +// pmodel.setYn(YnEnums.YES.getId()); +// pmodel.setModified(new Date()); +// if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null) +// { +// resperson = personModels.get(0); +// personService.updatePerson(pmodel,personModels.get(0).getId()); +// } +// else +// { +// pmodel.setYn(YnEnums.YES.getId()); +// pmodel.setCreated(new Date()); +// resperson = personService.addPerson(pmodel); +// } +// } + + //查询孕妇或者产妇建档的基本信息 PersonModelQuery personYunModelQuery = new PersonModelQuery(); - personYunModelQuery.setPhone(request.getMommyPhone()); +// personYunModelQuery.setPhone(request.getMommyPhone()); personYunModelQuery.setYn(YnEnums.YES.getId()); personYunModelQuery.setTypes(new Integer[]{1, 3}); personYunModelQuery.setCardNo(request.getMommyCertificateNum()); @@ -251,31 +276,40 @@ public class BabyBookbuildingFacade { //当前状态为 孕妇状态 if (pm.getType() != null && pm.getType() == 1) { - - if (patients != null) { - if (patients.getType() == 1) { - - //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 - //计算规则 儿童生日 >= 孕妇末次月经 + 24周 设置成分娩 (高帆 2016-08-09 16:47定 ) - Date lastMenses = patients.getLastMenses(); - if (lastMenses != null && request.getBabyBirthday() != null) { - Date brith = DateUtil.parseYMD(request.getBabyBirthday()); - Date tempDate = DateUtil.addWeek(lastMenses, 24); - if (brith.getTime() >= tempDate.getTime()) { - //设置孕妇已分娩 - Patients patientUpdate = new Patients(); - patientUpdate.setYn(YnEnums.YES.getId()); - patientUpdate.setType(3); - patientsService.updatePatientByPid(patientUpdate,pm.getId()); - - - pm.setType(3);//基本信息更新成产妇 - resperson = pm; - personService.updatePerson(pm,pm.getId()); + boolean isUpdatePatStatus = false; + for(Patients pat : pats) + { + if (pat != null) { + if (pat.getType() == 1) { + + //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 + //计算规则 儿童生日 >= 孕妇末次月经 + 24周 设置成分娩 (高帆 2016-08-09 16:47定 ) + Date lastMenses = pat.getLastMenses(); + if (lastMenses != null && request.getBabyBirthday() != null) { + Date brith = DateUtil.parseYMD(request.getBabyBirthday()); + Date tempDate = DateUtil.addWeek(lastMenses, 24); + if (brith.getTime() >= tempDate.getTime()) { + //设置孕妇已分娩 + Patients patientUpdate = new Patients(); + patientUpdate.setYn(YnEnums.YES.getId()); + patientUpdate.setType(3); + patientsService.updatePatientByPid(patientUpdate, pm.getId()); + if (!isUpdatePatStatus) + { + isUpdatePatStatus = true; + } + + } } } } } + + if (isUpdatePatStatus) + { + pm.setType(3);//基本信息更新成产妇 + personService.updatePerson(pm,pm.getId()); + } } } } @@ -304,7 +338,7 @@ public class BabyBookbuildingFacade { BabyModel model = getBabyModel(request); - model.setPid(resperson.getId()); + model.setPid(babyPersonId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -852,12 +886,10 @@ public class BabyBookbuildingFacade { List personModels = personService.queryPersons(personModelQuery); if (CollectionUtils.isNotEmpty(personModels)) { - - for(PersonModel babayPerson : personModels) { BabyInfoResult result = new BabyInfoResult(); - result.setId(babayPerson.getId()); + result.setPid(babayPerson.getId()); result.setCardNo(babayPerson.getCardNo());//母亲的身份证号码 result.setName(babayPerson.getName()); if (babayPerson.getBirth() != null) @@ -899,10 +931,10 @@ public class BabyBookbuildingFacade { buildRecords.put("buildHospital", ""); } - result.setId(build.getId()); - result.setCardNo(build.getCardNo()); - result.setName(build.getName()); - result.setMonthAge(DateUtil.getBabyMonthAge(build.getBirth(), new Date())); +// result.setId(build.getId()); +// result.setCardNo(build.getCardNo()); +// result.setName(build.getName()); +// result.setMonthAge(DateUtil.getBabyMonthAge(build.getBirth(), new Date())); list.add(buildRecords); } @@ -935,7 +967,7 @@ public class BabyBookbuildingFacade { puerperaQuery.setCardNo(model.getMcertNo()); BabyInfoResult result = new BabyInfoResult(); - result.setId(model.getPid()); + result.setPid(model.getPid()); result.setCardNo(model.getMcertNo());//母亲的身份证号码 result.setName(model.getName()); if (model.getBirth() != null) @@ -976,10 +1008,6 @@ public class BabyBookbuildingFacade { buildRecords.put("buildHospital", ""); } - result.setId(build.getId()); - result.setCardNo(build.getCardNo()); - result.setName(build.getName()); - result.setMonthAge(DateUtil.getBabyMonthAge(build.getBirth(), new Date())); list.add(buildRecords); } @@ -1007,109 +1035,6 @@ public class BabyBookbuildingFacade { objectResponse.setData(map); objectResponse.setErrormsg("成功"); return objectResponse; - - - -// if (userId != null) -// { -// Users dbuser = usersService.getUsers(userId); -// if (dbuser != null) { -// Integer hospitalId = dbuser.getOrgId(); -// param.setHospitalId(String.valueOf(hospitalId)); -// } -// } -// -// -// -// Map map = new HashMap<>(); -// -// List results = new ArrayList<>(); -// BabyModelQuery babyQuery = new BabyModelQuery(); -// babyQuery.setYn(YnEnums.YES.getId()); -// List models = null; -// if (!StringUtils.isEmpty(param.getCardNo())) { -// babyQuery.setCardId(param.getCardNo()); -// babyQuery.setHospitalId(param.getHospitalId()); -// -// //通过查询孕妇 -// PatientsQuery puerperaQuery = new PatientsQuery(); -// puerperaQuery.setCardNo(param.getCardNo()); -// puerperaQuery.setYn(YnEnums.YES.getId()); -// Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery); -// map.put("patients",patients); -// -//// if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) { -//// babyQuery.setPhoneId(patients.getPhone()); -//// } -// -// models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); -// -// } else if (param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) { -// babyQuery.setHospitalId(param.getHospitalId()); -// babyQuery.setVcCardNo(param.getVcCardNo()); -// models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); -// } -// -// if (models != null && models.size() > 0) { -// Set uid = new HashSet<>(); -// for (BabyModel model : models) { -// if (model != null) { -// uid.add(model.getId()); -// } -// -// } -// -// for (String id : uid) { -// BabyInfoResult result = new BabyInfoResult(); -// -// List> list = new ArrayList<>(); -// for (BabyModel model : models) { -// -// if (id.equals(model.getId())) { -// -// BabyModelQuery hospBuildRecordsQuery = new BabyModelQuery(); -// hospBuildRecordsQuery.setYn(YnEnums.YES.getId()); -// hospBuildRecordsQuery.setMcertNo(model.getMcertNo()); -// List builds = babyBookbuildingService.queryBabyBuildByCond(hospBuildRecordsQuery); -// if (CollectionUtils.isNotEmpty(builds)) -// { -// for(BabyModel build: builds) -// { -// Map buildRecords = new HashMap<>(); -// buildRecords.put("id", build.getId()); -// buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); -// -// //查询建档医院 -// Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId())); -// if (org != null) { -// buildRecords.put("buildHospital", org.getName()); -// } else { -// buildRecords.put("buildHospital", ""); -// } -// -// result.setId(build.getId()); -// result.setCardNo(build.getCardNo()); -// result.setName(build.getName()); -// result.setMonthAge(DateUtil.getBabyMonthAge(build.getBirth(), new Date())); -// list.add(buildRecords); -// } -// -// } -// -// } -// result.setBuildRecords(list); -// } -// results.add(result); -// } -// } -// -// map.put("records",results); -// -// BaseObjectResponse objectResponse = new BaseObjectResponse(); -// objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); -// objectResponse.setData(map); -// objectResponse.setErrormsg("成功"); -// return objectResponse; } private boolean isNotExist(List> list, String id) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java index 152ba88..78c04ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java @@ -8,7 +8,7 @@ import java.util.Map; */ public class BabyInfoResult { - private String id; + private String pid; private String name; private String monthAge; private String cardNo; @@ -24,12 +24,12 @@ public class BabyInfoResult { this.buildRecords = buildRecords; } - public String getId() { - return id; + public String getPid() { + return pid; } - public void setId(String id) { - this.id = id; + public void setPid(String pid) { + this.pid = pid; } public String getName() {