From bf494fd2957a926f823d86035a65f2ca942a237f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 12 Aug 2016 10:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 7 +- .../web/controller/StopPregnancyController.java | 11 ++- .../operate/web/facade/BabyBookbuildingFacade.java | 89 +++++++++------------- .../operate/web/facade/StopPregnancyFacade.java | 70 +++++++++++------ .../operate/web/request/StopPregRequest.java | 4 +- 5 files changed, 93 insertions(+), 88 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 85310c7..2025ac6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -651,8 +651,11 @@ public class DateUtil { // String st = md.format(new Date()); // System.out.print(st); - String s = getBabyMonthAge(parseYMD("2014-07-9"), new Date()); - System.out.println(s); +// String s = getBabyMonthAge(parseYMD("2014-07-9"), new Date()); +// System.out.println(s); + + Date s = addDay(parseYMD("2016-02-26"), 168); + System.out.println(getyyyy_MM_dd(s)); } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java index fb9f5de..35b2e7a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java @@ -32,12 +32,15 @@ public class StopPregnancyController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpStopPreg") @ResponseBody - public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest request) { - if (!StringUtils.isEmpty(request.getId())) + @TokenRequired + public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest params,HttpServletRequest request) { + if (!StringUtils.isEmpty(params.getId())) { - return stopPregnancyFacade.updateStopPreg(request); + return stopPregnancyFacade.updateStopPreg(params); } - return stopPregnancyFacade.addStopPreg(request); + + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return stopPregnancyFacade.addStopPreg(params,loginState.getId()); } /** 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 f92163a..9078844 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 @@ -165,10 +165,8 @@ public class BabyBookbuildingFacade { * @return */ public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) { + BaseObjectResponse br = new BaseObjectResponse(); - -// Patients ppatients = patientsService.findLastBuildRecord("579b15d1231a17fcf5579bec",YnEnums.YES.getId()); -// return null; //判断儿童是否建档在该医院 if (StringUtils.isNotEmpty(request.getMommyPhone()) || StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -185,7 +183,6 @@ public class BabyBookbuildingFacade { List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(models)) { - BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.DATA_EXIST); br.setErrormsg("儿童在医院已经建档"); return br; @@ -217,42 +214,6 @@ public class BabyBookbuildingFacade { } -// 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()); @@ -272,16 +233,25 @@ public class BabyBookbuildingFacade { List pats = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(pats)) { - patients = pats.get(0); - } - //当前状态为 孕妇状态 - if (pm.getType() != null && pm.getType() == 1) - { - boolean isUpdatePatStatus = false; - for(Patients pat : pats) + + //当前状态为 孕妇状态 + if (pm.getType() != null && pm.getType() == 1) { - if (pat != null) { - if (pat.getType() == 1) { + boolean isUpdatePatStatus = false; + for(Patients pat : pats) + { + if (pat == null) + { + continue; + } + + //找到当前医院的孕妇建档 + if (pat.getHospitalId() != null && pat.getHospitalId().equals(request.getHospitalId())) + { + patients = pat; + } + + if (pat.getType() != null && pat.getType() == 1) { //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 //计算规则 儿童生日 >= 孕妇末次月经 + 24周 设置成分娩 (高帆 2016-08-09 16:47定 ) @@ -294,6 +264,7 @@ public class BabyBookbuildingFacade { Patients patientUpdate = new Patients(); patientUpdate.setYn(YnEnums.YES.getId()); patientUpdate.setType(3); + patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate())); patientsService.updatePatientByPid(patientUpdate, pm.getId()); if (!isUpdatePatStatus) { @@ -304,14 +275,15 @@ public class BabyBookbuildingFacade { } } } - } - if (isUpdatePatStatus) - { - pm.setType(3);//基本信息更新成产妇 - personService.updatePerson(pm,pm.getId()); + if (isUpdatePatStatus) + { + pm.setType(3);//基本信息更新成产妇 + personService.updatePerson(pm,pm.getId()); + } } } + } } //没有孕妇基本信息就新建产妇建档 和基本信息 @@ -338,6 +310,13 @@ public class BabyBookbuildingFacade { } + if (patients == null) + { + br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + br.setErrormsg("失败"); + return br; + } + BabyModel model = getBabyModel(request); model.setPid(babyPersonId); @@ -361,7 +340,7 @@ public class BabyBookbuildingFacade { model.setCreated(new Date()); model.setModified(new Date()); model = babyBookbuildingService.addBabyBookbuilding(model); - BaseObjectResponse br = new BaseObjectResponse(); + if (model == null || model.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); br.setErrormsg("失败"); 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 ffbd38b..af8e4f7 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 @@ -14,12 +14,10 @@ import com.lyms.platform.operate.web.result.StopPregResult; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.AntExChuModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.StopPregModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.PersonModelQuery; import com.lyms.platform.query.StopPregQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -50,6 +48,9 @@ public class StopPregnancyFacade { @Autowired private YunBookbuildingService yunBookbuildingService; + @Autowired + private PersonService personService; + /** * 更新终止妊娠 @@ -72,41 +73,60 @@ public class StopPregnancyFacade { * @param request * @return */ - public BaseResponse addStopPreg(StopPregRequest request) { + public BaseResponse addStopPreg(StopPregRequest request,Integer userId) { + +// String hospitalId = ""; +// //得到当前登录的医院id +// if (userId != null) +// { +// Users dbuser = usersService.getUsers(userId); +// if (dbuser != null) { +// hospitalId = String.valueOf(dbuser.getOrgId()); +// } +// } PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); - patientsQuery.setId(request.getId()); - patientsQuery.setHospitalId(request.getHospitalId()); + patientsQuery.setPid(request.getPid()); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { - Patients patient = patients.get(0); - if (patient != null) - { - patient.setModified(new Date()); - patient.setDueStatus(1); - //更新状态为过期 - //判断其为增值服务还是 标准服务 - if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) - { - patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); - } - else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + for (Patients patient : patients) + { + if (patient != null) { - patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - } - patient.setDueDate(new Date()); - patient.setType(3); + patient.setModified(new Date()); + //终止妊娠状态 + patient.setDueStatus(1); - //分娩状态 0未终止妊娠 1终止妊娠 - yunBookbuildingService.updatePregnant(patient, request.getPid()); + //更新状态为过期 + //判断其为增值服务还是 标准服务 + if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } + else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } + patient.setDueDate(new Date()); + patient.setType(3); + + //分娩状态 0未终止妊娠 1终止妊娠 + yunBookbuildingService.updatePregnant(patient,patient.getId()); + } } + //更新孕妇基本信息为产妇 + PersonModel pmodel = new PersonModel(); + pmodel.setType(3); + pmodel.setModified(new Date()); + + personService.updatePerson(pmodel, request.getPid()); } StopPregModel model = getStopPregModel(request); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java index e0e74b4..4cfce95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java @@ -12,9 +12,9 @@ import java.util.Map; */ public class StopPregRequest { private String id; - //孕妇建档id + //孕妇建档基本信息ID @FormParam - @NotEmpty(message = "孕妇建档id不能为空.") + @NotEmpty(message = "孕妇基本信息ID不能为空.") private String pid; //终止原因 -- 1.8.3.1