From 36abcf74b5508518f699bc0fbd680f91903d54a8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 29 Sep 2022 14:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/SmnModel.java | 66 ++++++++++++++++- .../operate/web/controller/SmnController.java | 71 ++++++++++++++++++ .../platform/operate/web/facade/SmnFacade.java | 86 ++++++++++++++++++++++ .../operate/web/request/SmnQueryRequest.java | 28 +++++++ 4 files changed, 250 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java index 705d59a..b6ab28d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java @@ -67,7 +67,71 @@ public class SmnModel { private Date checkDate;//检查日期 private Date created;//创建记录时间 - private Integer sfStatus;//随访状态 0 终止状态 1 丈夫阳性状态 2 产前诊断异常 3 分娩异常 4新生儿异常 + private Map cqzd;//产前诊断 + private Map ycxsc;//遗传学筛查 + private Map mtys;//母体因素 + private Integer rsResult;//妊娠结局 2 继续妊娠 3 失联 4终止妊娠 + private Map babyInfo;//新生儿信息 + + private Date sfDate;//随访日期 + private Date ysfDate;//应随访日期 + private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + + public Date getYsfDate() { + return ysfDate; + } + + public void setYsfDate(Date ysfDate) { + this.ysfDate = ysfDate; + } + + public Map getCqzd() { + return cqzd; + } + + public void setCqzd(Map cqzd) { + this.cqzd = cqzd; + } + + public Map getYcxsc() { + return ycxsc; + } + + public void setYcxsc(Map ycxsc) { + this.ycxsc = ycxsc; + } + + public Map getMtys() { + return mtys; + } + + public void setMtys(Map mtys) { + this.mtys = mtys; + } + + public Integer getRsResult() { + return rsResult; + } + + public void setRsResult(Integer rsResult) { + this.rsResult = rsResult; + } + + public Map getBabyInfo() { + return babyInfo; + } + + public void setBabyInfo(Map babyInfo) { + this.babyInfo = babyInfo; + } + + public Date getSfDate() { + return sfDate; + } + + public void setSfDate(Date sfDate) { + this.sfDate = sfDate; + } private List husbandSmns; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java index 6d62333..ffb1f41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java @@ -35,6 +35,12 @@ public class SmnController extends BaseController { return smnFacade.addSmn(param, getUserId(request)); } + /** + * 添加丈夫smn申请 + * @param param + * @param request + * @return + */ @RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnApply") @ResponseBody @TokenRequired @@ -43,6 +49,12 @@ public class SmnController extends BaseController { } + /** + * 编辑丈夫smn申请 + * @param param + * @param request + * @return + */ @RequestMapping(method = RequestMethod.POST, value = "/editHusbandSmn") @ResponseBody @TokenRequired @@ -50,6 +62,12 @@ public class SmnController extends BaseController { return smnFacade.editHusbandSmn(param, getUserId(request)); } + /** + * 添加修改丈夫筛查结果记录 + * @param param + * @param request + * @return + */ @RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnResult") @ResponseBody @TokenRequired @@ -57,7 +75,60 @@ public class SmnController extends BaseController { return smnFacade.addHusbandSmnResult(param, getUserId(request)); } + /** + * 增加产前随访记录 + * @param param + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addCqsfRecord") + @ResponseBody + @TokenRequired + public BaseResponse addCqsfRecord(@RequestBody SmnRequest param, HttpServletRequest request) { + return smnFacade.addCqsfRecord(param, getUserId(request)); + } + + + /** + * 编辑产前随访记录 + * @param param + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/editCqsfRecord") + @ResponseBody + @TokenRequired + public BaseResponse editCqsfRecord(@RequestBody SmnRequest param, HttpServletRequest request) { + return smnFacade.editCqsfRecord(param, getUserId(request)); + } + + + /** + * 增加新生儿随访记录 + * @param param + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addBabyInfoRecord") + @ResponseBody + @TokenRequired + public BaseResponse addBabyInfoRecord(@RequestBody SmnRequest param, HttpServletRequest request) { + return smnFacade.addBabyInfoRecord(param, getUserId(request)); + } + + /** + * 编辑新生儿随访记录 + * @param param + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/editBabyInfoRecord") + @ResponseBody + @TokenRequired + public BaseResponse editBabyInfoRecord(@RequestBody SmnRequest param, HttpServletRequest request) { + return smnFacade.editBabyInfoRecord(param, getUserId(request)); + } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java index 6500265..20b8aeb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java @@ -251,6 +251,28 @@ public class SmnFacade { } + Integer sfStatus = param.getSfStatus(); + if (result != null) { + query.addCriteria(Criteria.where("sfStatus").is(sfStatus)); + } + String sfDate = param.getSfDate(); + if (StringUtils.isNotEmpty(sfDate)) { + String[] arrs = sfDate.split(" - "); + Date start = DateUtil.parseYMD(arrs[0]); + Date end = DateUtil.parseYMD(arrs[1]); + end = DateUtil.getDayLastSecond(end); + query.addCriteria(Criteria.where("sfDate").gte(start).lte(end)); + } + + String ysfDate = param.getYsfDate(); + if (StringUtils.isNotEmpty(ysfDate)) { + String[] arrs = ysfDate.split(" - "); + Date start = DateUtil.parseYMD(arrs[0]); + Date end = DateUtil.parseYMD(arrs[1]); + end = DateUtil.getDayLastSecond(end); + query.addCriteria(Criteria.where("ysfDate").gte(start).lte(end)); + } + Integer startWeek = param.getStartWeek(); @@ -426,10 +448,19 @@ public class SmnFacade { husbandSmn.setSmn8Result(smn8Result); if ((husbandSmn.getSmn7() > -0.45 && param.getSmn7() <=0.45) || (param.getSmn8() > -0.45 && param.getSmn8() <=0.45)) { + if (smnModel.getYsfDate() == null) + { + //随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + smnModel.setSfStatus(1); + smnModel.setYsfDate(new Date()); + } + husbandSmn.setResult(2); } else { + //随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + smnModel.setSfStatus(0); husbandSmn.setResult(1); } } @@ -466,4 +497,59 @@ public class SmnFacade { mongoTemplate.updateFirst(query, update, SmnModel.class); return new BaseResponse(); } +// private Map cqzd;//产前诊断 +// private Map ycxsc;//遗传学筛查 +// private Map mtys;//母体因素 +// private Integer rsResult;//妊娠结局 2 继续妊娠 3 失联 4终止妊娠 5 分娩 +// private Map babyInfo;//新生儿信息 +// +// private Date sfDate;//随访日期 +// private Date ysfDate;//应随访日期 +// private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + public BaseResponse addCqsfRecord(SmnRequest param, Integer userId) { + Query query = Query.query(Criteria.where("id").is(param.getId())); + SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); + BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel)); + param.setSfDate(new Date()); + Query query1 = Query.query(Criteria.where("id").is(smnModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(param)); + mongoTemplate.updateFirst(query1, update, SmnModel.class); + return new BaseResponse(); + } + + public BaseResponse editCqsfRecord(SmnRequest param, Integer userId) { + Query query = Query.query(Criteria.where("id").is(param.getId())); + SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); + BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel)); + smnModel.setSfStatus(6); + Query query1 = Query.query(Criteria.where("id").is(smnModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(param)); + mongoTemplate.updateFirst(query1, update, SmnModel.class); + return new BaseResponse(); + } + + public BaseResponse addBabyInfoRecord(SmnRequest param, Integer userId) { + Query query = Query.query(Criteria.where("id").is(param.getId())); + SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); + BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel)); + param.setSfDate(new Date()); + Query query1 = Query.query(Criteria.where("id").is(smnModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(param)); + mongoTemplate.updateFirst(query1, update, SmnModel.class); + return new BaseResponse(); + } + + public BaseResponse editBabyInfoRecord(SmnRequest param, Integer userId) { + Query query = Query.query(Criteria.where("id").is(param.getId())); + SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); + BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel)); + Query query1 = Query.query(Criteria.where("id").is(smnModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(param)); + mongoTemplate.updateFirst(query1, update, SmnModel.class); + return new BaseResponse(); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java index 60be278..39cca95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java @@ -32,6 +32,34 @@ public class SmnQueryRequest extends BaseQuery { private Integer husbandResult; //1 阴性 2 阳性 private String husbandCheckDate;//检查日期 + private String sfDate;//随访日期 + private String ysfDate;//应随访日期 + private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成 + + public String getSfDate() { + return sfDate; + } + + public void setSfDate(String sfDate) { + this.sfDate = sfDate; + } + + public String getYsfDate() { + return ysfDate; + } + + public void setYsfDate(String ysfDate) { + this.ysfDate = ysfDate; + } + + public Integer getSfStatus() { + return sfStatus; + } + + public void setSfStatus(Integer sfStatus) { + this.sfStatus = sfStatus; + } + public String getHusbandSendDate() { return husbandSendDate; } -- 1.8.3.1