jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 686f62f9acce89bf92833a866b7ad3e55aba2e14

Authored by liquanyu
1 parent 3d0c7bd322
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产筛修改

Showing 11 changed files with 143 additions and 4 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ 686f62f
... ... @@ -187,6 +187,7 @@
187 187  
188 188 public AntExRecordModel convert(AntenatalExaminationModel antEx) {
189 189 AntExRecordModel antExRecordModel = new AntExRecordModel();
  190 + antExRecordModel.setSieveType(antEx.getSieveType());
190 191 antExRecordModel.setOperaterUserId(antEx.getOperaterUserId());
191 192 antExRecordModel.setZyzlState(antEx.getZyzlState());
192 193 antExRecordModel.setZyzlContent(antEx.getZyzlContent());
platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java View file @ 686f62f
... ... @@ -93,6 +93,46 @@
93 93 }
94 94 }
95 95  
  96 +
  97 + public enum SieveAppTypeEnums {
  98 + A("无创DNA免费", "1"), B("唐氏筛查免费", "2"),
  99 + C("无创DNA收费", "3"), D("无创plus收费", "4"), E("唐氏筛查收费", "5"), F("无", "6");
  100 +
  101 + private String id;
  102 + private String name;
  103 +
  104 + public String getId() {
  105 + return id;
  106 + }
  107 +
  108 + public void setId(String id) {
  109 + this.id = id;
  110 + }
  111 +
  112 + public String getName() {
  113 + return name;
  114 + }
  115 +
  116 + public void setName(String name) {
  117 + this.name = name;
  118 + }
  119 +
  120 + SieveAppTypeEnums(String name, String id) {
  121 + this.name = name;
  122 + this.id = id;
  123 + }
  124 +
  125 + public static String getNameById(String id) {
  126 + for (SieveAppTypeEnums enums : values()) {
  127 + if (id != null && id.equals(enums.getId())) {
  128 + return enums.getName();
  129 + }
  130 + }
  131 + return null;
  132 + }
  133 + }
  134 +
  135 +
96 136 public enum CostTypeEnums {
97 137 MF("1", "免费"), ZI("2", "自费");
98 138  
platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java View file @ 686f62f
... ... @@ -119,6 +119,27 @@
119 119 //操作人id
120 120 private String operaterUserId;
121 121  
  122 +
  123 +
  124 + /**
  125 + * 产筛类型 sieveType
  126 + *1、无创DNA免费
  127 + 2、唐氏筛查免费
  128 + 3、无创DNA免费
  129 + 4、无创plus收费
  130 + 5、唐氏筛查收费
  131 + 6、无
  132 + */
  133 + private String sieveType;
  134 +
  135 + public String getSieveType() {
  136 + return sieveType;
  137 + }
  138 +
  139 + public void setSieveType(String sieveType) {
  140 + this.sieveType = sieveType;
  141 + }
  142 +
122 143 public String getOperaterUserId() {
123 144 return operaterUserId;
124 145 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 686f62f
... ... @@ -378,6 +378,25 @@
378 378 //孕妇NT
379 379 private String wcNt;
380 380  
  381 + /**
  382 + * 产筛类型 sieveType
  383 + *1、无创DNA免费
  384 + 2、唐氏筛查免费
  385 + 3、无创DNA免费
  386 + 4、无创plus收费
  387 + 5、唐氏筛查收费
  388 + 6、无
  389 + */
  390 + private String sieveType;
  391 +
  392 + public String getSieveType() {
  393 + return sieveType;
  394 + }
  395 +
  396 + public void setSieveType(String sieveType) {
  397 + this.sieveType = sieveType;
  398 + }
  399 +
381 400 public String getWcNt() {
382 401 return wcNt;
383 402 }
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ 686f62f
... ... @@ -85,6 +85,16 @@
85 85 //操作人id
86 86 private String operaterUserId;
87 87  
  88 + private String sieveType;
  89 +
  90 + public String getSieveType() {
  91 + return sieveType;
  92 + }
  93 +
  94 + public void setSieveType(String sieveType) {
  95 + this.sieveType = sieveType;
  96 + }
  97 +
88 98 public String getOperaterUserId() {
89 99 return operaterUserId;
90 100 }
... ... @@ -663,6 +673,9 @@
663 673 condition = condition.and("type", type, MongoOper.IS);
664 674 }
665 675  
  676 + if (null != sieveType) {
  677 + condition = condition.and("sieveType", sieveType, MongoOper.IS);
  678 + }
666 679 if (null != first) {
667 680 condition = condition.and("first", first, MongoOper.IS);
668 681 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ 686f62f
... ... @@ -523,9 +523,10 @@
523 523 @RequestParam(value = "hospitalId") String hospitalId,
524 524 @RequestParam(value = "nextTime", required = false) String nextTime,
525 525 @RequestParam(value = "doctorId", required = false) String doctorId,
  526 + @RequestParam(value = "sieveType", required = false) String sieveType,
526 527 @RequestParam(value = "edema", required = false) String edema
527 528 ) {
528   - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId);
  529 + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId,sieveType);
529 530 }
530 531  
531 532 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 686f62f
... ... @@ -133,6 +133,7 @@
133 133 private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) {
134 134  
135 135 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  136 + antExRecordQuery.setSieveType(antExManagerQueryRequest.getSieveType());
136 137  
137 138 antExRecordQuery.setDueStatus(antExManagerQueryRequest.getDeuStatus());
138 139 antExRecordQuery.setOperaterUserId(antExManagerQueryRequest.getOperaterUserId());
... ... @@ -1717,7 +1718,7 @@
1717 1718 * @return
1718 1719 */
1719 1720 public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid,
1720   - String hospitalId, String nextTime, String doctorId) {
  1721 + String hospitalId, String nextTime, String doctorId,String sieveType) {
1721 1722 WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel();
1722 1723 boolean falg = true;
1723 1724 if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) {
... ... @@ -1729,6 +1730,7 @@
1729 1730 DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) {
1730 1731 model.setGongGao(fuh);
1731 1732 model.setAbdominalCircumference(abdominalGirth);
  1733 + model.setSieveType(sieveType);
1732 1734 List<String> list = JsonUtil.jkstr2Obj(fhr, List.class);
1733 1735 if (CollectionUtils.isNotEmpty(list)) {
1734 1736 List<Map> placentaList = new ArrayList<>();
... ... @@ -1796,6 +1798,7 @@
1796 1798 AntExChuModel antExChuModel = antExChuModels.get(0);
1797 1799  
1798 1800 AntExAddRequest antExAddRequest = new AntExAddRequest();
  1801 + antExAddRequest.setSieveType(sieveType);
1799 1802 antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
1800 1803 antExAddRequest.setCheckDoctor(doctorId);
1801 1804 antExAddRequest.setEdema(edema);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 686f62f
... ... @@ -3737,7 +3737,7 @@
3737 3737 BabyModelQuery babyQuery = new BabyModelQuery();
3738 3738 babyQuery.setHospitalId(String.valueOf(hospitalId));
3739 3739 List <BabyModel> ms = getBabayListByCondition(request, false, babyQuery);
3740   - final int isShowPhone = request.getIsShowPhone();
  3740 + final Integer isShowPhone = request.getIsShowPhone();
3741 3741 if (CollectionUtils.isNotEmpty(ms)) {
3742 3742  
3743 3743 int batchSize = 100;
... ... @@ -3794,7 +3794,7 @@
3794 3794 data.put("babyName", StringUtils.emptyDeal(model.getName()));
3795 3795 data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
3796 3796 data.put("mommyName", StringUtils.emptyDeal(model.getMname()));
3797   - if (isShowPhone == 1)
  3797 + if (isShowPhone != null && isShowPhone == 1)
3798 3798 {
3799 3799 data.put("mommnyPhone", StringUtils.encryPhone(model.getMphone()));
3800 3800 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 686f62f
... ... @@ -363,6 +363,25 @@
363 363 //孕妇NT
364 364 private String wcNt;
365 365  
  366 + /**
  367 + * 产筛类型 sieveType
  368 + *1、无创DNA免费
  369 + 2、唐氏筛查免费
  370 + 3、无创DNA免费
  371 + 4、无创plus收费
  372 + 5、唐氏筛查收费
  373 + 6、无
  374 + */
  375 + private String sieveType;
  376 +
  377 + public String getSieveType() {
  378 + return sieveType;
  379 + }
  380 +
  381 + public void setSieveType(String sieveType) {
  382 + this.sieveType = sieveType;
  383 + }
  384 +
366 385 public String getWcNt() {
367 386 return wcNt;
368 387 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ 686f62f
... ... @@ -129,6 +129,16 @@
129 129 //操作人id
130 130 private String operaterUserId;
131 131  
  132 + private String sieveType;
  133 +
  134 + public String getSieveType() {
  135 + return sieveType;
  136 + }
  137 +
  138 + public void setSieveType(String sieveType) {
  139 + this.sieveType = sieveType;
  140 + }
  141 +
132 142 public String getOperaterUserId() {
133 143 return operaterUserId;
134 144 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java View file @ 686f62f
1 1 package com.lyms.platform.operate.web.result;
2 2  
  3 +import com.lyms.platform.common.enums.SieveEnums;
3 4 import com.lyms.platform.common.utils.DateUtil;
4 5 import com.lyms.platform.common.utils.StringUtils;
5 6 import com.lyms.platform.pojo.AntExRecordModel;
... ... @@ -80,6 +81,16 @@
80 81 //操作人id
81 82 private String operaterUser;
82 83  
  84 + private String sieveType;
  85 +
  86 + public String getSieveType() {
  87 + return sieveType;
  88 + }
  89 +
  90 + public void setSieveType(String sieveType) {
  91 + this.sieveType = sieveType;
  92 + }
  93 +
83 94 public String getPrevCheckTime() {
84 95 return prevCheckTime;
85 96 }
... ... @@ -222,6 +233,7 @@
222 233 setDueDate(DateUtil.getyyyy_MM_dd(e.getDueDate()));
223 234 setRiskScore(e.gethScore() + "");
224 235 setNextCheckTime(DateUtil.getyyyy_MM_dd(e.getNextCheckTime()));
  236 + setSieveType(SieveEnums.SieveAppTypeEnums.getNameById(e.getSieveType()));
225 237 return this;
226 238 }
227 239