diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index a0efcbe..0e2791e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -47,6 +47,9 @@ public class Patients extends BaseModel { //户籍类型Id private String pcensusTypeId; + //孕妇文化程度Id + private String plevelTypeId; + //工作单位 private String pworkUnit; @@ -210,6 +213,26 @@ public class Patients extends BaseModel { private String husbandPhone; private String vcCardNo; + //丈夫文化程度Id + private String hlevelTypeId; + + + public String getPlevelTypeId() { + return plevelTypeId; + } + + public void setPlevelTypeId(String plevelTypeId) { + this.plevelTypeId = plevelTypeId; + } + + public String getHlevelTypeId() { + return hlevelTypeId; + } + + public void setHlevelTypeId(String hlevelTypeId) { + this.hlevelTypeId = hlevelTypeId; + } + public Date getFmDate() { return fmDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index f22249d..32020a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -62,7 +62,7 @@ public class BookbuildingController extends BaseController{ */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateYunBuild") @ResponseBody - public BaseResponse addPregnantBookbuilding(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest) { + public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest) { if (yunBookbuildingAddRequest != null && !StringUtils.isEmpty(yunBookbuildingAddRequest.getId()) ) { bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest); 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 c284508..55ec12b 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 @@ -84,14 +84,24 @@ public class BabyBookbuildingFacade { if (patients != null) { - if (patients.getType() != 3) + if (patients.getType() == 1) { - //设置孕妇已分娩 - Patients patientUpdate = new Patients(); - patientUpdate.setId(patients.getId()); - patientUpdate.setYn(YnEnums.YES.getId()); - patientUpdate.setType(3); - patientsService.updatePatient(patientUpdate); + + //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 + //计算规则 儿童生日 > 孕妇分娩时间 - 60 设置成分娩 + Date dueDate = patients.getDueDate(); + Date brith = DateUtil.parseYMD(request.getBabyBirthday()); + Date tempDate = DateUtil.addDay(dueDate,-60); + if (brith.getTime() > tempDate.getTime()) + { + //设置孕妇已分娩 + Patients patientUpdate = new Patients(); + patientUpdate.setId(patients.getId()); + patientUpdate.setYn(YnEnums.YES.getId()); + patientUpdate.setType(3); + patientsService.updatePatient(patientUpdate); + } + } } @@ -149,21 +159,18 @@ public class BabyBookbuildingFacade { patient.setHusbandPhone(request.getFatherPhone()); patient.setHprofessionTypeId(request.getFatherProfessionTypeId()); + patient.setPlevelTypeId(request.getMommyLevelId()); + patient.setHlevelTypeId(request.getFatherLevelId()); + + + patient.setMremark(request.getMremark()); + -// patient.setMremark(yunRequest.getMremark()); -// -// patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); -// patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate())); -// patient.setFileCode(yunRequest.getFileCode()); -// patient.setBookbuildingDoctor(yunRequest.getBookbuildingDoctor()); -// patient.setBookbuildingDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); -// patient.setServiceType(yunRequest.getServiceType()); -// patient.setVcCardNo(yunRequest.getVcCardNo()); - patient.setDueDate(DateUtil.parseYMD(request.getDueDate())); + patient.setFmDate(DateUtil.parseYMD(request.getBabyBirthday())); - patient.setBookbuildingDoctor(request.getBuildDoctor()); + patient.setServiceStatus(request.getServiceStatus()); patient.setBookbuildingDate(DateUtil.parseYMD(request.getBuildDate())); patient.setServiceType(request.getServiceType()); patient.setHospitalId(request.getHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index de357dd..4dda3eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -195,6 +195,7 @@ public class BookbuildingFacade { patient.setPhone(yunRequest.getPregnantPhone()); patient.setPworkUnit(yunRequest.getPregnantWorkUnit()); + patient.setPlevelTypeId(yunRequest.getPregnantLevelTypeId()); //孕妇户籍地址 patient.setAddressRegister(yunRequest.getPregnantCensusAddr()); @@ -231,6 +232,7 @@ public class BookbuildingFacade { patient.setHcityRegisterId(yunRequest.getHusbandCityRegisterId()); patient.setHareaRegisterId(yunRequest.getHusbandAreaRegisterId()); patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId()); + patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); patient.setServiceStatus(yunRequest.getServiceStatus()); patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime())); @@ -281,6 +283,7 @@ public class BookbuildingFacade { result.setPregnantCensusTypeId(p.getPcensusTypeId()); result.setPregnantLiveTypeId(p.getPliveTypeId()); result.setPregnantProfessionTypeId(p.getPprofessionTypeId()); + result.setPregnantLevelTypeId(p.getPlevelTypeId()); /**********孕妇联系方式***************/ result.setPregnantPhone(p.getPhone()); @@ -315,6 +318,7 @@ public class BookbuildingFacade { result.setHusbandNationId(p.getHnationId()); result.setHusbandProfessionTypeId(p.getHprofessionTypeId()); result.setHusbandWorkUnit(p.getHworkUnit()); + result.setHusbandLevelTypeId(p.getHlevelTypeId()); result.setHusbandAddressRegister(p.getHaddressRegister()); result.setHusbandProvinceRegisterId(p.getHprovinceRegisterId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 9247525..58fc7d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -30,6 +30,9 @@ public class YunBookbuildingAddRequest { private String pregnantLiveTypeId; //职业类别 private String pregnantProfessionTypeId; + + //孕妇文化程度 + private String pregnantLevelTypeId; /***********孕妇基本信息***********/ /***********孕妇联系方式***********/ @@ -79,6 +82,9 @@ public class YunBookbuildingAddRequest { private String husbandWorkUnit; //职业类别 private String husbandProfessionTypeId; + + //丈夫文化程度 + private String husbandLevelTypeId; //户籍地址 private String husbandAddressRegister; @@ -158,6 +164,22 @@ public class YunBookbuildingAddRequest { this.vipEndTime = vipEndTime; } + public String getPregnantLevelTypeId() { + return pregnantLevelTypeId; + } + + public void setPregnantLevelTypeId(String pregnantLevelTypeId) { + this.pregnantLevelTypeId = pregnantLevelTypeId; + } + + public String getHusbandLevelTypeId() { + return husbandLevelTypeId; + } + + public void setHusbandLevelTypeId(String husbandLevelTypeId) { + this.husbandLevelTypeId = husbandLevelTypeId; + } + /***********院内信息***********/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 7353a65..30f3ded 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -27,6 +27,9 @@ public class PregnantInfoResult { private String pregnantLiveTypeId; //职业类别 private String pregnantProfessionTypeId; + + //孕妇文化程度 + private String pregnantLevelTypeId; /***********孕妇基本信息***********/ /***********孕妇联系方式***********/ @@ -76,6 +79,8 @@ public class PregnantInfoResult { private String husbandWorkUnit; //职业类别 private String husbandProfessionTypeId; + //丈夫文化程度 + private String husbandLevelTypeId; //户籍地址 private String husbandAddressRegister; @@ -154,6 +159,22 @@ public class PregnantInfoResult { this.vipEndTime = vipEndTime; } + public String getPregnantLevelTypeId() { + return pregnantLevelTypeId; + } + + public void setPregnantLevelTypeId(String pregnantLevelTypeId) { + this.pregnantLevelTypeId = pregnantLevelTypeId; + } + + public String getHusbandLevelTypeId() { + return husbandLevelTypeId; + } + + public void setHusbandLevelTypeId(String husbandLevelTypeId) { + this.husbandLevelTypeId = husbandLevelTypeId; + } + /***********院内信息***********/