From 23d1c7ef66e647efb9ff2650dce236e285bb3010 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 11 Aug 2016 11:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9F=A5=E8=AF=A2=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/service/BabyBookbuildingService.java | 2 +- .../web/controller/BabyBookbuildingController.java | 4 +- .../operate/web/facade/BabyBookbuildingFacade.java | 61 ++++++++++++++++++---- 3 files changed, 54 insertions(+), 13 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index 93ecee3..21ee37d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -46,7 +46,7 @@ public class BabyBookbuildingService { babyQuery.mysqlBuild(babyBookBuildingDao.queryBabyManageCount(babyQuery.convertToQuery())); query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); } - return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "buildDate")); + return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "created")); } public int queryBabyCount(BabyModelQuery babyQuery) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index e4e9623..7d4f5ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -249,7 +249,7 @@ public class BabyBookbuildingController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryPatientBaseInfo") @ResponseBody - public BaseResponse queryYunBaseInfo(@RequestParam(value = "cardNo", required = true) String cardNo) { - return babyBookbuildingFacade.queryYunBaseInfo(cardNo); + public BaseResponse queryYunBaseInfo(@RequestParam(value = "cardNo", required = false) String cardNo,@RequestParam(value = "pid", required = false) String pid) { + return babyBookbuildingFacade.queryYunBaseInfo(cardNo,pid); } } \ No newline at end of file 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 3b96fbf..923cf36 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 @@ -1422,21 +1422,62 @@ public class BabyBookbuildingFacade { * @param cardNo * @return */ - public BaseResponse queryYunBaseInfo(String cardNo) { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - Patients obj = null; - if (!StringUtils.isEmpty(cardNo)); + public BaseResponse queryYunBaseInfo(String cardNo,String pid) { + + BabyBuildResult result = null; + + if (StringUtils.isNotEmpty(pid)) { - patientsQuery.setCardNo(cardNo); - List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setPid(pid); + //获取最近一次其他医院的建档记录 + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(models)) { - obj = patients.get(0); + BabyModel babyModel = models.get(0); + if (babyModel != null) + { + result = getBabyBuildResult(babyModel); + } } } + else + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + + if (!StringUtils.isEmpty(cardNo)); + { + patientsQuery.setCardNo(cardNo); + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + Patients patient = patients.get(0); + if (patients != null) + { + + result = new BabyBuildResult(); + result.setMommyName(patient.getUsername()); + result.setMommyCertificateTypeId(patient.getPcerteTypeId()); + result.setMommyCertificateNum(patient.getCardNo()); + result.setMommyBirthday(DateUtil.getyyyy_MM_dd(patient.getBirth())); + + result.setMommyProfessionTypeId(patient.getProvinceId()); + result.setMommyPhone(patient.getPhone()); + result.setFatherName(patient.getHusbandName()); + result.setFatherPhone(patient.getHusbandPhone()); + result.setFatherBirthday(DateUtil.getyyyy_MM_dd(patient.getHusbandBirth())); + result.setFatherLevelId(patient.getHlevelTypeId()); + + result.setFatherProfessionTypeId(patient.getHprofessionTypeId()); + } + } + } + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(obj); + objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; -- 1.8.3.1