diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index df0a2f4..6a3d964 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -93,15 +93,6 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu //滦平儿保血红蛋白统计 private String hemoglobinStart; private String hemoglobinEnd; - private String hemoglobinLt; - - public String getHemoglobinLt() { - return hemoglobinLt; - } - - public void setHemoglobinLt(String hemoglobinLt) { - this.hemoglobinLt = hemoglobinLt; - } public String getHemoglobinStart() { return hemoglobinStart; @@ -282,18 +273,6 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu } } - if(StringUtils.isNotEmpty(hemoglobinLt)){ - String formatXhdb = String.format("function() {\n" + - " return this.hemoglobin < %s \n" + - " }",hemoglobinLt); - if(null != c){ - - c = c.and("$where").is(formatXhdb).and("hemoglobin").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 - }else{ - c = Criteria.where("$where").is(formatXhdb).and("hemoglobin").ne(""); - } - } - if (c != null) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 7290100..2b1f84c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -4694,12 +4694,13 @@ public class BabyCheckFacade extends BaseServiceImpl { } } query.setHospitalId(hospitalId); + query.setYn(YnEnums.YES.getId()); int total=0; - for (int i=1;i<=6;i++){ + for (int i=1;i<=8;i++){ Mapmap =new HashMap<>(); int cms=0,cme=0; //全区间总数 - if(i==6){ + if(i==8){ map.put("zTotal", total); mapList.add(map); break; @@ -4707,83 +4708,95 @@ public class BabyCheckFacade extends BaseServiceImpl { String lightHls="0",lightHln="0"; String middleHls="0",middleHln="0"; String matterHls="0",matterHln="0"; - String severityHll="0"; switch (i){ case 1: /** - * 1-4个月 + * 1-3个月 */ cms=1;cme=3; middleHls="60";middleHln="89"; - matterHls="30";matterHln="59";severityHll="30"; + matterHls="30";matterHln="59"; break; case 2: /** - * 4-6个月 + * 4-5个月 */ cms=4;cme=5; //（90-100g/l） lightHls="90";lightHln="100"; middleHls="60";middleHln="89"; - matterHls="30";matterHln="59";severityHll="30"; + matterHls="30";matterHln="59"; break; case 3: /** - * 6-59个月 + * 6-11个月 */ - cms=6;cme=59; + cms=6;cme=11; //（90-110g/l） lightHls="90";lightHln="110"; middleHls="60";middleHln="89"; - matterHls="30";matterHln="59";severityHll="30"; + matterHls="30";matterHln="59"; break; case 4: /** - * 6-11岁 + * 12-17个月 */ - cms=72;cme=132; + cms=12;cme=17; //（90-115g/l） - lightHls="90";lightHln="115"; middleHls="60";middleHln="89"; - matterHls="30";matterHln="59";severityHll="30"; + lightHls="90";lightHln="110"; middleHls="60";middleHln="89"; + matterHls="30";matterHln="59"; break; case 5: /** - * 12-14岁 + * 18-24个月 + */ + cms=18;cme=24; + //（90-120g/l） + lightHls="90";lightHln="110"; middleHls="60";middleHln="89"; + matterHls="30";matterHln="59"; + break; + case 6: + /** + * 25-35个月 */ - cms=144;cme=168; + cms=25;cme=35; //（90-120g/l） - lightHls="90";lightHln="120"; middleHls="60";middleHln="89"; - matterHls="30";matterHln="59";severityHll="30"; + lightHls="90";lightHln="110"; middleHls="60";middleHln="89"; + matterHls="30";matterHln="59"; + break; + case 7: + /** + * 3-6岁 + */ + cms=36;cme=72; + //（90-120g/l） + lightHls="90";lightHln="110"; middleHls="60";middleHln="89"; + matterHls="30";matterHln="59"; break; } query.setCheckMonthStart(cms); query.setCheckMonthEnd(cme); //轻度贫血 - query.setHemoglobinLt(null); - query.setHemoglobinStart(lightHls); - query.setHemoglobinEnd(lightHln); - int light =babyCheckService.queryBabyCheckCount(query); - map.put("light"+i,light); + int light=0; + if(1!=i){ + query.setHemoglobinStart(lightHls); + query.setHemoglobinEnd(lightHln); + light =babyCheckService.queryBabyCheckCount(query); + map.put("light"+i,light); + } //中度贫血 - query.setHemoglobinLt(null); query.setHemoglobinStart(middleHls); query.setHemoglobinEnd(middleHln); int middle =babyCheckService.queryBabyCheckCount(query); map.put("middle"+i,middle); //重度贫血 - query.setHemoglobinLt(null); query.setHemoglobinStart(matterHls); query.setHemoglobinEnd(matterHls); int matter =babyCheckService.queryBabyCheckCount(query); map.put("matter"+i,matter); - //极重度贫血 - query.setHemoglobinStart(null); - query.setHemoglobinEnd(null); - query.setHemoglobinLt(severityHll); - int severity =babyCheckService.queryBabyCheckCount(query); - map.put("severity"+i,severity); + //月龄区间总数 - map.put("total"+i,light+middle+matter+severity); + map.put("total"+i,light+middle+matter); if(cms==1){ - map.put("total"+i,middle+matter+severity); + map.put("total"+i,middle+matter); } //汇总总数 total+=Integer.parseInt(map.get("total"+i).toString()); @@ -4810,56 +4823,55 @@ public class BabyCheckFacade extends BaseServiceImpl { //月龄区间 switch (ageType){ case 1: - //1-4个月 + //1-3个月 query.setCheckMonthStart(1); - query.setCheckMonthEnd(4); + query.setCheckMonthEnd(3); break; case 2: - //4-6个月 + //4-5个月 query.setCheckMonthStart(4); - query.setCheckMonthEnd(6); + query.setCheckMonthEnd(5); break; case 3: - //6-59个月 + //6-11个月 query.setCheckMonthStart(6); - query.setCheckMonthEnd(59); + query.setCheckMonthEnd(11); break; case 4: - //6-11岁 - query.setCheckMonthStart(72); - query.setCheckMonthEnd(132); + //12-17个月 + query.setCheckMonthStart(12); + query.setCheckMonthEnd(17); break; case 5: - //12-14岁 - query.setCheckMonthStart(144); - query.setCheckMonthEnd(168); + //18-24个月 + query.setCheckMonthStart(18); + query.setCheckMonthEnd(24); + break; + case 6: + //25-35个月 + query.setCheckMonthStart(25); + query.setCheckMonthEnd(35); + break; + case 7: + //3-6岁 + query.setCheckMonthStart(36); + query.setCheckMonthEnd(72); break; } //血红蛋白区间 switch (hemoglobinType){ + //轻度贫血 case 1: - //轻度贫血 + //根据前端从下至下月龄区间顺序,只有4-5不同 switch (ageType){ - case 1: - query.setHemoglobinStart("90"); - query.setHemoglobinEnd("95"); - break; case 2: query.setHemoglobinStart("90"); query.setHemoglobinEnd("100"); break; - case 3: + default: query.setHemoglobinStart("90"); query.setHemoglobinEnd("110"); break; - case 4: - query.setHemoglobinStart("90"); - query.setHemoglobinEnd("115"); - break; - case 5: - query.setHemoglobinStart("90"); - query.setHemoglobinEnd("120"); - break; } break; case 2: @@ -4872,11 +4884,8 @@ public class BabyCheckFacade extends BaseServiceImpl { query.setHemoglobinStart("30"); query.setHemoglobinEnd("59"); break; - case 4: - //极重度贫血 - query.setHemoglobinLt("30"); - break; } + query.setYn(YnEnums.YES.getId()); query.setNeed("yes"); query.setPage(page); query.setLimit(limit); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4c89275..48dfc5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -8815,6 +8815,7 @@ public class ViewFacade { Mapmap =new HashMap<>(); AntExChuQuery antExChuQuery=new AntExChuQuery(); antExChuQuery.setHospitalId(antExChuModel.getHospitalId()); + antExChuQuery.setYn(YnEnums.YES.getId()); //检查时间筛选 if (StringUtils.isNotEmpty(antExChuModel.getCheckTimeString())) { try { @@ -8858,6 +8859,7 @@ public class ViewFacade { BaseObjectResponse baseObjectResponse=new BaseObjectResponse(); AntExChuQuery antExChuQuery=new AntExChuQuery(); antExChuQuery.setHospitalId(antExChuModel.getHospitalId()); + antExChuQuery.setYn(YnEnums.YES.getId()); //检查时间筛选 if (StringUtils.isNotEmpty(antExChuModel.getCheckTimeString())) { try {