jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5e23c6e5686fedb5e928c4d38cb18c83059b9277

Authored by dongqin
2 parents 35db018d35 b0336b6996
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java View file @ 5e23c6e
... ... @@ -203,7 +203,7 @@
203 203 private String eyePositionId;
204 204 private String eyePositionOther;
205 205 //医生判定判断阳性
206   - private String eyePosition2;
  206 + private String eyePositionId2;
207 207  
208 208 /**
209 209 * 双眼视觉
210 210  
... ... @@ -260,12 +260,12 @@
260 260 this.y2 = y2;
261 261 }
262 262  
263   - public String getEyePosition2() {
264   - return eyePosition2;
  263 + public String getEyePositionId2() {
  264 + return eyePositionId2;
265 265 }
266 266  
267   - public void setEyePosition2(String eyePosition2) {
268   - this.eyePosition2 = eyePosition2;
  267 + public void setEyePositionId2(String eyePositionId2) {
  268 + this.eyePositionId2 = eyePositionId2;
269 269 }
270 270  
271 271 public String getVision2() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 5e23c6e
... ... @@ -254,7 +254,7 @@
254 254 map.put("corneal", parseYinYang(babyEyeCheck.getCorneal(), babyEyeCheck.getCornealOther()));
255 255 map.put("lacrimalApparatus", parseYinYang(babyEyeCheck.getLacrimalApparatus(), babyEyeCheck.getLacrimalApparatusOther()));
256 256 //一下都是医生选定阳性
257   - map.put("eyePosition2", "yang".equals(babyEyeCheck.getEyePosition2()) ? "医生判定阳性" : "");
  257 + map.put("eyePosition2", "yang".equals(babyEyeCheck.getEyePositionId2()) ? "医生判定阳性" : "");
258 258 map.put("redLeft2", "yang".equals(babyEyeCheck.getRedLeft2()) ? "医生判定阳性" : "");
259 259 map.put("vision2", "yang".equals(babyEyeCheck.getVision2()) ? "医生判定阳性" : "");
260 260 map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : "");
... ... @@ -494,7 +494,7 @@
494 494 && !"yang".equals(babyEyeCheck.getExtEyelook())
495 495 && !"yang".equals(babyEyeCheck.getNystagmus())
496 496 && !"yang".equals(babyEyeCheck.getLacrimalApparatus())
497   - && !"yang".equals(babyEyeCheck.getEyePosition2())
  497 + && !"yang".equals(babyEyeCheck.getEyePositionId())
498 498 && !"yang".equals(babyEyeCheck.getRedLeft2())
499 499 && !"yang".equals(babyEyeCheck.getVision2())
500 500 && !"yang".equals(babyEyeCheck.getY2())