jiangjiazhi / regional-platform

Commit 45444831bb93179967bcc5a8b269bd4b071c38f8

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

滦平-孕产、儿童贫血统计修正

Showing 3 changed files with 74 additions and 84 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -93,16 +93,7 @@
93	93	//滦平儿保血红蛋白统计
94	94	private String hemoglobinStart;
95	95	private String hemoglobinEnd;
96		- private String hemoglobinLt;
97	96
98		- public String getHemoglobinLt() {
99		- return hemoglobinLt;
100		- }
101		-
102		- public void setHemoglobinLt(String hemoglobinLt) {
103		- this.hemoglobinLt = hemoglobinLt;
104		- }
105		-
106	97	public String getHemoglobinStart() {
107	98	return hemoglobinStart;
108	99	}
...	...	@@ -276,18 +267,6 @@
276	267	" return this.hemoglobin >= %s &&this.hemoglobin <= %s \n" +
277	268	" }",hemoglobinStart,hemoglobinEnd);
278	269	if(null != c){
279		- c = c.and("$where").is(formatXhdb).and("hemoglobin").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据
280		- }else{
281		- c = Criteria.where("$where").is(formatXhdb).and("hemoglobin").ne("");
282		- }
283		- }
284		-
285		- if(StringUtils.isNotEmpty(hemoglobinLt)){
286		- String formatXhdb = String.format("function() {\n" +
287		- " return this.hemoglobin < %s \n" +
288		- " }",hemoglobinLt);
289		- if(null != c){
290		-
291	270	c = c.and("$where").is(formatXhdb).and("hemoglobin").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据
292	271	}else{
293	272	c = Criteria.where("$where").is(formatXhdb).and("hemoglobin").ne("");

...	...	@@ -4694,12 +4694,13 @@
4694	4694	}
4695	4695	}
4696	4696	query.setHospitalId(hospitalId);
	4697	+ query.setYn(YnEnums.YES.getId());
4697	4698	int total=0;
4698		- for (int i=1;i<=6;i++){
	4699	+ for (int i=1;i<=8;i++){
4699	4700	Map<String,Object>map =new HashMap<>();
4700	4701	int cms=0,cme=0;
4701	4702	//全区间总数
4702		- if(i==6){
	4703	+ if(i==8){
4703	4704	map.put("zTotal", total);
4704	4705	mapList.add(map);
4705	4706	break;
4706	4707
4707	4708
4708	4709
4709	4710
4710	4711
4711	4712
4712	4713
4713	4714
4714	4715
4715	4716
4716	4717
4717	4718
4718	4719
4719	4720
4720	4721
4721	4722
4722	4723
4723	4724
4724	4725
4725	4726
...	...	@@ -4707,83 +4708,95 @@
4707	4708	String lightHls="0",lightHln="0";
4708	4709	String middleHls="0",middleHln="0";
4709	4710	String matterHls="0",matterHln="0";
4710		- String severityHll="0";
4711	4711	switch (i){
4712	4712	case 1:
4713	4713	/**
4714		- * 1-4个月
	4714	+ * 1-3个月
4715	4715	*/
4716	4716	cms=1;cme=3;
4717	4717	middleHls="60";middleHln="89";
4718		- matterHls="30";matterHln="59";severityHll="30";
	4718	+ matterHls="30";matterHln="59";
4719	4719	break;
4720	4720	case 2:
4721	4721	/**
4722		- * 4-6个月
	4722	+ * 4-5个月
4723	4723	*/
4724	4724	cms=4;cme=5;
4725	4725	//（90-100g/l）
4726	4726	lightHls="90";lightHln="100"; middleHls="60";middleHln="89";
4727		- matterHls="30";matterHln="59";severityHll="30";
	4727	+ matterHls="30";matterHln="59";
4728	4728	break;
4729	4729	case 3:
4730	4730	/**
4731		- * 6-59个月
	4731	+ * 6-11个月
4732	4732	*/
4733		- cms=6;cme=59;
	4733	+ cms=6;cme=11;
4734	4734	//（90-110g/l）
4735	4735	lightHls="90";lightHln="110"; middleHls="60";middleHln="89";
4736		- matterHls="30";matterHln="59";severityHll="30";
	4736	+ matterHls="30";matterHln="59";
4737	4737	break;
4738	4738	case 4:
4739	4739	/**
4740		- * 6-11岁
	4740	+ * 12-17个月
4741	4741	*/
4742		- cms=72;cme=132;
	4742	+ cms=12;cme=17;
4743	4743	//（90-115g/l）
4744		- lightHls="90";lightHln="115"; middleHls="60";middleHln="89";
4745		- matterHls="30";matterHln="59";severityHll="30";
	4744	+ lightHls="90";lightHln="110"; middleHls="60";middleHln="89";
	4745	+ matterHls="30";matterHln="59";
4746	4746	break;
4747	4747	case 5:
4748	4748	/**
4749		- * 12-14岁
	4749	+ * 18-24个月
4750	4750	*/
4751		- cms=144;cme=168;
	4751	+ cms=18;cme=24;
4752	4752	//（90-120g/l）
4753		- lightHls="90";lightHln="120"; middleHls="60";middleHln="89";
4754		- matterHls="30";matterHln="59";severityHll="30";
	4753	+ lightHls="90";lightHln="110"; middleHls="60";middleHln="89";
	4754	+ matterHls="30";matterHln="59";
4755	4755	break;
	4756	+ case 6:
	4757	+ /**
	4758	+ * 25-35个月
	4759	+ */
	4760	+ cms=25;cme=35;
	4761	+ //（90-120g/l）
	4762	+ lightHls="90";lightHln="110"; middleHls="60";middleHln="89";
	4763	+ matterHls="30";matterHln="59";
	4764	+ break;
	4765	+ case 7:
	4766	+ /**
	4767	+ * 3-6岁
	4768	+ */
	4769	+ cms=36;cme=72;
	4770	+ //（90-120g/l）
	4771	+ lightHls="90";lightHln="110"; middleHls="60";middleHln="89";
	4772	+ matterHls="30";matterHln="59";
	4773	+ break;
4756	4774	}
4757	4775	query.setCheckMonthStart(cms);
4758	4776	query.setCheckMonthEnd(cme);
4759	4777	//轻度贫血
4760		- query.setHemoglobinLt(null);
4761		- query.setHemoglobinStart(lightHls);
4762		- query.setHemoglobinEnd(lightHln);
4763		- int light =babyCheckService.queryBabyCheckCount(query);
4764		- map.put("light"+i,light);
	4778	+ int light=0;
	4779	+ if(1!=i){
	4780	+ query.setHemoglobinStart(lightHls);
	4781	+ query.setHemoglobinEnd(lightHln);
	4782	+ light =babyCheckService.queryBabyCheckCount(query);
	4783	+ map.put("light"+i,light);
	4784	+ }
4765	4785	//中度贫血
4766		- query.setHemoglobinLt(null);
4767	4786	query.setHemoglobinStart(middleHls);
4768	4787	query.setHemoglobinEnd(middleHln);
4769	4788	int middle =babyCheckService.queryBabyCheckCount(query);
4770	4789	map.put("middle"+i,middle);
4771	4790	//重度贫血
4772		- query.setHemoglobinLt(null);
4773	4791	query.setHemoglobinStart(matterHls);
4774	4792	query.setHemoglobinEnd(matterHls);
4775	4793	int matter =babyCheckService.queryBabyCheckCount(query);
4776	4794	map.put("matter"+i,matter);
4777		- //极重度贫血
4778		- query.setHemoglobinStart(null);
4779		- query.setHemoglobinEnd(null);
4780		- query.setHemoglobinLt(severityHll);
4781		- int severity =babyCheckService.queryBabyCheckCount(query);
4782		- map.put("severity"+i,severity);
	4795	+
4783	4796	//月龄区间总数
4784		- map.put("total"+i,light+middle+matter+severity);
	4797	+ map.put("total"+i,light+middle+matter);
4785	4798	if(cms==1){
4786		- map.put("total"+i,middle+matter+severity);
	4799	+ map.put("total"+i,middle+matter);
4787	4800	}
4788	4801	//汇总总数
4789	4802	total+=Integer.parseInt(map.get("total"+i).toString());
4790	4803
4791	4804
4792	4805
4793	4806
4794	4807
4795	4808
4796	4809
4797	4810
4798	4811
4799	4812
4800	4813
4801	4814
4802	4815
...	...	@@ -4810,56 +4823,55 @@
4810	4823	//月龄区间
4811	4824	switch (ageType){
4812	4825	case 1:
4813		- //1-4个月
	4826	+ //1-3个月
4814	4827	query.setCheckMonthStart(1);
4815		- query.setCheckMonthEnd(4);
	4828	+ query.setCheckMonthEnd(3);
4816	4829	break;
4817	4830	case 2:
4818		- //4-6个月
	4831	+ //4-5个月
4819	4832	query.setCheckMonthStart(4);
4820		- query.setCheckMonthEnd(6);
	4833	+ query.setCheckMonthEnd(5);
4821	4834	break;
4822	4835	case 3:
4823		- //6-59个月
	4836	+ //6-11个月
4824	4837	query.setCheckMonthStart(6);
4825		- query.setCheckMonthEnd(59);
	4838	+ query.setCheckMonthEnd(11);
4826	4839	break;
4827	4840	case 4:
4828		- //6-11岁
4829		- query.setCheckMonthStart(72);
4830		- query.setCheckMonthEnd(132);
	4841	+ //12-17个月
	4842	+ query.setCheckMonthStart(12);
	4843	+ query.setCheckMonthEnd(17);
4831	4844	break;
4832	4845	case 5:
4833		- //12-14岁
4834		- query.setCheckMonthStart(144);
4835		- query.setCheckMonthEnd(168);
	4846	+ //18-24个月
	4847	+ query.setCheckMonthStart(18);
	4848	+ query.setCheckMonthEnd(24);
4836	4849	break;
	4850	+ case 6:
	4851	+ //25-35个月
	4852	+ query.setCheckMonthStart(25);
	4853	+ query.setCheckMonthEnd(35);
	4854	+ break;
	4855	+ case 7:
	4856	+ //3-6岁
	4857	+ query.setCheckMonthStart(36);
	4858	+ query.setCheckMonthEnd(72);
	4859	+ break;
4837	4860	}
4838	4861	//血红蛋白区间
4839	4862	switch (hemoglobinType){
	4863	+ //轻度贫血
4840	4864	case 1:
4841		- //轻度贫血
	4865	+ //根据前端从下至下月龄区间顺序,只有4-5不同
4842	4866	switch (ageType){
4843		- case 1:
4844		- query.setHemoglobinStart("90");
4845		- query.setHemoglobinEnd("95");
4846		- break;
4847	4867	case 2:
4848	4868	query.setHemoglobinStart("90");
4849	4869	query.setHemoglobinEnd("100");
4850	4870	break;
4851		- case 3:
	4871	+ default:
4852	4872	query.setHemoglobinStart("90");
4853	4873	query.setHemoglobinEnd("110");
4854	4874	break;
4855		- case 4:
4856		- query.setHemoglobinStart("90");
4857		- query.setHemoglobinEnd("115");
4858		- break;
4859		- case 5:
4860		- query.setHemoglobinStart("90");
4861		- query.setHemoglobinEnd("120");
4862		- break;
4863	4875	}
4864	4876	break;
4865	4877	case 2:
4866	4878
...	...	@@ -4872,11 +4884,8 @@
4872	4884	query.setHemoglobinStart("30");
4873	4885	query.setHemoglobinEnd("59");
4874	4886	break;
4875		- case 4:
4876		- //极重度贫血
4877		- query.setHemoglobinLt("30");
4878		- break;
4879	4887	}
	4888	+ query.setYn(YnEnums.YES.getId());
4880	4889	query.setNeed("yes");
4881	4890	query.setPage(page);
4882	4891	query.setLimit(limit);

...	...	@@ -8815,6 +8815,7 @@
8815	8815	Map<String,Object>map =new HashMap<>();
8816	8816	AntExChuQuery antExChuQuery=new AntExChuQuery();
8817	8817	antExChuQuery.setHospitalId(antExChuModel.getHospitalId());
	8818	+ antExChuQuery.setYn(YnEnums.YES.getId());
8818	8819	//检查时间筛选
8819	8820	if (StringUtils.isNotEmpty(antExChuModel.getCheckTimeString())) {
8820	8821	try {
...	...	@@ -8858,6 +8859,7 @@
8858	8859	BaseObjectResponse baseObjectResponse=new BaseObjectResponse();
8859	8860	AntExChuQuery antExChuQuery=new AntExChuQuery();
8860	8861	antExChuQuery.setHospitalId(antExChuModel.getHospitalId());
	8862	+ antExChuQuery.setYn(YnEnums.YES.getId());
8861	8863	//检查时间筛选
8862	8864	if (StringUtils.isNotEmpty(antExChuModel.getCheckTimeString())) {
8863	8865	try {