From 46c8b7a97d7b6312a064423a2bc29a300deec607 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 23 Mar 2020 10:12:02 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/PreEugenicsBaseModel.java | 13 +++++++++++++ .../web/controller/PreEugenicsBaseController.java | 15 +++++++++++++++ .../com/lyms/platform/operate/web/facade/BoneFacade.java | 4 +--- .../operate/web/facade/ResidentsArchiveFacade.java | 1 + .../com/lyms/platform/operate/web/facade/ViewFacade.java | 4 ++-- .../operate/web/request/AntExManagerQueryRequest.java | 2 +- .../operate/web/result/ResidentsArchiveResult.java | 10 ++++++++++ .../operate/web/service/IPreEugenicsService.java | 2 ++ .../operate/web/service/impl/PreEugebicsServiceImpl.java | 16 ++++++++++++++++ 9 files changed, 61 insertions(+), 6 deletions(-) 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 a2b7443..1695422 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 @@ -365,6 +365,19 @@ public class PreEugenicsBaseModel extends BaseModel { */ private Map resultAdvice; + + //0 或者空 未上传国家网 1上传国家网 + private Integer sendCountry; + + public Integer getSendCountry() { + return sendCountry; + } + + public void setSendCountry(Integer sendCountry) { + this.sendCountry = sendCountry; + } + + public String getId() { return id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index ef02ea7..bc58c5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -162,4 +162,19 @@ public class PreEugenicsBaseController extends BaseController { public BaseResponse setDefectiveChildCheckItem(@PathVariable("id")String id){ return iPreEugenicsService.setPreEugenicsCheckItem(id); } + + + + /** + * 标记已经发送国家网 + * + * @param id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/setSendContry/{id}") + @ResponseBody + @TokenRequired + public BaseResponse setSendContry(@PathVariable("id")String id) { + return iPreEugenicsService.setSendContry(id); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index 25f7a5e..b739344 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -231,10 +231,9 @@ public class BoneFacade { else { BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId()); - data.put("city", FunvCommonUtil.getBaseicConfigByid(babyModel.getCityId(), basicConfigService)); - data.put("area", FunvCommonUtil.getBaseicConfigByid(babyModel.getAreaId(), basicConfigService)); data.put("userName",babyModel.getName()); data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); + data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex())); data.put("position",model.getPosition()); data.put("sos",model.getSos()); data.put("tvalue",model.getTvalue()); @@ -245,7 +244,6 @@ public class BoneFacade { data.put("adultPercent",model.getAdultPercent()); data.put("agePercent",model.getAgePercent()); data.put("slAge",model.getAge()); - data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex())); data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 18d0b4b..e296663 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -622,6 +622,7 @@ public class ResidentsArchiveFacade { result.setAreaId(model.getAreaId()); result.setStreetId(model.getStreetId()); result.setAddress(model.getAddress()); + result.setChildExtAddrs(model.getChildExtAddrs()); result.setProvinceRegisterId(model.getProvinceRegisterId()); result.setCityRegisterId(model.getCityRegisterId()); 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 2ea23b3..2f7436c 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 @@ -4991,8 +4991,8 @@ public class ViewFacade { result.setPhone(model.getPhone()); result.setWorkUnit(model.getWorkUnit()); //居住地 - String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), - model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); + String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), + model.getAreaId(), model.getStreetId(),model.getChildExtAddrs(), model.getAddress(), basicConfigService); //户籍地址 String addressRegister = CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index 2ce2024..c3ae955 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -86,7 +86,7 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { //是否有处理意见 0否 1是 private Integer isOpinion; - //自动诊断试剂 + //自动诊断时间 private String autoTime; // 0 未诊断 1已诊断 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java index 6347c34..913bfb5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.result; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -53,6 +54,7 @@ public class ResidentsArchiveResult { private String areaId; private String streetId; private String address; + private List childExtAddrs; //户籍地址 private String provinceRegisterId; private String cityRegisterId; @@ -163,6 +165,14 @@ public class ResidentsArchiveResult { // 是否军嫂 private Integer military; + public List getChildExtAddrs() { + return childExtAddrs; + } + + public void setChildExtAddrs(List childExtAddrs) { + this.childExtAddrs = childExtAddrs; + } + public Integer getMilitary() { return military; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java index c8edc36..8b17f99 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -13,4 +13,6 @@ public interface IPreEugenicsService extends IFormReportService