jiangjiazhi / regional-platform

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 20 additions and 11 deletions

...	...	@@ -15,13 +15,13 @@
15	15	return buildSuccess(null);
16	16	}
17	17
18		- public static BaseObjectResponse buildSuccess(Object ... data) {
	18	+ public static BaseObjectResponse buildSuccess(Object... data) {
19	19	BaseObjectResponse resp = new BaseObjectResponse();
20	20
21		- if(data != null) {
	21	+ if (data != null) {
22	22	Assert.isTrue(data.length == 1 \|\| data.length % 2 == 0, "length必须为偶数");
23	23
24		- if(data.length == 1) {
	24	+ if (data.length == 1) {
25	25	resp.setData(data[0]);
26	26	} else {
27	27	resp.setData(createMap(data));
...	...	@@ -40,7 +40,7 @@
40	40	public static BaseObjectResponse buildErro(ResponseCode code, Object data) {
41	41	BaseObjectResponse resp = new BaseObjectResponse();
42	42	resp.setData(data);
43		- if(code != null) {
	43	+ if (code != null) {
44	44	resp.setErrorcode(code.getCode());
45	45	resp.setErrormsg(code.getMsg());
46	46	} else {
47	47
...	...	@@ -50,12 +50,12 @@
50	50	return resp;
51	51	}
52	52
53		- public static Map<String,Object> createMap(Object ... args){
54		- Map<String,Object> map = new HashMap<>();
	53	+ public static Map<String, Object> createMap(Object... args) {
	54	+ Map<String, Object> map = new HashMap<>();
55	55	for (int i = 0; i < args.length; i++) {
56	56	String key = args[i++].toString();
57	57	Object value = args[i];
58		- if(value != null) {
	58	+ if (value != null) {
59	59	map.put(key, value);
60	60	}
61	61	}

...	...	@@ -795,7 +795,7 @@
795	795	babyModelQuery6.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1));
796	796	}
797	797	babyModelQuery6.setBabyWeightStart("0");
798		- babyModelQuery6.setBabyWeightEnd("2.6");
	798	+ babyModelQuery6.setBabyWeightEnd("2.49");
799	799
800	800	int lowWeightCount = babyService.queryBabyCount(babyModelQuery6);
801	801	//低出生体重数
...	...	@@ -870,6 +870,7 @@
870	870	matDeliverQuery10.setFmHospitalList(entry.getValue());
871	871	int babySiChanCount = 0;
872	872	int babySiTaiCount = 0;
	873	+ int babyJinRuanTaiCount = 0;
873	874	List<MaternalDeliverModel> babySiWangList = matDeliverService.query(matDeliverQuery10);
874	875	if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babySiWangList)) {
875	876	for (MaternalDeliverModel model : babySiWangList) {
876	877
...	...	@@ -880,13 +881,15 @@
880	881	babySiChanCount++;
881	882	} else if (baby.getPregnancyOut() != null && "1".equals(baby.getPregnancyOut())) {
882	883	babySiTaiCount++;
	884	+ } else if (baby.getPregnancyOut() != null && "2".equals(baby.getPregnancyOut())) {
	885	+ babyJinRuanTaiCount++;
883	886	}
884	887	}
885	888	}
886	889	}
887	890	}
888	891	babySiWangList.clear();
889		- map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount));
	892	+ map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount + babyJinRuanTaiCount));
890	893
891	894	patientCountSum += patientCount;
892	895	babyCountSum += babyCount;

...	...	@@ -147,11 +147,17 @@
147	147	Criteria criteria = new Criteria();
148	148	criteria = criteria.orOperator(Criteria.where("name").is(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key));
149	149	List<PersonModel> patients = mongoTemplate.find(Query.query(criteria), PersonModel.class);
150		- for (PersonModel patients1 : patients) {
151		- keys.add(patients1.getId());
	150	+ if (CollectionUtils.isNotEmpty(patients)) {
	151	+ for (PersonModel patients1 : patients) {
	152	+ keys.add(patients1.getId());
	153	+ }
	154	+ } else {
	155	+ return RespBuilder.buildSuccess(null);
152	156	}
	157	+
153	158	}
154	159	param.put("keys", keys);
	160	+
155	161	Integer type = 4;
156	162	String coupon = (String) param.get("couponType"); /** 选中单个优惠券类型查询时前端传的是 type_order 目前传入这种的只有使用统计 */
157	163	if (StringUtils.isNotEmpty(coupon)) {