From d55571b09cd7db2d3abe6adf6e7bf75c7c3a8b79 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 27 Oct 2021 16:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=A6=8A=E5=A8=A0=E7=BB=93?= =?UTF-8?q?=E5=B1=80=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/LhBabyGravidityEndingTabModel.java | 5 +- .../lyms/platform/pojo/PreEugenicsBaseModel.java | 33 ++++++++ .../controller/LhBabyBirthDefectTabController.java | 9 +++ .../LhBabyGravidityEndingTabController.java | 8 ++ .../web/facade/LhBabyBirthDefectTabFacade.java | 89 ++++++++++++++++++---- .../web/facade/LhBabyGravidityEndingTabFacade.java | 74 ++++++++++++++---- 6 files changed, 187 insertions(+), 31 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java index 586759f..c561bf6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java @@ -100,11 +100,10 @@ public class LhBabyGravidityEndingTabModel { //婴儿42天存活情况(LhSurvivalCaseEnum) private String survivalCase; - //随访者签名 - private String visitSign; - //填表日期 private Date writeDate; + //随访者签名 + private String visitSign; public String getBuildId() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index ac17988..12cbe77 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -417,6 +417,39 @@ public class PreEugenicsBaseModel extends BaseModel { */ private String doctorSign; + /** + * 2021-10-27隆化需求 + */ + //隆化-出生缺陷儿登记表 + private Map lhBabyBirthDefectTab; + //隆化-妊娠结局记录表 + private Map lhBabyGravidityEndingTab; + //隆化-早孕随访记录表 + private Map lhBabyPregnancyFollowTab; + + public Map getLhBabyBirthDefectTab() { + return lhBabyBirthDefectTab; + } + + public void setLhBabyBirthDefectTab(Map lhBabyBirthDefectTab) { + this.lhBabyBirthDefectTab = lhBabyBirthDefectTab; + } + + public Map getLhBabyGravidityEndingTab() { + return lhBabyGravidityEndingTab; + } + + public void setLhBabyGravidityEndingTab(Map lhBabyGravidityEndingTab) { + this.lhBabyGravidityEndingTab = lhBabyGravidityEndingTab; + } + + public Map getLhBabyPregnancyFollowTab() { + return lhBabyPregnancyFollowTab; + } + + public void setLhBabyPregnancyFollowTab(Map lhBabyPregnancyFollowTab) { + this.lhBabyPregnancyFollowTab = lhBabyPregnancyFollowTab; + } public static long getSerialVersionUID() { return serialVersionUID; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java index 58b2a08..7b556dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java @@ -9,6 +9,7 @@ import com.lyms.platform.operate.web.facade.LhBabyBirthDefectTabFacade; import com.lyms.platform.pojo.LhBabyBirthDefectTabModel; import com.lyms.platform.pojo.QhdDischargedDiagnose; import com.lyms.platform.query.LhBabyBirthDefectTabQuery; +import com.lyms.platform.query.LhBabyGravidityEndingTabQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -42,6 +43,14 @@ public class LhBabyBirthDefectTabController extends BaseController { return lhBabyBirthDefectTabFacade.queryLhBabyBirthDefectTab(lhBabyBirthDefectTabQuery); } + //查询-隆化-出生缺陷儿登记表-多胎列表 + @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyBirthDefectTabList") + @ResponseBody + @TokenRequired + public BaseResponse queryLhBabyBirthDefectTabList(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery, HttpServletRequest request) { + + return lhBabyBirthDefectTabFacade.queryLhBabyBirthDefectTabList(lhBabyBirthDefectTabQuery); + } //增加/修改-隆化-出生缺陷儿登记表 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateLhBabyBirthDefectTab") diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java index 6973219..dd0f334 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java @@ -43,6 +43,14 @@ public class LhBabyGravidityEndingTabController extends BaseController { return lhBabyGravidityEndingTabFacade.queryLhBabyGravidityEndingTab(lhBabyGravidityEndingTabQuery); } + //查询-隆化-妊娠结局记录表-多胎列表 + @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTabList") + @ResponseBody + @TokenRequired + public BaseResponse queryLhBabyGravidityEndingTabList(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery, HttpServletRequest request) { + + return lhBabyGravidityEndingTabFacade.queryLhBabyGravidityEndingTabList(lhBabyGravidityEndingTabQuery); + } //增加/修改-隆化-妊娠结局记录表 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateLhBabyGravidityEndingTab") diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java index de2c0f5..41f738a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java @@ -6,21 +6,39 @@ import com.lyms.platform.common.dao.BaseMongoDAOImpl; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; import com.lyms.platform.common.enums.OptActionEnums; import com.lyms.platform.common.enums.YnEnums; 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.MongoConvertHelper; +import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult; +import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult; +import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.LhBabyBirthDefectTabModel; +import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel; +import com.lyms.platform.pojo.PreEugenicsBaseModel; import com.lyms.platform.pojo.QhdDischargedDiagnose; import com.lyms.platform.query.LhBabyBirthDefectTabQuery; +import com.lyms.platform.query.LhBabyGravidityEndingTabQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl { @@ -45,8 +63,8 @@ public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl modelList=find(query.convertToMongoQuery()); + //整理返回数据 + List resultList=new ArrayList<>(); + if(CollectionUtils.isNotEmpty(modelList)){ + LhBabyBirthDefectTabResult result=new LhBabyBirthDefectTabResult(); + for (LhBabyBirthDefectTabModel model : modelList) { + resultList.add(result.convertToResult(model, + basicConfigService, + usersService, + organizationService)); + } + } + br.setData(resultList); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; @@ -80,16 +126,31 @@ public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl map= new HashMap<>(); + map.put("id", lhBabyBirthDefectTabModel.getId()); + map.put("writeDate", DateUtil.getyyyy_MM_dd(lhBabyBirthDefectTabModel.getWriteDate())); + Query query = Query.query(Criteria.where("id").is(lhBabyBirthDefectTabModel.getBuildId())); + Update update = new Update(); + update.set("lhBabyBirthDefectTab", map); + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; @@ -103,13 +164,13 @@ public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl { @@ -40,8 +50,8 @@ public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl modelList=find(query.convertToMongoQuery()); + //整理返回数据 + List resultList=new ArrayList<>(); + if(CollectionUtils.isNotEmpty(modelList)){ + LhBabyGravidityEndingTabResult result=new LhBabyGravidityEndingTabResult(); + for (LhBabyGravidityEndingTabModel model : modelList) { + resultList.add(result.convertToResult(model,basicConfigService)); + } + } + br.setData(resultList); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; @@ -74,7 +109,7 @@ public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl map= new HashMap<>(); + map.put("id", lhBabyGravidityEndingTabModel.getId()); + map.put("writeDate", DateUtil.getyyyy_MM_dd(lhBabyGravidityEndingTabModel.getWriteDate())); + Query query = Query.query(Criteria.where("id").is(lhBabyGravidityEndingTabModel.getBuildId())); + Update update = new Update(); + update.set("lhBabyGravidityEndingTab", map); + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; @@ -97,13 +143,13 @@ public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl