From ef264afa33567e917ae4e0966bf4771047dce3f4 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 14 Sep 2020 11:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AntExRecordService.java | 14 ++++ .../java/com/lyms/platform/pojo/AntExChuModel.java | 67 +++++++++++++++++++ .../com/lyms/platform/pojo/AntExRecordModel.java | 66 +++++++++++++++++++ .../platform/pojo/AntenatalExaminationModel.java | 67 +++++++++++++++++++ .../com/lyms/platform/query/AntExRecordQuery.java | 43 ++++++++++++ .../operate/web/facade/AntExRecordFacade.java | 5 ++ .../platform/operate/web/facade/ViewFacade.java | 32 ++++++++- .../operate/web/request/AntExAddRequest.java | 74 +++++++++++++++++++++ .../web/request/AntExManagerQueryRequest.java | 31 +++++++++ .../operate/web/request/AntExcAddRequest.java | 77 ++++++++++++++++++++++ .../web/result/AntenatalExaminationResult.java | 75 +++++++++++++++++++++ .../operate/web/result/AntexChuResult.java | 75 +++++++++++++++++++++ 12 files changed, 625 insertions(+), 1 deletion(-) 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 c430322..dca8d92 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 @@ -188,6 +188,13 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setZyzlState(antEx.getZyzlState()); + antExRecordModel.setZyzlContent(antEx.getZyzlContent()); + antExRecordModel.setZywzzlState(antEx.getZywzzlState()); + antExRecordModel.setZywzzlContent(antEx.getZywzzlContent()); + antExRecordModel.setZyatzlState(antEx.getZyatzlState()); + antExRecordModel.setZyatzlContent(antEx.getZyatzlContent()); + antExRecordModel.setTreatOpinion(antEx.getTreatmentOpinion()); antExRecordModel.setScreenResult(antEx.getScreenResult()); antExRecordModel.setParentId(antEx.getParentId()); @@ -269,6 +276,13 @@ public class AntExRecordService { antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime()); antExRecordModel.setFirst(antExChuModel.getFirst()); + antExRecordModel.setZyzlState(antExChuModel.getZyzlState()); + antExRecordModel.setZyzlContent(antExChuModel.getZyzlContent()); + antExRecordModel.setZywzzlState(antExChuModel.getZywzzlState()); + antExRecordModel.setZywzzlContent(antExChuModel.getZywzzlContent()); + antExRecordModel.setZyatzlState(antExChuModel.getZyatzlState()); + antExRecordModel.setZyatzlContent(antExChuModel.getZyatzlContent()); + //高危信息 List li = null; try { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 3a63441..6c6bf2f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -18,6 +18,25 @@ public class AntExChuModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid(); + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ + private String bgValue; private String genRemark; // 一般检查备注 @@ -1413,6 +1432,54 @@ public class AntExChuModel extends BaseModel { this.parentId = parentId; } + 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 getZyatzlState() { + return zyatzlState; + } + + public void setZyatzlState(String zyatzlState) { + this.zyatzlState = zyatzlState; + } + + public String getZyatzlContent() { + return zyatzlContent; + } + + public void setZyatzlContent(String zyatzlContent) { + this.zyatzlContent = zyatzlContent; + } + public String getPastHistory() { return pastHistory; } 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 bcb2482..535ed8e 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 @@ -16,6 +16,24 @@ import java.util.List; public class AntExRecordModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntExRecordModel.getCid(); + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ private String id; //原始表的id @@ -94,6 +112,54 @@ public class AntExRecordModel extends BaseModel { //处理意见 private String treatOpinion; + 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 getZyatzlState() { + return zyatzlState; + } + + public void setZyatzlState(String zyatzlState) { + this.zyatzlState = zyatzlState; + } + + public String getZyatzlContent() { + return zyatzlContent; + } + + public void setZyatzlContent(String zyatzlContent) { + this.zyatzlContent = zyatzlContent; + } + public String getTreatOpinion() { return treatOpinion; } 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 be7506d..61f9686 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 @@ -16,6 +16,25 @@ import java.util.Map; @Document(collection = "lyms_antex") public class AntenatalExaminationModel extends BaseModel { + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ + private String genRemark; // 一般检查备注 //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 @@ -416,6 +435,54 @@ public class AntenatalExaminationModel extends BaseModel { this.ndbSelect = ndbSelect; } + 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 getZyatzlState() { + return zyatzlState; + } + + public void setZyatzlState(String zyatzlState) { + this.zyatzlState = zyatzlState; + } + + public String getZyatzlContent() { + return zyatzlContent; + } + + public void setZyatzlContent(String zyatzlContent) { + this.zyatzlContent = zyatzlContent; + } + public String getNdbSelectOtherVal() { return ndbSelectOtherVal; } 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 389817a..23995b3 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 @@ -16,6 +16,14 @@ import java.util.List; * Created by Administrator on 2016/6/21 0021. */ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery { + + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //中医外治治疗 + private String zywzzlState; + //逐月安胎中医日常调理 + private String zyatzlState; + private String parentId; private String id; private List ids; @@ -106,6 +114,30 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery this.treatOpinion = treatOpinion; } + 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 getZyatzlState() { + return zyatzlState; + } + + public void setZyatzlState(String zyatzlState) { + this.zyatzlState = zyatzlState; + } + public List getIds() { return ids; } @@ -567,6 +599,17 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("barCode", barCode, MongoOper.IS); } + if (org.apache.commons.lang.StringUtils.isNotBlank(zyzlState) && ("yes".equals(zyzlState) || "no".equals(zyzlState)) ) { + condition = condition.and("zyzlState", zyzlState, MongoOper.IS); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(zywzzlState) && ("yes".equals(zywzzlState) || "no".equals(zywzzlState)) ) { + condition = condition.and("zywzzlState", zywzzlState, MongoOper.IS); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(zyatzlState) && ("yes".equals(zyatzlState) || "no".equals(zyatzlState)) ) { + condition = condition.and("zyatzlState", zyatzlState, MongoOper.IS); + } + + if (null != ids && ids.size() > 0) { condition = condition.and("id", ids, MongoOper.IN); } 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 e9030c9..fb3182c 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 @@ -120,6 +120,11 @@ public class AntExRecordFacade { private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + + antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState()); + antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState()); + antExRecordQuery.setZyatzlState(antExManagerQueryRequest.getZyatzlState()); + antExRecordQuery.setNeed(isPage); antExRecordQuery.setPage(antExManagerQueryRequest.getPage()); antExRecordQuery.setLimit(antExManagerQueryRequest.getLimit()); 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 85bc616..7254d97 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 @@ -1582,6 +1582,22 @@ public class ViewFacade { } Map map = new HashMap<>(); + + /** + * start + * 遵化市妇幼新增字段 + * @param id + * @Author: 武涛涛 + * @Date: 2020/9/14 9:24 + */ + map.put("zyzlState", data.getZyzlState()); + map.put("zyzlContent", data.getZyzlContent()); + map.put("zywzzlState", data.getZywzzlState()); + map.put("zywzzlContent", data.getZywzzlContent()); + map.put("zyatzlState", data.getZyatzlState()); + map.put("zyatzlContent", data.getZyatzlContent()); + + /*end*/ /***新增字段***/ map.put("ttita", data.getTtita()); map.put("vcCardNo", patients.getVcCardNo()); @@ -2816,7 +2832,21 @@ public class ViewFacade { } Map map = new HashMap<>(); - + /** + * start + * 遵化市妇幼新增字段 + * @param id + * @Author: 武涛涛 + * @Date: 2020/9/14 9:24 + */ + map.put("zyzlState", data.getZyzlState()); + map.put("zyzlContent", data.getZyzlContent()); + map.put("zywzzlState", data.getZywzzlState()); + map.put("zywzzlContent", data.getZywzzlContent()); + map.put("zyatzlState", data.getZyatzlState()); + map.put("zyatzlContent", data.getZyatzlContent()); + + /*end*/ /***新增字段***/ map.put("vcCardNo", patients.getVcCardNo()); map.put("ttita", data.getTtita()); 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 18f7b5f..a8fc87f 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 @@ -18,6 +18,25 @@ import java.util.Map; @Form public class AntExAddRequest implements IBasicRequestConvert { + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ + private String genRemark; // 一般检查备注 @@ -720,6 +739,54 @@ public class AntExAddRequest implements IBasicRequestConvert { + + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ + private String bgValue; private String genRemark; // 一般检查备注 @@ -795,6 +815,54 @@ public class AntExcAddRequest implements IBasicRequestConvert { return ftita; } + 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 getZyatzlState() { + return zyatzlState; + } + + public void setZyatzlState(String zyatzlState) { + this.zyatzlState = zyatzlState; + } + + public String getZyatzlContent() { + return zyatzlContent; + } + + public void setZyatzlContent(String zyatzlContent) { + this.zyatzlContent = zyatzlContent; + } + public void setFtita(String ftita) { this.ftita = ftita; } @@ -1981,6 +2049,15 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + + antExChuModel.setZyzlState(zyzlState); + antExChuModel.setZyzlContent(zyzlContent); + antExChuModel.setZywzzlState(zywzzlState); + antExChuModel.setZywzzlContent(zywzzlContent); + antExChuModel.setZyatzlState(zyatzlState); + antExChuModel.setZyatzlContent(zyatzlContent); + + //次要诊断 if (null != secondaryDiagnosisId) { antExChuModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 1a0b529..1c63cb9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -19,6 +19,25 @@ import java.util.Map; */ public class AntenatalExaminationResult implements IBasicResultConvert { + /** + * start + * 遵化需求新增字段 + * @param null + * @Author: 武涛涛 + * @Date: 2020/9/14 9:04 + */ + //中药治疗 yes no，空或者no都是no + private String zyzlState; + //输入框 + private String zyzlContent; + //中医外治治疗 + private String zywzzlState; + private String zywzzlContent; + //逐月安胎中医日常调理 + private String zyatzlState; + private String zyatzlContent; + /*end*/ + private String genRemark; // 一般检查备注 //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 @@ -128,6 +147,54 @@ public class AntenatalExaminationResult implements IBasicResultConvert antExcAddOthers; /* //心率 @@ -1857,6 +1924,14 @@ public class AntexChuResult { public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { + + setZyzlState(antExChuModel.getZyzlState()); + setZyzlContent(antExChuModel.getZyzlContent()); + setZywzzlState(antExChuModel.getZywzzlState()); + setZywzzlContent(antExChuModel.getZywzzlContent()); + setZyatzlState(antExChuModel.getZyatzlState()); + setZyatzlContent(antExChuModel.getZyatzlContent()); + setResultSupple(antExChuModel.getResultSupple()); setTtita(antExChuModel.getTtita()); setTotalThy(antExChuModel.getTotalThy()); -- 1.8.3.1