Commit 266e5d5120cf92d2d7bae9dbd60a5ea217684b9c
1 parent
d270e5ad30
Exists in
master
and in
6 other branches
孕前优生列表-临床检查是否完整
Showing 2 changed files with 105 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
View file @
266e5d5
| ... | ... | @@ -91,6 +91,17 @@ |
| 91 | 91 | //隆化- 是否全部模块上传省平台成功。0:失败。1:成功(有一个模块上传失败也是0) |
| 92 | 92 | private Integer isUploadingProvince; |
| 93 | 93 | |
| 94 | + //隆化-男女临床检查项目填写是否完整 0:不完整 1:完整 | |
| 95 | + private Integer clinicalCheckYn; | |
| 96 | + | |
| 97 | + public Integer getClinicalCheckYn() { | |
| 98 | + return clinicalCheckYn; | |
| 99 | + } | |
| 100 | + | |
| 101 | + public void setClinicalCheckYn(Integer clinicalCheckYn) { | |
| 102 | + this.clinicalCheckYn = clinicalCheckYn; | |
| 103 | + } | |
| 104 | + | |
| 94 | 105 | @Override |
| 95 | 106 | public Integer getIsUploadingProvince() { |
| 96 | 107 | return isUploadingProvince; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
266e5d5
| ... | ... | @@ -360,29 +360,59 @@ |
| 360 | 360 | query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc)); |
| 361 | 361 | } |
| 362 | 362 | //隆化定制-妻子和丈夫临床检查完整状态 0:不完整 1:完整 |
| 363 | -// if("2100001605".equals(hospitalId)){ | |
| 364 | -// Integer clinicalCheckYn=param.getClinicalCheckYn(); | |
| 365 | -// if(clinicalCheckYn!=null){ | |
| 366 | -// if(0==clinicalCheckYn){ | |
| 367 | -// MongoCondition c = MongoCondition.newInstance(); | |
| 368 | -// MongoCondition con1 = MongoCondition.newInstance("wifeClinicalCheck", false, MongoOper.EXISTS); | |
| 369 | -// MongoCondition con2 = MongoCondition.newInstance("husbandClinicalCheck",false, MongoOper.EXISTS); | |
| 370 | -// MongoCondition con3 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.0","", MongoOper.IS); | |
| 371 | -// MongoCondition con4 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.1","", MongoOper.IS); | |
| 372 | -// MongoCondition con5 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.2","", MongoOper.IS); | |
| 373 | -// MongoCondition con6 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.3","", MongoOper.IS); | |
| 374 | -// MongoCondition con7 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.4","", MongoOper.IS); | |
| 375 | -// MongoCondition con8 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.5","", MongoOper.IS); | |
| 376 | -// MongoCondition con9 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.6","", MongoOper.IS); | |
| 377 | -// MongoCondition con10 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.7","", MongoOper.IS); | |
| 378 | -// MongoCondition con11 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.8","", MongoOper.IS); | |
| 379 | -// query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7, con8 | |
| 380 | -// , con9, con10, con11}).getCriteria()); | |
| 381 | -// } | |
| 382 | -// | |
| 383 | -// } | |
| 384 | -// } | |
| 363 | + if("2100001605".equals(hospitalId)){ | |
| 364 | + Integer clinicalCheckYn=param.getClinicalCheckYn(); | |
| 365 | + if(clinicalCheckYn!=null){ | |
| 366 | + if(0==clinicalCheckYn){ | |
| 367 | + MongoCondition c = MongoCondition.newInstance(); | |
| 368 | + MongoCondition con1 = MongoCondition.newInstance("wifeClinicalCheck", false, MongoOper.EXISTS); | |
| 369 | + MongoCondition con2 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.0","", MongoOper.IS); | |
| 370 | + MongoCondition con3 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.1","", MongoOper.IS); | |
| 371 | + MongoCondition con4 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.2","", MongoOper.IS); | |
| 372 | + MongoCondition con5 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.3","", MongoOper.IS); | |
| 373 | + MongoCondition con6 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.4","", MongoOper.IS); | |
| 374 | + MongoCondition con7 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.5","", MongoOper.IS); | |
| 375 | + MongoCondition con8 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.6","", MongoOper.IS); | |
| 376 | + MongoCondition con9 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.7","", MongoOper.IS); | |
| 377 | + MongoCondition con10 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.8","", MongoOper.IS); | |
| 378 | + MongoCondition con11 = MongoCondition.newInstance("wifeClinicalCheck.gbzam","", MongoOper.IS); | |
| 379 | + MongoCondition con12 = MongoCondition.newInstance("wifeClinicalCheck.jigan","", MongoOper.IS); | |
| 380 | + MongoCondition con13 = MongoCondition.newInstance("wifeClinicalCheck.xuetang","", MongoOper.IS); | |
| 381 | + MongoCondition con14 = MongoCondition.newInstance("wifeClinicalCheck.abo",false, MongoOper.EXISTS); | |
| 382 | + MongoCondition con15 = MongoCondition.newInstance("husbandClinicalCheck",false, MongoOper.EXISTS); | |
| 383 | + MongoCondition con16 = MongoCondition.newInstance("husbandClinicalCheck.gbzam","", MongoOper.IS); | |
| 384 | + MongoCondition con17 = MongoCondition.newInstance("husbandClinicalCheck.jigan","", MongoOper.IS); | |
| 385 | + MongoCondition con18 = MongoCondition.newInstance("husbandClinicalCheck.abo",false, MongoOper.EXISTS); | |
| 386 | + query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7, con8 | |
| 387 | + , con9, con10, con11, con12, con13, con14, con15, con16, con17, con18}).getCriteria()); | |
| 388 | + } | |
| 389 | + if(1==clinicalCheckYn){ | |
| 390 | + MongoCondition c = MongoCondition.newInstance(); | |
| 391 | + MongoCondition con1 = MongoCondition.newInstance("wifeClinicalCheck", true, MongoOper.EXISTS); | |
| 392 | + MongoCondition con2 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.0","", MongoOper.NE); | |
| 393 | + MongoCondition con3 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.1","", MongoOper.NE); | |
| 394 | + MongoCondition con4 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.2","", MongoOper.NE); | |
| 395 | + MongoCondition con5 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.3","", MongoOper.NE); | |
| 396 | + MongoCondition con6 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.4","", MongoOper.NE); | |
| 397 | + MongoCondition con7 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.5","", MongoOper.NE); | |
| 398 | + MongoCondition con8 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.6","", MongoOper.NE); | |
| 399 | + MongoCondition con9 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.7","", MongoOper.NE); | |
| 400 | + MongoCondition con10 = MongoCondition.newInstance("wifeClinicalCheck.xxbfx.8","", MongoOper.NE); | |
| 401 | + MongoCondition con11 = MongoCondition.newInstance("wifeClinicalCheck.gbzam","", MongoOper.NE); | |
| 402 | + MongoCondition con12 = MongoCondition.newInstance("wifeClinicalCheck.jigan","", MongoOper.NE); | |
| 403 | + MongoCondition con13 = MongoCondition.newInstance("wifeClinicalCheck.xuetang","", MongoOper.NE); | |
| 404 | + MongoCondition con14 = MongoCondition.newInstance("wifeClinicalCheck.abo",true, MongoOper.EXISTS); | |
| 405 | + MongoCondition con15 = MongoCondition.newInstance("husbandClinicalCheck",true, MongoOper.EXISTS); | |
| 406 | + MongoCondition con16 = MongoCondition.newInstance("husbandClinicalCheck.gbzam","", MongoOper.NE); | |
| 407 | + MongoCondition con17 = MongoCondition.newInstance("husbandClinicalCheck.jigan","", MongoOper.NE); | |
| 408 | + MongoCondition con18 = MongoCondition.newInstance("husbandClinicalCheck.abo",true, MongoOper.EXISTS); | |
| 409 | + query.addCriteria(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7, con8 | |
| 410 | + , con9, con10, con11, con12, con13, con14, con15, con16, con17, con18}).getCriteria()); | |
| 411 | + } | |
| 385 | 412 | |
| 413 | + } | |
| 414 | + } | |
| 415 | + | |
| 386 | 416 | Integer hyj = param.getHyj(); |
| 387 | 417 | if (hyj != null) { |
| 388 | 418 | query.addCriteria(Criteria.where("hyj").is(hyj)); |
| ... | ... | @@ -574,6 +604,10 @@ |
| 574 | 604 | setDoctorName(result.getHusbandClinicalCheck()); |
| 575 | 605 | setDoctorName(result.getHusbandOtherCheck()); |
| 576 | 606 | setDoctorName(result.getResultAdvice()); |
| 607 | + //男女婚检是否完整 | |
| 608 | + setClinicalCheckYnWife(result.getWifeClinicalCheck(),result); | |
| 609 | + setClinicalCheckYnHusband(result.getHusbandClinicalCheck(),result); | |
| 610 | + | |
| 577 | 611 | return result; |
| 578 | 612 | } |
| 579 | 613 | |
| ... | ... | @@ -590,6 +624,44 @@ |
| 590 | 624 | String doctorStr = CommonsHelper.getUserName(doctor, usersService); |
| 591 | 625 | map.put("checkDoctorStr", doctorStr); |
| 592 | 626 | } |
| 627 | + } | |
| 628 | + } | |
| 629 | + private void setClinicalCheckYnWife(Map <String, Object> map,PreEugenicsBaseListResult result) { | |
| 630 | + if (map != null && map.size() > 0) { | |
| 631 | + List<String> xxbfx =null!= map.get("xxbfx")?(List<String>) map.get("xxbfx"):null; | |
| 632 | + for (String s : xxbfx) { | |
| 633 | + if(StringUtils.isEmpty(s)){ | |
| 634 | + result.setClinicalCheckYn(0); | |
| 635 | + } | |
| 636 | + } | |
| 637 | + String gbzam = null != map.get("gbzam") ? map.get("gbzam").toString() : ""; | |
| 638 | + String jigan = null != map.get("jigan") ? map.get("jigan").toString() : ""; | |
| 639 | + String xuetang = null != map.get("xuetang") ? map.get("xuetang").toString() : ""; | |
| 640 | + Integer abo = null != map.get("abo") ? (Integer) map.get("abo") : null; | |
| 641 | + if (Arrays.asList(gbzam, jigan, xuetang).contains("") || | |
| 642 | + null==abo || | |
| 643 | + null==result.getClinicalCheckYn()|| | |
| 644 | + 0==result.getClinicalCheckYn()) { | |
| 645 | + result.setClinicalCheckYn(0); | |
| 646 | + } else { | |
| 647 | + result.setClinicalCheckYn(1); | |
| 648 | + } | |
| 649 | + }else { | |
| 650 | + result.setClinicalCheckYn(0); | |
| 651 | + } | |
| 652 | + } | |
| 653 | + private void setClinicalCheckYnHusband(Map <String, Object> map,PreEugenicsBaseListResult result) { | |
| 654 | + if (map != null && map.size() > 0) { | |
| 655 | + String gbzam = null!=map.get("gbzam")?map.get("gbzam").toString():""; | |
| 656 | + String jigan = null!=map.get("jigan")?map.get("jigan").toString():""; | |
| 657 | + Integer abo = null!=map.get("abo")?(Integer) map.get("abo"):null; | |
| 658 | + if(Arrays.asList(gbzam,jigan).contains("")||abo==null){ | |
| 659 | + result.setClinicalCheckYn(0); | |
| 660 | + }else { | |
| 661 | + result.setClinicalCheckYn(1); | |
| 662 | + } | |
| 663 | + }else { | |
| 664 | + result.setClinicalCheckYn(0); | |
| 593 | 665 | } |
| 594 | 666 | } |
| 595 | 667 |