jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0fa67c72be3d429ab2e07fb38651ce4d9fc29312

Authored by [wangbo]
1 parent 76bf2d9076
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改分娩方式

Showing 4 changed files with 29 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 0fa67c7
... ... @@ -280,6 +280,7 @@
280 280 //1-自动分娩
281 281 private Integer isAutoFm;
282 282  
  283 +
283 284 // 是否发放过优惠券
284 285 private Boolean isSendCoupon;
285 286  
... ... @@ -307,6 +308,16 @@
307 308 //流程是否终止
308 309 private String stop;
309 310  
  311 + //孕妇追访分娩方式冗余
  312 + private String fmMode;
  313 +
  314 + public String getFmMode() {
  315 + return fmMode;
  316 + }
  317 +
  318 + public void setFmMode(String fmMode) {
  319 + this.fmMode = fmMode;
  320 + }
310 321  
311 322 public Date getFollowupTime() {
312 323 return followupTime;
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 0fa67c7
... ... @@ -346,7 +346,17 @@
346 346 //是否分娩
347 347 private Boolean isDeliver;
348 348  
  349 + //分娩方式
  350 + private String fmMode;
349 351  
  352 + public String getFmMode() {
  353 + return fmMode;
  354 + }
  355 +
  356 + public void setFmMode(String fmMode) {
  357 + this.fmMode = fmMode;
  358 + }
  359 +
350 360 public Boolean isDeliver() {
351 361 return isDeliver;
352 362 }
... ... @@ -408,6 +418,9 @@
408 418 }
409 419 if (null != isDeliver) {
410 420 condition = condition.and("fmDate", isDeliver, MongoOper.EXISTS);
  421 + }
  422 + if (null != fmMode) {
  423 + condition = condition.and("fmMode", fmMode, MongoOper.IS);
411 424 }
412 425  
413 426 if (null != followupStatus) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 0fa67c7
... ... @@ -322,7 +322,9 @@
322 322 if (null != patients.get(0).getBuildType() && patients.get(0).getBuildType() == 2) {
323 323 patientsLocal.setBuildType(0);
324 324 }
325   - patientsLocal.setFmType(MapUtils.isEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
  325 + patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
  326 + /**孕妇追访分娩方式冗余**/
  327 + patientsLocal.setFmMode(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? (String) deliverAddRequest.getDeliveryMode().get("fmfs") : null);
326 328 try {
327 329 patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate));
328 330 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 0fa67c7
... ... @@ -315,7 +315,7 @@
315 315  
316 316 /**2019-07 需求搜索条件添加*/
317 317 if (downQueryRequest.getFmType() != null) {//分泌方式
318   - patientsQuery.setFmType(downQueryRequest.getFmType());
  318 + patientsQuery.setFmMode(downQueryRequest.getFmType());
319 319 isPatient = true;
320 320 }
321 321  
... ... @@ -420,7 +420,7 @@
420 420 downRecordQuery.setFoundEnd(downQueryRequest.getFoundDateEnd());
421 421 //预约追访时间
422 422 downRecordQuery.setAppointmentDateStart(DateUtil.parseYMD(downQueryRequest.getAppointmentDateStart()));
423   - downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd()) );
  423 + downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd()));
424 424 //追访状态
425 425 downRecordQuery.setFollowupStatus(downQueryRequest.getFollowupStatus());
426 426 //追访时间