jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2ab19058245cc0eb52422355f28f9c7b0c41bd28

Authored by liquanyu
1 parent fd93e14aad
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩

Showing 3 changed files with 15 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 2ab1905
... ... @@ -429,7 +429,7 @@
429 429 header.put("cc","产次");
430 430 header.put("ts","胎数");
431 431 header.put("dueType", "分娩方式");
432   - header.put("dueWeek", "分娩孕周");
  432 + header.put("fmWeek", "分娩孕周");
433 433 header.put("jx", "外观是否正常");
434 434 header.put("deliverDoctor", "接生医生");
435 435 header.put("birthDays", "出生天数");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 2ab1905
... ... @@ -2469,7 +2469,6 @@
2469 2469 babyModelQuery.setBuildType(2);
2470 2470 babyModelQuery.setOrder("birth");
2471 2471  
2472   - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery());
2473 2472 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
2474 2473 if (CollectionUtils.isEmpty(babyModelList)) {
2475 2474 newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
... ... @@ -2520,6 +2519,7 @@
2520 2519 }
2521 2520 BeanUtils.copy(babyModel, newBabyManagerQueryModel);
2522 2521  
  2522 +
2523 2523 String apgarScorePf1 = "";
2524 2524 String apgarScorePf5 = "";
2525 2525 String apgarScorePf10 = "";
... ... @@ -2556,6 +2556,9 @@
2556 2556 newBabyManagerQueryModel.setBabyWeight(StringUtils.isEmpty(babyModel.getBabyWeight()) ? "-" : String.valueOf(Double.valueOf(babyModel.getBabyWeight()) * 1000));
2557 2557  
2558 2558 newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber());
  2559 +
  2560 +
  2561 + newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek());
2559 2562 for (SexEnum sexEnum : SexEnum.values()) {
2560 2563 if (sexEnum.getId().equals(babyModel.getSex())) {
2561 2564 newBabyManagerQueryModel.setSex(sexEnum.getText());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 2ab1905
... ... @@ -143,6 +143,16 @@
143 143  
144 144 private Integer tireNumber;
145 145  
  146 + private String fmWeek;
  147 +
  148 + public String getFmWeek() {
  149 + return fmWeek;
  150 + }
  151 +
  152 + public void setFmWeek(String fmWeek) {
  153 + this.fmWeek = fmWeek;
  154 + }
  155 +
146 156 public Integer getTireNumber() {
147 157 return tireNumber;
148 158 }