From 020bd38013c1a6bdb78ec4a7b8454d5e4e1b502b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 7 Sep 2020 16:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=BF=BD=E8=AE=BF=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/MongoSyncService.java | 3 ++- .../web/controller/BabyBuildController.java | 15 +++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 30 ++++++++++++++++++++++ .../service/impl/BabyAfterVisitServiceImpl.java | 6 +++-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java index 2e23920..4bd58a5 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.pojo.UpdateMultiData; import com.lyms.platform.common.utils.*; import com.lyms.platform.pojo.*; import com.mongodb.Mongo; +import com.mongodb.WriteResult; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -108,7 +109,7 @@ public class MongoSyncService { } Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(obj)); Assert.notNull(update, "execute update method must not null."); - mongoTemplate.updateMulti(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), update, cla); + WriteResult result = mongoTemplate.upsert(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), update, cla); return true; } else if ("DELETE".equals(action)) { Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 77a08a5..1b4546f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -822,4 +822,19 @@ public class BabyBuildController extends BaseController { return babyBookbuildingFacade.getBabyDisease(id); } + + + + /** + * 小程序获儿童分娩档案信息 + * @param phone + * @return + */ + @RequestMapping(value = "/getBabyAppBuildInfo", method = RequestMethod.GET) + @ResponseBody + public BaseResponse getBabyAppBuildInfo(@RequestParam(required = true) String phone) { + + return babyBookbuildingFacade.getBabyAppBuildInfo(phone); + + } } \ 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 fd266b4..e0c22be 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 @@ -4980,4 +4980,34 @@ public class BabyBookbuildingFacade { } return diseases; } + + public BaseResponse getBabyAppBuildInfo(String phone) { + + BabyModelQuery babyModelQuery3 = new BabyModelQuery(); + babyModelQuery3.setDataStatus(true); + babyModelQuery3.setMphone(phone); + babyModelQuery3.setBuildType(2); + List babyModels = babyService.queryBabyWithQuery(babyModelQuery3); + List datas = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel model : babyModels) + { + Map data = new HashMap(); + data.put("id",model.getId()); + data.put("phone", model.getMphone()); + data.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); + data.put("babyName",model.getName()); + data.put("mommyName", model.getMname()); + data.put("mommyCardNo",model.getMcertNo()); + data.put("sex",model.getSex()); + data.put("vcCardNo",model.getVcCardNo()); + data.put("sINCard",model.getsINCard()); + datas.add(data); + } + } + + return new BaseObjectResponse() + .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 81d81d8..5d9df2f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -511,11 +511,13 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { { objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId()); + String address = ""; if (babyModel != null) { - objectMap.put("address", CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), - babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService)); + address = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), + babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); } + objectMap.put("address",address ); } // 预约时间 -- 1.8.3.1