jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6358b71f6f3d98a474517c7225de2a8a87110ccb

Authored by yangfei
1 parent 34ba2fb593
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

妇科检查

Showing 3 changed files with 45 additions and 17 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ 6358b71
... ... @@ -841,7 +841,7 @@
841 841 AND
842 842 hd.isconfirm = #{isconfirm}
843 843 </if>
844   - <if test="isconfirm!=null">
  844 + <if test="confirmResult!=null">
845 845 and
846 846 hd.confirm_result like concat("%",#{confirmResult},"%")
847 847 </if>
platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java View file @ 6358b71
... ... @@ -7,21 +7,29 @@
7 7 * @discription
8 8 */
9 9 public enum HearingDiagnosisEnums {
10   - DEQDGYSJXL(1,"单耳轻度感音神经性聋"),
  10 + DEQDGYSJXLZE(1,"单耳轻度感音神经性聋(左耳)"),
  11 + DEQDGYSJXLYE(17,"单耳轻度感音神经性聋（右耳）"),
11 12 SEQDGYSJXL(2,"双耳轻度感音神经性聋"),
12   - DEQDCDXLHBZEY(3,"单耳轻度传导性聋合并中耳炎"),
  13 + DEQDCDXLHBZEYZE(3,"单耳轻度传导性聋合并中耳炎(左耳)"),
  14 + DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎（右耳）"),
13 15 SEQDCDXLHBZEY(4,"双耳轻度传导性聋合并中耳炎"),
14   - DEZDGYSJXL(5,"单耳中度感音神经性聋"),
  16 + DEZDGYSJXLZE(5,"单耳中度感音神经性聋(左耳)"),
  17 + DEZDGYSJXLYE(19,"单耳中度感音神经性聋（右耳）"),
15 18 SEZDGYSJXL(6,"双耳中度感音神经性聋"),
16   - DEZDCDXLHBZEY(7,"单耳中度传导性聋合并中耳炎"),
  19 + DEZDCDXLHBZEYZE(7,"单耳中度传导性聋合并中耳炎(左耳)"),
  20 + DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎（右耳）"),
17 21 SEZDCDXLHBZEY(8,"双耳中度传导性聋合并中耳炎"),
18   - DEZZDGYSJXL(9,"单耳中重度感音神经性聋"),
  22 + DEZZDGYSJXLZE(9,"单耳中重度感音神经性聋(左耳)"),
  23 + DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋（右耳）"),
19 24 SEZZDGYSJXL(10,"双耳中重度感音神经性聋"),
20   - DEZZDCDXLHBZEY(11,"单耳中重度传导性聋合并中耳炎"),
  25 + DEZZDCDXLHBZEYZE(11,"单耳中重度传导性聋合并中耳炎(左耳)"),
  26 + DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎（右耳）"),
21 27 SEZZDCDXLHBZEY(12,"双耳中重度传导性聋合并中耳炎"),
22   - DEZZGYSJXL(13,"单耳重度感音神经性聋"),
  28 + DEZZGYSJXLZE(13,"单耳重度感音神经性聋(左耳)"),
  29 + DEZZGYSJXLYE(23,"单耳重度感音神经性聋（右耳）"),
23 30 SEZDGYSJXLS(14,"双耳重度感音神经性聋"),
24   - DEJZDGYSJXL(15,"单耳极重度感音神经性聋"),
  31 + DEJZDGYSJXLZE(15,"单耳极重度感音神经性聋(左耳)"),
  32 + DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋（右耳）"),
25 33 SEJZDGYSJXL(16,"双耳极重度感音神经性聋");
26 34 private int id;
27 35 private String name;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 6358b71
... ... @@ -349,10 +349,6 @@
349 349 //设置要查询的babyId
350 350 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
351 351  
352   - if (hdReq.getConfirmResult() != null) {
353   - query.setConfirmResult(String.valueOf(hdReq.getConfirmResult()));
354   - }
355   -
356 352 if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间
357 353 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime());
358 354 }
... ... @@ -377,7 +373,7 @@
377 373 if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊
378 374 query.setIsconfirm(hdReq.getIsconfirm());
379 375 }
380   - if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果
  376 + if (hdReq.getConfirmDegree() != null) {//模糊查询确诊程度
381 377 List<String> cfList = new ArrayList<>();
382 378 if (hdReq.getConfirmDegree() == 1) {//轻度
383 379 cfList.add(",1,");
384 380  
... ... @@ -387,11 +383,10 @@
387 383 cfList.add(",4,");
388 384 cfList.add(",5,");
389 385 cfList.add(",6,");
390   - } else if (hdReq.getConfirmDegree() == 3) {//重度
  386 + } else if (hdReq.getConfirmDegree() == 3) {//中重度和重度
391 387 cfList.add(",7,");
392 388 cfList.add(",8,");
393 389 cfList.add(",9,");
394   - } else if (hdReq.getConfirmDegree() == 3) {//重度
395 390 cfList.add(",10,");
396 391 cfList.add(",11,");
397 392 cfList.add(",12,");
398 393  
... ... @@ -401,8 +396,33 @@
401 396 cfList.add(",15,");
402 397 }
403 398 query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
404   - // query.setConfirmResult("," + hdReq.getConfirmResult() + ",");
405 399 }
  400 +
  401 + if (hdReq.getConfirmResult() != null) {
  402 + List<String> cfList = new ArrayList<>();
  403 + if (hdReq.getConfirmResult() == 1) {//轻度
  404 + cfList.add(",1,");
  405 + cfList.add(",2,");
  406 + cfList.add(",3,");
  407 + } else if (hdReq.getConfirmResult() == 2) {//中度
  408 + cfList.add(",4,");
  409 + cfList.add(",5,");
  410 + cfList.add(",6,");
  411 + } else if (hdReq.getConfirmResult() == 3) {//中重度和重度
  412 + cfList.add(",7,");
  413 + cfList.add(",8,");
  414 + cfList.add(",9,");
  415 + cfList.add(",10,");
  416 + cfList.add(",11,");
  417 + cfList.add(",12,");
  418 + } else if (hdReq.getConfirmResult() == 4) {//极重度
  419 + cfList.add(",13,");
  420 + cfList.add(",14,");
  421 + cfList.add(",15,");
  422 + }
  423 + query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
  424 + }
  425 +
406 426  
407 427 if (hdReq.getConfirmStartTime() != null) {//确诊开始时间
408 428 query.setConfirmStartTime(hdReq.getConfirmStartTime());