Commit 8ab0880e5201081fb889aad21598c977b9d2e906
1 parent
b50d4a5ad4
Exists in
master
and in
6 other branches
威海分娩登记导出镇痛方式修改
Showing 4 changed files with 46 additions and 5 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
- platform-operate-api/src/main/resources/fm_record.xls
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
8ab0880
... | ... | @@ -384,16 +384,16 @@ |
384 | 384 | String aModel3 = ""; |
385 | 385 | String aModel4 = ""; |
386 | 386 | //镇痛方式 |
387 | - if("1".equals(queryModel.getAnalMode())){ | |
387 | + if("1".equals(queryModel.getZgnmz())){ | |
388 | 388 | aModel1 = "√"; |
389 | 389 | } |
390 | - else if("2".equals(queryModel.getAnalMode())){ | |
390 | + if("1".equals(queryModel.getDlfm())){ | |
391 | 391 | aModel2 = "√"; |
392 | 392 | } |
393 | - else if("3".equals(queryModel.getAnalMode())){ | |
393 | + if("1".equals(queryModel.getFmzty())){ | |
394 | 394 | aModel3 = "√"; |
395 | 395 | } |
396 | - else if("4".equals(queryModel.getAnalMode())){ | |
396 | + if("1".equals(queryModel.getZypbfm())){ | |
397 | 397 | aModel4 = "√"; |
398 | 398 | } |
399 | 399 | map.put("aModel1",aModel1); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
View file @
8ab0880
... | ... | @@ -419,6 +419,43 @@ |
419 | 419 | private String incision;//切开方式 |
420 | 420 | private Map<String,Object> myzd;//母婴阻断 |
421 | 421 | |
422 | + private String zgnmz;//椎管内麻醉(0:未选择;1:已选择) | |
423 | + private String dlfm;//导乐分娩(0:未选择;1:已选择) | |
424 | + private String fmzty;//分娩镇痛仪(0:未选择;1:已选择) | |
425 | + private String zypbfm;//专业陪伴分娩(0:未选择;1:已选择) | |
426 | + | |
427 | + public String getZgnmz() { | |
428 | + return zgnmz; | |
429 | + } | |
430 | + | |
431 | + public void setZgnmz(String zgnmz) { | |
432 | + this.zgnmz = zgnmz; | |
433 | + } | |
434 | + | |
435 | + public String getDlfm() { | |
436 | + return dlfm; | |
437 | + } | |
438 | + | |
439 | + public void setDlfm(String dlfm) { | |
440 | + this.dlfm = dlfm; | |
441 | + } | |
442 | + | |
443 | + public String getFmzty() { | |
444 | + return fmzty; | |
445 | + } | |
446 | + | |
447 | + public void setFmzty(String fmzty) { | |
448 | + this.fmzty = fmzty; | |
449 | + } | |
450 | + | |
451 | + public String getZypbfm() { | |
452 | + return zypbfm; | |
453 | + } | |
454 | + | |
455 | + public void setZypbfm(String zypbfm) { | |
456 | + this.zypbfm = zypbfm; | |
457 | + } | |
458 | + | |
422 | 459 | public Integer getDueCount() { |
423 | 460 | return dueCount; |
424 | 461 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
View file @
8ab0880
... | ... | @@ -493,7 +493,11 @@ |
493 | 493 | //威海新增导出字段 |
494 | 494 | childbirthManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity());//孕次 |
495 | 495 | childbirthManagerQueryModel.setDepartment(maternalDeliverModel.getDepartment());//科室 |
496 | - childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式 | |
496 | + //childbirthManagerQueryModel.setAnalMode(maternalDeliverModel.getAnalMode());//镇痛方式 | |
497 | + childbirthManagerQueryModel.setZgnmz(maternalDeliverModel.getZgnmz());//椎管内麻醉(0:未选择;1:已选择) | |
498 | + childbirthManagerQueryModel.setDlfm(maternalDeliverModel.getDlfm());//导乐分娩(0:未选择;1:已选择) | |
499 | + childbirthManagerQueryModel.setFmzty(maternalDeliverModel.getFmzty());//分娩镇痛仪(0:未选择;1:已选择) | |
500 | + childbirthManagerQueryModel.setZypbfm(maternalDeliverModel.getZypbfm());//专业陪伴分娩(0:未选择;1:已选择) | |
497 | 501 | childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次 |
498 | 502 | childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断 |
499 | 503 |
platform-operate-api/src/main/resources/fm_record.xls
View file @
8ab0880