From fd5b603fa84aedde13867f991d90c2f73e33e8f7 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 11 Sep 2020 10:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B7=E6=80=A7=E5=A9=9A=E6=A3=80=E3=80=81?= =?UTF-8?q?=E5=A5=B3=E6=80=A7=E5=A9=9A=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/PremaritalCheckup.java | 69 ++++++++++++++++++++++ .../platform/query/PremaritalCheckupQuery.java | 39 ++++++++++++ .../web/facade/PremaritalCheckupFacade.java | 55 +++++++++++++++-- .../web/request/PremaritalCheckupAddRequest.java | 59 +++++++++++++++++- .../web/request/PremaritalCheckupQueryRequest.java | 31 ++++++++++ .../web/result/PremaritalCheckupPageResult.java | 59 ++++++++++++++++++ .../web/result/PremaritalCheckupResult.java | 59 ++++++++++++++++++ 7 files changed, 366 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index b0b607c..e693325 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -91,6 +91,27 @@ public class PremaritalCheckup extends BaseModel { //外祖父母(1:是 2:不是) private Integer maternalGrandparents; + /** + * start 遵化新增字段 + * + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/10 16:18 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //膏药 + private String gyState; + private String gyContent; + + /*end*/ + + /****************** 体格检查 ********************/ //精神状态(1: 异常 2: 正常) private Integer jingShenZhuangTai; @@ -821,6 +842,54 @@ public class PremaritalCheckup extends BaseModel { return childrenNum; } + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZyzlContent() { + return zyzlContent; + } + + public void setZyzlContent(String zyzlContent) { + this.zyzlContent = zyzlContent; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getZywzzlContent() { + return zywzzlContent; + } + + public void setZywzzlContent(String zywzzlContent) { + this.zywzzlContent = zywzzlContent; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + + public String getGyContent() { + return gyContent; + } + + public void setGyContent(String gyContent) { + this.gyContent = gyContent; + } + public void setChildrenNum(Integer childrenNum) { this.childrenNum = childrenNum; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index 0e0ca25..a2b0b20 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -56,6 +56,12 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private Date modifiedStart; private Date modifiedEnd; + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //中医外治治疗 + private String zywzzlState; + //膏药 + private String gyState; @Override public MongoQuery convertToQuery() { @@ -66,6 +72,15 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (StringUtils.isNotBlank(parentId)) { condition = condition.and("parentId", parentId, MongoOper.IS); } + if (StringUtils.isNotBlank(zyzlState) && ("yes".equals(zyzlState) || "no".equals(zyzlState)) ) { + condition = condition.and("zyzlState", zyzlState, MongoOper.IS); + } + if (StringUtils.isNotBlank(zywzzlState) && ("yes".equals(zywzzlState) || "no".equals(zywzzlState)) ) { + condition = condition.and("zywzzlState", zywzzlState, MongoOper.IS); + } + if (StringUtils.isNotBlank(gyState) &&( "yes".equals(gyState) || "no".equals(gyState)) ) { + condition = condition.and("gyState", gyState, MongoOper.IS); + } if (StringUtils.isNotBlank(hospitalId)) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } @@ -154,6 +169,30 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ this.hospitalIds = hospitalIds; } + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + public List getParentIds() { return parentIds; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 45af7a8..6ffd131 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -277,7 +277,21 @@ public class PremaritalCheckupFacade { checkupResult.setParents(result.getParents()); checkupResult.setGrandparent(result.getGrandparent()); checkupResult.setMaternalGrandparents(result.getMaternalGrandparents()); - + /** + * start 遵化新增字段 + * + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/10 16:18 + */ + checkupResult.setZyzlState(result.getZyzlState()); + checkupResult.setZyzlContent(result.getZyzlContent()); + checkupResult.setZywzzlState(result.getZywzzlState()); + checkupResult.setZywzzlContent(result.getZywzzlContent()); + checkupResult.setGyState(result.getGyState()); + checkupResult.setGyContent(result.getGyContent()); + + /*end*/ checkupResult.setJingShenZhuangTai(result.getJingShenZhuangTai()); checkupResult.setJingShenZhuangTaiDetails(result.getJingShenZhuangTaiDetails()); checkupResult.setYuYanNengLi(result.getYuYanNengLi()); @@ -464,7 +478,9 @@ public class PremaritalCheckupFacade { List parentIds = null; //用姓名和联系方式查询到的居民建档ID - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo()) || StringUtils.isNotEmpty(request.getQueryNo())) { + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo()) + || StringUtils.isNotEmpty(request.getQueryNo()) || StringUtils.isNotEmpty(request.getZyzlState()) + || StringUtils.isNotEmpty(request.getZywzzlState()) || StringUtils.isNotEmpty(request.getGyState())) { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setQueryNo(request.getQueryNo()); archiveQuery.setYn(YnEnums.YES.getId()); @@ -472,6 +488,7 @@ public class PremaritalCheckupFacade { archiveQuery.setCertificateNum(request.getCardNo()); archiveQuery.setPhone(request.getPhone()); archiveQuery.setHospitalId(request.getHospitalId()); + List modelList = residentsArchiveService.queryResident(archiveQuery); parentIds = new ArrayList<>(); if (CollectionUtils.isNotEmpty(modelList)) { @@ -487,6 +504,9 @@ public class PremaritalCheckupFacade { query.setLimit(request.getLimit()); query.setNeed("y"); query.setYn(YnEnums.YES.getId()); + query.setZyzlState(request.getZyzlState()); + query.setZywzzlState(request.getZywzzlState()); + query.setGyState(request.getGyState()); String hospital = autoMatchFacade.getHospitalId(userId); if (StringUtils.isNotEmpty(hospital)) { @@ -514,7 +534,7 @@ public class PremaritalCheckupFacade { if (parentIds != null) { query.setParentIds(parentIds); } - + System.out.println(query.convertToQuery().convertToMongoQuery()); List data = premaritalCheckupService.queryPremaritalCheckup(query); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data)) { @@ -693,6 +713,20 @@ public class PremaritalCheckupFacade { checkup.setMaternalGrandparents(addRequest.getMaternalGrandparents()); checkup.setChildrenNum(addRequest.getChildrenNum()); + /** + * start 遵化新增字段 + * + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/10 16:18 + */ + checkup.setZyzlState(addRequest.getZyzlState()); + checkup.setZyzlContent(addRequest.getZyzlContent()); + checkup.setZywzzlState(addRequest.getZywzzlState()); + checkup.setZywzzlContent(addRequest.getZywzzlContent()); + checkup.setGyState(addRequest.getGyState()); + checkup.setGyContent(addRequest.getGyContent()); + /*end*/ /* 体格检查 */ checkup.setJingShenZhuangTai(addRequest.getJingShenZhuangTai()); @@ -1758,7 +1792,20 @@ public class PremaritalCheckupFacade { } checkupResult.setNextOfKin(nextOfKin); checkupResult.setChildrenNum(result.getChildrenNum() == null ? "" : result.getChildrenNum() + UnitConstants.REN); - + /** + * start 遵化新增字段 + * + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/10 16:18 + */ + checkupResult.setZyzlState(result.getZyzlState()); + checkupResult.setZyzlContent(result.getZyzlContent()); + checkupResult.setZywzzlState(result.getZywzzlState()); + checkupResult.setZywzzlContent(result.getZywzzlContent()); + checkupResult.setGyState(result.getGyState()); + checkupResult.setGyContent(result.getGyContent()); + /*end*/ String jingShenZhuangTai = ""; if (result.getJingShenZhuangTai() != null && result.getJingShenZhuangTai() == 1) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 83d7dc0..cd830e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -99,7 +99,16 @@ public class PremaritalCheckupAddRequest { private String sjzOneSign; //医生签字 private String oneDoctorSign; - + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //膏药 + private String gyState; + private String gyContent; /****************** 体格检查 ********************/ //精神状态(1: 异常 2: 正常) private Integer jingShenZhuangTai; @@ -954,6 +963,54 @@ public class PremaritalCheckupAddRequest { this.yanSe = yanSe; } + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZyzlContent() { + return zyzlContent; + } + + public void setZyzlContent(String zyzlContent) { + this.zyzlContent = zyzlContent; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getZywzzlContent() { + return zywzzlContent; + } + + public void setZywzzlContent(String zywzzlContent) { + this.zywzzlContent = zywzzlContent; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + + public String getGyContent() { + return gyContent; + } + + public void setGyContent(String gyContent) { + this.gyContent = gyContent; + } + public String getBuWei() { return buWei; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java index 474d5dc..67901b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java @@ -31,6 +31,37 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ //查询号 private String queryNo; + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //中医外治治疗 + private String zywzzlState; + //膏药 + private String gyState; + + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + public String getQueryNo() { return queryNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java index 02ab576..7229e48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java @@ -101,6 +101,17 @@ public class PremaritalCheckupPageResult { //既往婚育史(1: 有 2: 无) private String maritalHistory; + + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //膏药 + private String gyState; + private String gyContent; /****************** 体格检查 ********************/ //精神状态(1: 异常 2: 正常) @@ -1330,6 +1341,54 @@ public class PremaritalCheckupPageResult { return yiGanKangYuan; } + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZyzlContent() { + return zyzlContent; + } + + public void setZyzlContent(String zyzlContent) { + this.zyzlContent = zyzlContent; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getZywzzlContent() { + return zywzzlContent; + } + + public void setZywzzlContent(String zywzzlContent) { + this.zywzzlContent = zywzzlContent; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + + public String getGyContent() { + return gyContent; + } + + public void setGyContent(String gyContent) { + this.gyContent = gyContent; + } + public void setYiGanKangYuan(String yiGanKangYuan) { this.yiGanKangYuan = yiGanKangYuan; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 7b3afae..b432b90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -76,6 +76,17 @@ public class PremaritalCheckupResult { //外祖父母(1:是 2:不是) private Integer maternalGrandparents; + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //膏药 + private String gyState; + private String gyContent; + /****************** 体格检查 ********************/ //精神状态(1: 异常 2: 正常) private Integer jingShenZhuangTai; @@ -1721,6 +1732,54 @@ public class PremaritalCheckupResult { this.jianChaJieGuo = jianChaJieGuo; } + public String getZyzlState() { + return zyzlState; + } + + public void setZyzlState(String zyzlState) { + this.zyzlState = zyzlState; + } + + public String getZyzlContent() { + return zyzlContent; + } + + public void setZyzlContent(String zyzlContent) { + this.zyzlContent = zyzlContent; + } + + public String getZywzzlState() { + return zywzzlState; + } + + public void setZywzzlState(String zywzzlState) { + this.zywzzlState = zywzzlState; + } + + public String getZywzzlContent() { + return zywzzlContent; + } + + public void setZywzzlContent(String zywzzlContent) { + this.zywzzlContent = zywzzlContent; + } + + public String getGyState() { + return gyState; + } + + public void setGyState(String gyState) { + this.gyState = gyState; + } + + public String getGyContent() { + return gyContent; + } + + public void setGyContent(String gyContent) { + this.gyContent = gyContent; + } + public String getJianChaDetails() { return jianChaDetails; } -- 1.8.3.1