liquanyu / regional-platform

Download as
Browse Code »

Commit 322fa140f135dc4168f9bebe90458b4f3d5ca454

Authored by liquanyu
1 parent 06f3b1c7f2
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 85 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java View file @ 322fa14
... ... @@ -308,6 +308,71 @@
308 308 //删除文件路径
309 309 private List<String> delFiles;
310 310  
  311 +
  312 + //④视力：增加3个选项：
  313 + // 标准对视远视力表、0 未选择 1选择
  314 + private Integer visionJudgment1;
  315 + //儿童对数视力表、0 未选择 1选择
  316 + private Integer visionJudgment2;
  317 + //欠合作。0 未选择 1选择
  318 + private Integer visionJudgment3;
  319 +
  320 + //三棱镜左
  321 + private String prismLeft;
  322 + //三棱镜右
  323 + private String prismRight;
  324 +
  325 + //合作 0合作 1签合作
  326 + private Integer cooperation;
  327 +
  328 + public Integer getVisionJudgment1() {
  329 + return visionJudgment1;
  330 + }
  331 +
  332 + public void setVisionJudgment1(Integer visionJudgment1) {
  333 + this.visionJudgment1 = visionJudgment1;
  334 + }
  335 +
  336 + public Integer getVisionJudgment3() {
  337 + return visionJudgment3;
  338 + }
  339 +
  340 + public void setVisionJudgment3(Integer visionJudgment3) {
  341 + this.visionJudgment3 = visionJudgment3;
  342 + }
  343 +
  344 + public Integer getVisionJudgment2() {
  345 + return visionJudgment2;
  346 + }
  347 +
  348 + public void setVisionJudgment2(Integer visionJudgment2) {
  349 + this.visionJudgment2 = visionJudgment2;
  350 + }
  351 +
  352 + public String getPrismLeft() {
  353 + return prismLeft;
  354 + }
  355 +
  356 + public void setPrismLeft(String prismLeft) {
  357 + this.prismLeft = prismLeft;
  358 + }
  359 +
  360 + public String getPrismRight() {
  361 + return prismRight;
  362 + }
  363 +
  364 + public void setPrismRight(String prismRight) {
  365 + this.prismRight = prismRight;
  366 + }
  367 +
  368 + public Integer getCooperation() {
  369 + return cooperation;
  370 + }
  371 +
  372 + public void setCooperation(Integer cooperation) {
  373 + this.cooperation = cooperation;
  374 + }
  375 +
311 376 public FilePathModel getFilePath() {
312 377 return filePath;
313 378 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 322fa14
... ... @@ -96,9 +96,12 @@
96 96  
97 97 if ("yang".equals(babyEyeCheck.getExtRightEyelook()) || "yang".equals(babyEyeCheck.getExtLeftEyelook()) || "yang".equals(babyEyeCheck.getBlinkRightReflex())
98 98 || "yang".equals(babyEyeCheck.getBlinkLefttReflex()) || "yang".equals(babyEyeCheck.getPupillaryRightReflex()) || "yang".equals(babyEyeCheck.getPupillaryLeftReflex())
99   - || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex())
  99 + || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex()) || "ruoyang".equals(babyEyeCheck.getRedReflex())
100 100 || "yang".equals(babyEyeCheck.getConjunctiva()) || "yang".equals(babyEyeCheck.getCorneal()) || "yang".equals(babyEyeCheck.getLacrimalApparatus())
101 101 || "yang".equals(babyEyeCheck.getNystagmus()) || "yang".equals(babyEyeCheck.getExtEyelook())
  102 + || "ruoyang".equals(babyEyeCheck.getRedRightReflex()) || "ruoyang".equals(babyEyeCheck.getRedLeftReflex())
  103 +
  104 +
102 105 ) {
103 106 //器械判定阳性
104 107 babyEyeCheck.setApparatus("2");
... ... @@ -314,6 +317,14 @@
314 317 map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : "");
315 318 map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : "");
316 319  
  320 + map.put("visionJudgment1", babyEyeCheck.getVisionJudgment1() == null ? "" : babyEyeCheck.getVisionJudgment1() == 0 ? "" : "标准对视远视力表");
  321 + map.put("visionJudgment2", babyEyeCheck.getVisionJudgment2() == null ? "" : babyEyeCheck.getVisionJudgment2() == 0 ? "" : "儿童对数视力表");
  322 + map.put("visionJudgment3", babyEyeCheck.getVisionJudgment3() == null ? "" : babyEyeCheck.getVisionJudgment3() == 0 ? "" : "欠合作");
  323 +
  324 + map.put("prismLeft", babyEyeCheck.getPrismLeft());
  325 + map.put("prismRight", babyEyeCheck.getPrismRight());
  326 + map.put("cooperation", babyEyeCheck.getCooperation() == null ? "" : babyEyeCheck.getCooperation() == 0 ? "合作" : "欠合作");
  327 +
317 328 FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId());
318 329 map.put("filePath", filePath);
319 330 //
320 331  
... ... @@ -333,11 +344,19 @@
333 344 } else if ("yang".equals(s)) {
334 345 return "+ （" + other + "）";
335 346 }
  347 + else if ("ruoyang".equals(s))
  348 + {
  349 + return "稍减弱";
  350 + }
336 351 } else {
337 352 if ("yin".equals(s)) {
338 353 return "-";
339 354 } else if ("yang".equals(s)) {
340 355 return "+";
  356 + }
  357 + else if ("ruoyang".equals(s))
  358 + {
  359 + return "稍减弱";
341 360 }
342 361 }
343 362 }