Commit 6ac8c9974b4edda2445cf5301377e858353b0783
1 parent
1a591a54c5
Exists in
master
and in
6 other branches
儿保月龄检查数据同步到小程序
Showing 3 changed files with 6 additions and 3 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/QbTypeEnums.java
View file @
6ac8c99
| ... | ... | @@ -14,7 +14,9 @@ |
| 14 | 14 | */ |
| 15 | 15 | public enum QbTypeEnums { |
| 16 | 16 | |
| 17 | - WXYC(1,"未见异常"),TL(2,"脱落"),WTL(3,"未脱落"),YC(4,"异常"); | |
| 17 | + // WXYC(1,"未见异常"),TL(2,"脱落"),WTL(3,"未脱落"),YC(4,"异常"); | |
| 18 | + //新版 | |
| 19 | + WXYC(1,"未脱落"),TL(2,"脱落"),WTL(3,"脐部有渗出"),OTHER(4,"其他"),WJYC(5,"未见异常"),YC(6,"异常"); | |
| 18 | 20 | |
| 19 | 21 | private QbTypeEnums(int id, String name) { |
| 20 | 22 | this.id = id; |
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
View file @
6ac8c99
| ... | ... | @@ -237,14 +237,15 @@ |
| 237 | 237 | |
| 238 | 238 | if (babyCheckModel.getNavel() != null && babyCheckModel.getNavel().size() > 0) { |
| 239 | 239 | Map<String, String> map = babyCheckModel.getNavel(); |
| 240 | - if ("4".equals(map.get("select").toString())) { | |
| 241 | - babyPaedia.setUmbilical(map.get("other")); | |
| 240 | + if ("4".equals(map.get("select").toString())||"6".equals(map.get("select").toString())) { | |
| 241 | + babyPaedia.setUmbilical(map.get("qtText")); | |
| 242 | 242 | } else { |
| 243 | 243 | String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); |
| 244 | 244 | babyPaedia.setUmbilical(value); |
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | + babyPaedia.setNavel(JsonUtil.obj2JsonString(babyCheckModel.getNavel())); | |
| 248 | 249 | babyPaedia.setOtherText(babyCheckModel.getBabyCheckOther()); |
| 249 | 250 | babyPaedia.setCreated(babyCheckModel.getCreated()); |
| 250 | 251 | babyPaedia.setModified(babyCheckModel.getModified()); |
platform-job-index/src/main/webapp/WEB-INF/lib/mainData.jar
View file @
6ac8c99