From 686f62f9acce89bf92833a866b7ad3e55aba2e14 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 6 Sep 2021 18:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AntExRecordService.java | 1 + .../com/lyms/platform/common/enums/SieveEnums.java | 40 ++++++++++++++++++++++ .../com/lyms/platform/pojo/AntExRecordModel.java | 21 ++++++++++++ .../platform/pojo/AntenatalExaminationModel.java | 19 ++++++++++ .../com/lyms/platform/query/AntExRecordQuery.java | 13 +++++++ .../controller/AntenatalExaminationController.java | 3 +- .../operate/web/facade/AntExRecordFacade.java | 5 ++- .../operate/web/facade/BabyBookbuildingFacade.java | 4 +-- .../operate/web/request/AntExAddRequest.java | 19 ++++++++++ .../web/request/AntExManagerQueryRequest.java | 10 ++++++ .../operate/web/result/AntExManagerResult.java | 12 +++++++ 11 files changed, 143 insertions(+), 4 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index a02b191..b502f5e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -187,6 +187,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setSieveType(antEx.getSieveType()); antExRecordModel.setOperaterUserId(antEx.getOperaterUserId()); antExRecordModel.setZyzlState(antEx.getZyzlState()); antExRecordModel.setZyzlContent(antEx.getZyzlContent()); diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java index 3a7cc12..4596e54 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java @@ -93,6 +93,46 @@ public enum SieveEnums { } } + + public enum SieveAppTypeEnums { + A("无创DNA免费", "1"), B("唐氏筛查免费", "2"), + C("无创DNA收费", "3"), D("无创plus收费", "4"), E("唐氏筛查收费", "5"), F("无", "6"); + + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + SieveAppTypeEnums(String name, String id) { + this.name = name; + this.id = id; + } + + public static String getNameById(String id) { + for (SieveAppTypeEnums enums : values()) { + if (id != null && id.equals(enums.getId())) { + return enums.getName(); + } + } + return null; + } + } + + public enum CostTypeEnums { MF("1", "免费"), ZI("2", "自费"); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index 030b998..0947d72 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -119,6 +119,27 @@ public class AntExRecordModel extends BaseModel { //操作人id private String operaterUserId; + + + /** + * 产筛类型 sieveType + *1、无创DNA免费 + 2、唐氏筛查免费 + 3、无创DNA免费 + 4、无创plus收费 + 5、唐氏筛查收费 + 6、无 + */ + private String sieveType; + + public String getSieveType() { + return sieveType; + } + + public void setSieveType(String sieveType) { + this.sieveType = sieveType; + } + public String getOperaterUserId() { return operaterUserId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 223ab49..c7f669f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -378,6 +378,25 @@ public class AntenatalExaminationModel extends BaseModel { //孕妇NT private String wcNt; + /** + * 产筛类型 sieveType + *1、无创DNA免费 + 2、唐氏筛查免费 + 3、无创DNA免费 + 4、无创plus收费 + 5、唐氏筛查收费 + 6、无 + */ + private String sieveType; + + public String getSieveType() { + return sieveType; + } + + public void setSieveType(String sieveType) { + this.sieveType = sieveType; + } + public String getWcNt() { return wcNt; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 96000ba..be9c107 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -85,6 +85,16 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery //操作人id private String operaterUserId; + private String sieveType; + + public String getSieveType() { + return sieveType; + } + + public void setSieveType(String sieveType) { + this.sieveType = sieveType; + } + public String getOperaterUserId() { return operaterUserId; } @@ -663,6 +673,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("type", type, MongoOper.IS); } + if (null != sieveType) { + condition = condition.and("sieveType", sieveType, MongoOper.IS); + } if (null != first) { condition = condition.and("first", first, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 648d342..9832c83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -523,9 +523,10 @@ public class AntenatalExaminationController extends BaseController { @RequestParam(value = "hospitalId") String hospitalId, @RequestParam(value = "nextTime", required = false) String nextTime, @RequestParam(value = "doctorId", required = false) String doctorId, + @RequestParam(value = "sieveType", required = false) String sieveType, @RequestParam(value = "edema", required = false) String edema ) { - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId); + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId,sieveType); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 54a16a9..34bc7dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -133,6 +133,7 @@ public class AntExRecordFacade { private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setSieveType(antExManagerQueryRequest.getSieveType()); antExRecordQuery.setDueStatus(antExManagerQueryRequest.getDeuStatus()); antExRecordQuery.setOperaterUserId(antExManagerQueryRequest.getOperaterUserId()); @@ -1717,7 +1718,7 @@ public class AntExRecordFacade { * @return */ public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, - String hospitalId, String nextTime, String doctorId) { + String hospitalId, String nextTime, String doctorId,String sieveType) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { @@ -1729,6 +1730,7 @@ public class AntExRecordFacade { DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { model.setGongGao(fuh); model.setAbdominalCircumference(abdominalGirth); + model.setSieveType(sieveType); List list = JsonUtil.jkstr2Obj(fhr, List.class); if (CollectionUtils.isNotEmpty(list)) { List placentaList = new ArrayList<>(); @@ -1796,6 +1798,7 @@ public class AntExRecordFacade { AntExChuModel antExChuModel = antExChuModels.get(0); AntExAddRequest antExAddRequest = new AntExAddRequest(); + antExAddRequest.setSieveType(sieveType); antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); antExAddRequest.setCheckDoctor(doctorId); antExAddRequest.setEdema(edema); 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 10a0f6e..1d8ebfa 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 @@ -3737,7 +3737,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setHospitalId(String.valueOf(hospitalId)); List ms = getBabayListByCondition(request, false, babyQuery); - final int isShowPhone = request.getIsShowPhone(); + final Integer isShowPhone = request.getIsShowPhone(); if (CollectionUtils.isNotEmpty(ms)) { int batchSize = 100; @@ -3794,7 +3794,7 @@ public class BabyBookbuildingFacade { data.put("babyName", StringUtils.emptyDeal(model.getName())); data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); data.put("mommyName", StringUtils.emptyDeal(model.getMname())); - if (isShowPhone == 1) + if (isShowPhone != null && isShowPhone == 1) { data.put("mommnyPhone", StringUtils.encryPhone(model.getMphone())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 960482a..5c88385 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -363,6 +363,25 @@ public class AntExAddRequest implements IBasicRequestConvert