Commit 1d28fbca3e8396a8000c0d6954e282e1965694b8
1 parent
aadd7259cd
Exists in
master
and in
1 other branch
update
Showing 2 changed files with 18 additions and 4 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
View file @
1d28fbc
| ... | ... | @@ -98,7 +98,7 @@ |
| 98 | 98 | private String duescfs; |
| 99 | 99 | //性别 男 女 |
| 100 | 100 | private String sex; |
| 101 | - //35种疾病筛查 | |
| 101 | + //35种疾病筛查 0 否 1 是 | |
| 102 | 102 | private String diseaseSieve; |
| 103 | 103 | //母乳次数：（是否充分哺乳）0 否 1 是 |
| 104 | 104 | private String buruSum; |
| ... | ... | @@ -467,7 +467,11 @@ |
| 467 | 467 | if(StringUtils.isNotEmpty(sex)){ |
| 468 | 468 | map.put("sex",SexEnum.getTextById(Integer.parseInt(sex))); |
| 469 | 469 | } |
| 470 | - map.put("diseaseSieve",diseaseSieve); | |
| 470 | + if("0".equals(diseaseSieve)){ | |
| 471 | + map.put("diseaseSieve","否"); | |
| 472 | + }else if("1".equals(diseaseSieve)){ | |
| 473 | + map.put("diseaseSieve","是"); | |
| 474 | + } | |
| 471 | 475 | if("0".equals(buruSum)){ |
| 472 | 476 | map.put("buruSum","否"); |
| 473 | 477 | }else if("1".equals(buruSum)){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
View file @
1d28fbc
| ... | ... | @@ -683,8 +683,18 @@ |
| 683 | 683 | e.printStackTrace(); |
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | - //新筛四病 | |
| 687 | - babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem()); | |
| 686 | + if(StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem()) ){ | |
| 687 | + String testItem = babySieveAddQhdRequest.getTestItem(); | |
| 688 | + String substring1 = testItem.substring(testItem.length() - 1, testItem.length()); | |
| 689 | + if(",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")){ | |
| 690 | + String substring = babySieveAddQhdRequest.getTestItem().substring(0, babySieveAddQhdRequest.getTestItem().length() - 1); | |
| 691 | + babyModelQuery.setTestItem(testItem.substring(0, testItem.length()-1)); | |
| 692 | + }else { | |
| 693 | + //新筛四病 | |
| 694 | + babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem()); | |
| 695 | + } | |
| 696 | + } | |
| 697 | + | |
| 688 | 698 | //串联实验项目 MSMS 或空 |
| 689 | 699 | babyModelQuery.setMsms(babySieveAddQhdRequest.getMsms()); |
| 690 | 700 | //新筛血卡编号 |