diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index af3d275..db71a33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -80,6 +80,13 @@ public class PregnantBuildController extends BaseController{ public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + /** 末次月经和纠正末次月经反起来存 */ + if(StringUtils.isNotEmpty(yunBookbuildingAddRequest.getFuckLastMens())) { + String fuckLastMens = yunBookbuildingAddRequest.getFuckLastMens(); + yunBookbuildingAddRequest.setFuckLastMens(yunBookbuildingAddRequest.getLastMenstrualPeriod()); + yunBookbuildingAddRequest.setLastMenstrualPeriod(fuckLastMens); + } + if (yunBookbuildingAddRequest != null && !StringUtils.isEmpty(yunBookbuildingAddRequest.getId()) ) { return bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest,loginState.getId()); 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 7420404..8cae3ea 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 @@ -237,11 +237,6 @@ public class BookbuildingFacade { } Patients patient = getPatientsData(yunRequest); - /** 末次月经和纠正末次月经反起来存 */ - if(yunRequest.getFuckLastMens() != null) { - patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens())); - patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); - } patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date())); @@ -900,12 +895,6 @@ public class BookbuildingFacade { Patients beforePatient = yunBookbuildingService.findOneById(id); - /** 末次月经和纠正末次月经反起来存 */ - if(yunRequest.getFuckLastMens() != null) { - patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens())); - patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); - } - yunBookbuildingService.updatePregnant(patient, id); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(beforePatient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改"); @@ -1124,14 +1113,8 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); - - // 纠正末次月经和末次月经反起存 - if (StringUtils.isEmpty(yunRequest.getFuckLastMens())) { - patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); - } else { - patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); - patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens())); - } + patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getFuckLastMens())); + patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis()); patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId());