From 24538974114278b81e92b92677de3ef0688b1afb Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 25 Jul 2020 17:00:31 +0800 Subject: [PATCH] update --- .../web/controller/BabyBuildController.java | 16 +++++++++-- .../operate/web/controller/ViewController.java | 18 ++++++++++--- .../operate/web/facade/BabyBookbuildingFacade.java | 17 ++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 31 ++++++++++++++++++++++ 4 files changed, 77 insertions(+), 5 deletions(-) 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 8560dc2..60f0560 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 @@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.controller; import com.aspose.words.*; -import com.google.inject.spi.Toolable; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -20,6 +19,7 @@ import com.lyms.platform.operate.web.result.QueryHospitalListResult; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.model.BabyDiagnoseQuery; import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.query.BabyModelQuery; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -75,7 +75,19 @@ public class BabyBuildController extends BaseController { } return babyBookbuildingFacade.addBabyBookbuilding(request, loginState.getId()); } - + + /** + * 根据儿童pid新增字段内容和修改字段内容 + * + * @param request + * @Author: 武涛涛 + * @Date: 2020/7/25 15:35 + */ + @RequestMapping(method = RequestMethod.POST, value = "/pidUpBabyBuild") + @ResponseBody + public BaseResponse pidUpBabyBuild(@RequestBody BabyModelQuery request) { + return babyBookbuildingFacade.pidUpBabyBuild(request); + } /** * 删除儿童建档 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 1a3d2b8..7b927cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -8,12 +8,11 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.MatdeliverFollowFacade; import com.lyms.platform.operate.web.facade.ViewFacade; -import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.query.BabyModelQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -24,8 +23,9 @@ import javax.servlet.http.HttpServletResponse; import java.awt.*; import java.io.IOException; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 所有查看页面接口 @@ -819,6 +819,18 @@ public class ViewController extends BaseController { public BaseObjectResponse getBabyBuildInfo(@PathVariable("id") String id) { return viewFacade.getBabyBuildInfo(id); } + /** + * 小程序通过pid获取儿童的建档信息 + * 社保卡，就诊卡，编码等 + * @param param 儿童建档pid + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/getBabyBuildPidInfo") + @ResponseBody + public BaseObjectResponse getBabyBuildPidInfo(@RequestBody BabyModelQuery param) { + return viewFacade.getBabyBuildPidInfo(param.getPid()); + } + /** * 儿童检查查看页面 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 4871067..f530e92 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 @@ -504,6 +504,23 @@ public class BabyBookbuildingFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse pidUpBabyBuild(BabyModelQuery request) { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setPid(request.getPid()); + List list = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(list)) { + BabyModel model = list.get(0); + model.setsINCard(request.getsINCard());//儿童社保卡 + model.setVcCardNo(request.getVcCardNo());//就诊卡号 + model.setModified(new Date()); + babyBookbuildingService.updateBabyBuild(model, model.getId()); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("修改失败"); + + } + private void updateCheckBirth(BabyModel babyModel) { BabyCheckModel checkModel = new BabyCheckModel(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 0c70a56..7184d93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5086,6 +5086,37 @@ public class ViewFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + /** + * 通过pid获取儿童信息 + * + * @param pid + * @Author: 武涛涛 + * @Date: 2020/7/25 15:11 + */ + public BaseObjectResponse getBabyBuildPidInfo(String pid) { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setPid(pid); + babyQuery.setYn(YnEnums.YES.getId()); + BabyPageResult result = new BabyPageResult(); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ + BabyModel babyModel = models.get(0); + if(babyModel !=null){ + result.setId(babyModel.getId()); + result.setPid(babyModel.getPid()); + result.setBabyName(babyModel.getName()); + result.setEncoded(babyModel.getEncoded()); + result.setsINCard(babyModel.getsINCard()); + result.setVcCardNo(babyModel.getVcCardNo()); + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } public BaseObjectResponse getBabyCheckPageInfo(String id) { BaseObjectResponse br = new BaseObjectResponse(); -- 1.8.3.1