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 6c63e4c..56a1edd 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,8 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + + antExRecordModel.setTreatOpinion(antEx.getTreatmentOpinion()); antExRecordModel.setScreenResult(antEx.getScreenResult()); antExRecordModel.setParentId(antEx.getParentId()); antExRecordModel.setfId(antEx.getId()); @@ -253,6 +255,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntExChuModel antExChuModel) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setTreatOpinion(antExChuModel.getTreatOpinion()); antExRecordModel.setScreenResult(antExChuModel.getScreenResult()); antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor()); antExRecordModel.setHospitalId(antExChuModel.getHospitalId()); 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 c8582ad..bcb2482 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 @@ -91,6 +91,17 @@ public class AntExRecordModel extends BaseModel { private Integer first; // 1否 2 是,是否当前医院第一次初诊 德州需求 + //处理意见 + private String treatOpinion; + + public String getTreatOpinion() { + return treatOpinion; + } + + public void setTreatOpinion(String treatOpinion) { + this.treatOpinion = treatOpinion; + } + public List getIncrhRisk() { return incrhRisk; } 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 c8acc20..c9dfb11 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 @@ -65,6 +65,27 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private Integer type; private String neqId; + //处理意见 + private String treatOpinion; + + private boolean isOpinion; + + public boolean isOpinion() { + return isOpinion; + } + + public void setIsOpinion(boolean isOpinion) { + this.isOpinion = isOpinion; + } + + public String getTreatOpinion() { + return treatOpinion; + } + + public void setTreatOpinion(String treatOpinion) { + this.treatOpinion = treatOpinion; + } + public List getIds() { return ids; } @@ -497,6 +518,8 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("checkDoctor", null, MongoOper.NE); } + + if (StringUtils.isNotEmpty(levelId)) { condition = condition.and("hLevel", levelId, MongoOper.IN); } @@ -553,6 +576,23 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery Criteria c = null; + + if (isOpinion) + { + if (null != treatOpinion) { + condition = condition.and("treatOpinion", treatOpinion, MongoOper.NE); + } + else + { + condition = condition.and("treatOpinion", null, MongoOper.NE); + } + } + else + { + condition = condition.and("treatOpinion", false, MongoOper.EXISTS); + } + + if (null != buildTimeStart) { c = Criteria.where("buildTime").gte(buildTimeStart); } 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 d61b701..fbc909d 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 @@ -107,10 +107,27 @@ public class AntExRecordFacade { antExRecordQuery.setFirst(antExManagerQueryRequest.getFirst()); } - + if (antExManagerQueryRequest.getIsOpinion() != null) + { + //是否有处理意见 0否 1是 + if (antExManagerQueryRequest.getIsOpinion() == 0) + { + antExRecordQuery.setIsOpinion(false); + } + else if (antExManagerQueryRequest.getIsOpinion() == 1) + { + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getTreatOpinion())) + { + antExRecordQuery.setTreatOpinion(antExManagerQueryRequest.getTreatOpinion()); + } + else + { + antExRecordQuery.setIsOpinion(true); + } + } + } //产检日期 - Date currentDate = DateUtil.formatDate(new Date()); if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) { String nextDateStr = antExManagerQueryRequest.getcTime(); 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 19b5e3b..5a762c3 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 @@ -80,6 +80,28 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private Integer first; // 1否 2 是,是否当前医院第一次初诊 德州需求 + //处理意见 + private String treatOpinion; + + //是否有处理意见 0否 1是 + private Integer isOpinion; + + public String getTreatOpinion() { + return treatOpinion; + } + + public void setTreatOpinion(String treatOpinion) { + this.treatOpinion = treatOpinion; + } + + public Integer getIsOpinion() { + return isOpinion; + } + + public void setIsOpinion(Integer isOpinion) { + this.isOpinion = isOpinion; + } + public int getShowDetail() { return showDetail; }