Commit b7fe6520cefd32839db8ad4556c26e06a29a7b08
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
b7fe652
| ... | ... | @@ -69,7 +69,7 @@ |
| 69 | 69 | //产检日期 |
| 70 | 70 | private String checkDate; |
| 71 | 71 | //下次产检日期 |
| 72 | - private String nextCheckTime; | |
| 72 | + private Map nextCheckTime; | |
| 73 | 73 | |
| 74 | 74 | |
| 75 | 75 | |
| ... | ... | @@ -109,7 +109,7 @@ |
| 109 | 109 | examinationModel.setGuide(guide); |
| 110 | 110 | examinationModel.setCheckDoctor(checkDoctor); |
| 111 | 111 | examinationModel.setCheckDate(checkDate); |
| 112 | - examinationModel.setNextCheckTime(nextCheckTime); | |
| 112 | + examinationModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime)); | |
| 113 | 113 | |
| 114 | 114 | return examinationModel; |
| 115 | 115 | } |
| 116 | 116 | |
| ... | ... | @@ -226,11 +226,11 @@ |
| 226 | 226 | this.id = id; |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - public String getNextCheckTime() { | |
| 229 | + public Map getNextCheckTime() { | |
| 230 | 230 | return nextCheckTime; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - public void setNextCheckTime(String nextCheckTime) { | |
| 233 | + public void setNextCheckTime(Map nextCheckTime) { | |
| 234 | 234 | this.nextCheckTime = nextCheckTime; |
| 235 | 235 | } |
| 236 | 236 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
View file @
b7fe652
| ... | ... | @@ -68,13 +68,13 @@ |
| 68 | 68 | //产检日期 |
| 69 | 69 | private String checkDate; |
| 70 | 70 | //下次产检日期 |
| 71 | - private String nextCheckTime; | |
| 71 | + private Map nextCheckTime; | |
| 72 | 72 | |
| 73 | - public String getNextCheckTime() { | |
| 73 | + public Map getNextCheckTime() { | |
| 74 | 74 | return nextCheckTime; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public void setNextCheckTime(String nextCheckTime) { | |
| 77 | + public void setNextCheckTime(Map nextCheckTime) { | |
| 78 | 78 | this.nextCheckTime = nextCheckTime; |
| 79 | 79 | } |
| 80 | 80 | |
| ... | ... | @@ -82,7 +82,7 @@ |
| 82 | 82 | public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) { |
| 83 | 83 | setEdema(destModel.getEdema()); |
| 84 | 84 | setParentId(destModel.getParentId()); |
| 85 | - setNextCheckTime(destModel.getNextCheckTime()); | |
| 85 | + | |
| 86 | 86 | setUrineProtein(destModel.getUrineProtein()); |
| 87 | 87 | setTreatmentOpinion(destModel.getTreatmentOpinion()); |
| 88 | 88 | |
| ... | ... | @@ -93,6 +93,11 @@ |
| 93 | 93 | setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class)); |
| 94 | 94 | } catch (Exception e) { |
| 95 | 95 | } |
| 96 | + try { | |
| 97 | + setNextCheckTime(JsonUtil.str2Obj(destModel.getNextCheckTime(),Map.class)); | |
| 98 | + }catch (Exception e){ | |
| 99 | + } | |
| 100 | + | |
| 96 | 101 | setChiefComplaint(destModel.getChiefComplaint()); |
| 97 | 102 | setCheckDate(destModel.getCheckDate()); |
| 98 | 103 | setCheckDoctor(destModel.getCheckDoctor()); |