From 47dc46d496b6fcb9c591764db6c158fd6ff17b1d Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 5 Nov 2020 15:47:58 +0800 Subject: [PATCH] update --- .../common/enums/PostpartumFollowMakeEnums.java | 2 +- .../operate/web/facade/AntExRecordFacade.java | 17 ++++++++++++ .../operate/web/facade/MatDeliverFacade.java | 3 +++ .../operate/web/facade/MatdeliverFollowFacade.java | 3 +++ .../platform/operate/web/facade/SieveFacade.java | 11 +++++--- .../web/request/AntExManagerQueryRequest.java | 30 ++++++++++++++++++++++ .../web/request/MatDeliverFollowAddRequest.java | 2 +- .../web/result/MatdeliverFollowListResult.java | 13 +++++++++- 8 files changed, 75 insertions(+), 6 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java index fcf78d7..9e52ee4 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumFollowMakeEnums.java @@ -66,7 +66,7 @@ public class PostpartumFollowMakeEnums { * 访视类型 */ public enum TypeEnum { - SMFS(1, "上门访视"), DHFS(2, "电话访视"),WJTS(3, "问卷访视"); + SMFS(1, "上门访视"), DHFS(2, "电话访视"),WJTS(3, "问卷访视"),WXFS(4, "微信访视"); private int id; private String name; 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 5394604..1b48018 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 @@ -184,6 +184,23 @@ public class AntExRecordFacade { antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1])); } } + /*滦平 start 20201105 */ + //初诊时间 是产检时间+type=2 + if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCzTime())){ + String nextDateStr = antExManagerQueryRequest.getCzTime(); + String[] dates = nextDateStr.split(" - "); + + antExRecordQuery.setCheckTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1])); + } + antExRecordQuery.setType(2); + } + //产检医生 + if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ + antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); + } + /*滦平 end */ //预约产检日期 if (StringUtils.isNotEmpty(antExManagerQueryRequest.getNextTime())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 058c9ba..151e970 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2314,6 +2314,9 @@ public class MatDeliverFacade { if (contactReason != null) { contactReasonStr = PostpartumFollowMakeEnums.ContactReasonEnum.getTitle(contactReason); } + //访视医生 + matdeliverFollowListResult.setVisitDoctor(CommonsHelper.getUserName(model.getVisitDoctor(), usersService)); + ; } matdeliverFollowListResult.setCauseFailure(contactReasonStr); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index ffae812..db7c9ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -576,9 +576,11 @@ public class MatdeliverFollowFacade { // cnames.put("visitAffirm", "产妇确认"); cnames.put("makeType", "访视类型"); cnames.put("visitResult", "访视结果"); + cnames.put("visitDoctor", "访视医生"); cnames.put("nextVisitDate", "下次随访"); List> results = new ArrayList<>(); + results.add(new HashMap ()); if (object != null) { Map m = (Map) object; Object res = m.get("matdeliverFollowListResults"); @@ -604,6 +606,7 @@ public class MatdeliverFollowFacade { // result.put("visitAffirm", mf.getVisitAffirm()); result.put("makeType", mf.getMakeType()); result.put("visitResult", mf.getVisitResult()); + result.put("visitDoctor", mf.getVisitDoctor());//20201105 滦平新增访视医生，都会加上 result.put("nextVisitDate", mf.getNextVisitDate()); results.add(result); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index bddab37..7b022cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -3077,9 +3077,14 @@ public class SieveFacade { data.put("NT", sive.getnT()); //2020-09-30 医生反馈两边单位保持mm } data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院) - data.put("T21", sive.getT21());//既往T21 - data.put("T18", sive.getT18());//既往T18 - data.put("NTD", sive.getnTD());//既往NTD +// data.put("T21", sive.getT21());//既往T21 +// data.put("T18", sive.getT18());//既往T18 +// data.put("NTD", sive.getnTD());//既往NTD + + data.put("T21","");//既往T21 + data.put("T18","");//既往T18 + data.put("NTD","");//既往NTD + data.put("ARMethod", sive.getaRMethod());//辅助生殖方法 data.put("ExtractionDate", sive.getExtractionDate());//辅助生殖之提取日期 data.put("TransferDate", sive.getTransferDate());//辅助生殖之移植日期 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 68972cf..8149a16 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 @@ -5,6 +5,8 @@ import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.lang.math.NumberUtils; +import java.util.Date; + /** * * 产检管理查询 @@ -13,6 +15,14 @@ import org.apache.commons.lang.math.NumberUtils; */ @Form public class AntExManagerQueryRequest extends BasePageQueryRequest { + /*滦平 start 20201105 */ + //产检医生 + private String checkDoctor; + //产检日期(初诊时间) + private String czTime; + + /*滦平 end */ + //中药治疗 yes no，空或者no都是no private String zyzlState; //中医外治治疗 @@ -131,6 +141,26 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { return zyzlState; } + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public String getCzTime() { + return czTime; + } + + public void setCzTime(String czTime) { + this.czTime = czTime; + } + + public void setCurrent(boolean current) { + isCurrent = current; + } + public void setZyzlState(String zyzlState) { this.zyzlState = zyzlState; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java index 72832d9..b05c1e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java @@ -42,7 +42,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert