diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 92cc0fc..a3d4506 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -280,6 +280,7 @@ public class Patients extends BaseModel { //1-自动分娩 private Integer isAutoFm; + // 是否发放过优惠券 private Boolean isSendCoupon; @@ -307,6 +308,16 @@ public class Patients extends BaseModel { //流程是否终止 private String stop; + //孕妇追访分娩方式冗余 + private String fmMode; + + public String getFmMode() { + return fmMode; + } + + public void setFmMode(String fmMode) { + this.fmMode = fmMode; + } public Date getFollowupTime() { return followupTime; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 8ce0169..bfe996f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -346,6 +346,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //是否分娩 private Boolean isDeliver; + //分娩方式 + private String fmMode; + + public String getFmMode() { + return fmMode; + } + + public void setFmMode(String fmMode) { + this.fmMode = fmMode; + } public Boolean isDeliver() { return isDeliver; @@ -409,6 +419,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != isDeliver) { condition = condition.and("fmDate", isDeliver, MongoOper.EXISTS); } + if (null != fmMode) { + condition = condition.and("fmMode", fmMode, MongoOper.IS); + } if (null != followupStatus) { if (0 == followupStatus) { 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 6a6abcf..0dd2892 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 @@ -322,7 +322,9 @@ public class MatDeliverFacade { if (null != patients.get(0).getBuildType() && patients.get(0).getBuildType() == 2) { patientsLocal.setBuildType(0); } - patientsLocal.setFmType(MapUtils.isEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); + patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); + /**孕妇追访分娩方式冗余**/ + patientsLocal.setFmMode(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? (String) deliverAddRequest.getDeliveryMode().get("fmfs") : null); try { patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 3176443..3400984 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -315,7 +315,7 @@ public class TrackDownFacade { /**2019-07 需求搜索条件添加*/ if (downQueryRequest.getFmType() != null) {//分泌方式 - patientsQuery.setFmType(downQueryRequest.getFmType()); + patientsQuery.setFmMode(downQueryRequest.getFmType()); isPatient = true; } @@ -420,7 +420,7 @@ public class TrackDownFacade { downRecordQuery.setFoundEnd(downQueryRequest.getFoundDateEnd()); //预约追访时间 downRecordQuery.setAppointmentDateStart(DateUtil.parseYMD(downQueryRequest.getAppointmentDateStart())); - downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd()) ); + downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd())); //追访状态 downRecordQuery.setFollowupStatus(downQueryRequest.getFollowupStatus()); //追访时间