jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 26320d53154c1a14c0f7e6946f9b6acec619c1a5

Authored by shiyang
1 parent 9508f9ad55
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

udate

Showing 2 changed files with 18 additions and 17 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 26320d5
... ... @@ -1903,16 +1903,16 @@
1903 1903 condition.andCondition(new MongoCondition(cr));
1904 1904 }
1905 1905  
1906   - if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并
1907   - MongoCondition c1 = MongoCondition.newInstance();
1908   - MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS);
1909   - MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS);
1910   - if (c != null) {
1911   - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1912   - } else {
1913   - c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1914   - }
1915   - }
  1906 +// if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并
  1907 +// MongoCondition c1 = MongoCondition.newInstance();
  1908 +// MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS);
  1909 +// MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS);
  1910 +// if (c != null) {
  1911 +// c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  1912 +// } else {
  1913 +// c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  1914 +// }
  1915 +// }
1916 1916  
1917 1917 if (null != phoneOrcardNo) {
1918 1918 MongoCondition c1 = MongoCondition.newInstance();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 26320d5
... ... @@ -3281,13 +3281,14 @@
3281 3281 if (request.getHighRiskType() != null) {
3282 3282 if (request.getHighRiskType() == 1) {//高危
3283 3283 // babyQuery.setLastHighRisk(1);
3284   - for (String s : babyQuery.getHospitalIdList()) {//隆化县儿童管理 1:高危页面高危与体弱合并显示
3285   - if(Integer.valueOf(s)==2100001605){
3286   - babyQuery.setHighRiskAndWeakSon(1);
3287   - }else{
3288   - babyQuery.setHighRisk(1);
3289   - }
3290   - }
  3284 + babyQuery.setHighRisk(1);
  3285 +// for (String s : babyQuery.getHospitalIdList()) {//隆化县儿童管理 1:高危页面高危与体弱合并显示
  3286 +// if(Integer.valueOf(s)==2100001605){
  3287 +// babyQuery.setHighRiskAndWeakSon(1);
  3288 +// }else{
  3289 +// babyQuery.setHighRisk(1);
  3290 +// }
  3291 +// }
3291 3292 } else if (request.getHighRiskType() == 3) {//体弱
3292 3293 babyQuery.setWeakSon(1);
3293 3294 } else if (request.getHighRiskType() == 0) {