jiangjiazhi / regional-platform

Commit 92dfa8461279d35e004f1dbfee76af2896accd74

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

儿童高危不展示修改

Showing 4 changed files with 81 additions and 67 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java

...	...	@@ -194,6 +194,9 @@
194	194
195	195	//是否高危儿童 0 非高危 1高危
196	196	private Integer highRisk;
	197	+ //是否是高危儿
	198	+ private Integer waskSon;
	199	+
197	200	// 修改时间
198	201	private Date modified;
199	202	//创建时间
200	203
...	...	@@ -413,7 +416,16 @@
413	416	*/
414	417	private String eyeGuideSuggestions;
415	418
	419	+ public Integer getWaskSon() {
	420	+ return waskSon;
	421	+ }
	422	+
	423	+ public void setWaskSon(Integer waskSon) {
	424	+ this.waskSon = waskSon;
	425	+ }
	426	+
416	427	/*增加眼科检查项*/
	428	+
417	429
418	430	public String getEyeAppearance() {
419	431	return eyeAppearance;

...	...	@@ -372,11 +372,16 @@
372	372	model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
373	373
374	374
375		- /* if (request.getHighRisk() == null) {
	375	+ if (request.getHighRisk() == null) {
376	376	model.setHighRisk(0);
377	377	} else {
378	378	model.setHighRisk(request.getHighRisk());
379		- }*/
	379	+ }
	380	+ if (request.getWeakSon() == null) {
	381	+ model.setWaskSon(0);
	382	+ } else {
	383	+ model.setWaskSon(request.getWeakSon());
	384	+ }
380	385
381	386	model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic()));
382	387	model.setChestw(request.getChestw());
...	...	@@ -2396,7 +2401,7 @@
2396	2401	param.setType("2");
2397	2402	String pid = param.getPid();
2398	2403	WxMeasureInfoModel model = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("2")), WxMeasureInfoModel.class);
2399		- if (model == null){
	2404	+ if (model == null) {
2400	2405	List<Map> babyInfos = param.getBabyInfos();
2401	2406	Map map = babyInfos.get(0);
2402	2407	map.put("createTime", DateUtil.getyyyy_MM_dd(new Date()));
2403	2408
...	...	@@ -2410,11 +2415,11 @@
2410	2415	List<Map> dbBabyInfos = model.getBabyInfos();
2411	2416	boolean exist = false;
2412	2417	Map currentMap = param.getBabyInfos().get(0);
2413		- if (CollectionUtils.isNotEmpty(dbBabyInfos)){
2414		- for (Map map: dbBabyInfos){
	2418	+ if (CollectionUtils.isNotEmpty(dbBabyInfos)) {
	2419	+ for (Map map : dbBabyInfos) {
2415	2420	String dbDate = map.get("createTime").toString();
2416	2421	String currentDate = DateUtil.getyyyy_MM_dd(new Date());
2417		- if (dbDate.equals(currentDate)){
	2422	+ if (dbDate.equals(currentDate)) {
2418	2423	exist = true;
2419	2424	map.putAll(currentMap);
2420	2425	// temperature 体温 height 身高 weight 体重 headWidth 头围 bust 胸围 feed 喂养 createTime 时间
2421	2426
...	...	@@ -2422,13 +2427,13 @@
2422	2427	}
2423	2428	}
2424	2429	}
2425		- if (!exist){
	2430	+ if (!exist) {
2426	2431	Map map = param.getBabyInfos().get(0);
2427	2432	map.put("createTime", DateUtil.getyyyy_MM_dd(new Date()));
2428	2433	dbBabyInfos.add(map);
2429	2434	}
2430	2435	mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(model.getId()).and("type").is("2")), MongoConvertHelper
2431		- .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)), WxMeasureInfoModel.class);
	2436	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)), WxMeasureInfoModel.class);
2432	2437	return new BaseResponse();
2433	2438	}
2434	2439
...	...	@@ -2448,7 +2453,7 @@
2448	2453	mongoQuery.start(param.getOffset()).end(param.getLimit());
2449	2454
2450	2455	List<WxMeasureInfoModel> infoModels = mongoTemplate.find(mongoQuery.convertToMongoQuery(), WxMeasureInfoModel.class);
2451		- if (CollectionUtils.isEmpty(infoModels)){
	2456	+ if (CollectionUtils.isEmpty(infoModels)) {
2452	2457	infoModels = new ArrayList<WxMeasureInfoModel>();
2453	2458	}
2454	2459	BaseListResponse baseResponse = new BaseListResponse();
2455	2460
2456	2461
...	...	@@ -2466,14 +2471,14 @@
2466	2471	public BaseResponse babyMeasureInfoDetail(BaseQuery param) {
2467	2472	List<WxMeasureInfoModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(param.getKeyword()).and("type").is("2")), WxMeasureInfoModel.class);
2468	2473	BaseResponse baseResponse = new BaseResponse();
2469		- if (CollectionUtils.isNotEmpty(models)){
2470		- for (WxMeasureInfoModel model: models){
	2474	+ if (CollectionUtils.isNotEmpty(models)) {
	2475	+ for (WxMeasureInfoModel model : models) {
2471	2476	List<Map> babyInfos = model.getBabyInfos();
2472		- if (CollectionUtils.isNotEmpty(babyInfos)){
2473		- for (Map map : babyInfos){
	2477	+ if (CollectionUtils.isNotEmpty(babyInfos)) {
	2478	+ for (Map map : babyInfos) {
2474	2479	String currentDate = DateUtil.getyyyy_MM_dd(new Date());
2475	2480	String dbCreateDime = map.get("createTime").toString();
2476		- if (dbCreateDime.equals(currentDate)){
	2481	+ if (dbCreateDime.equals(currentDate)) {
2477	2482	baseResponse.setObject(map);
2478	2483	break;
2479	2484	}

...	...	@@ -1822,10 +1822,10 @@
1822	1822	}
1823	1823
1824	1824	// 丰润字段添加
1825		- if (StringUtils.isNotEmpty(placenta.getHeartRateSelect())){
	1825	+ if (StringUtils.isNotEmpty(placenta.getHeartRateSelect())) {
1826	1826	placetaMap.put("heartRateSelect", placenta.getHeartRateSelect());
1827	1827	}
1828		- if (StringUtils.isNotEmpty(placenta.getFetalPositionSelect())){
	1828	+ if (StringUtils.isNotEmpty(placenta.getFetalPositionSelect())) {
1829	1829	placetaMap.put("fetalPositionSelect", placenta.getFetalPositionSelect());
1830	1830	}
1831	1831	if (StringUtils.isNotEmpty(placenta.getJoinSelect())) {
1832	1832
1833	1833
...	...	@@ -1945,16 +1945,15 @@
1945	1945	map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
1946	1946
1947	1947
1948		-
1949	1948	map.put("ygbmkyValue", data.getYgbmkyValue() == null ? "" : data.getYgbmkyValue());
1950	1949	map.put("ygbmktValue", data.getYgbmktValue() == null ? "" : data.getYgbmktValue());
1951		- map.put("ygekyValue", data.getYgekyValue() == null ? "" : data.getYgekyValue());
1952		- map.put("ygektValue", data.getYgektValue() == null ? "" : data.getYgektValue());
	1950	+ map.put("ygekyValue", data.getYgekyValue() == null ? "" : data.getYgekyValue());
	1951	+ map.put("ygektValue", data.getYgektValue() == null ? "" : data.getYgektValue());
1953	1952	map.put("yghxktValue", data.getYghxktValue() == null ? "" : data.getYghxktValue());
1954	1953
1955	1954
1956	1955	map.put("syjgValue", data.getSyjgValue() == null ? "" : data.getSyjgValue());
1957		- map.put("hivktValue", data.getHivktValue() == null ? "" :data.getHivktValue());
	1956	+ map.put("hivktValue", data.getHivktValue() == null ? "" : data.getHivktValue());
1958	1957
1959	1958	map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UMOLL));
1960	1959	map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.MMOLL));
1961	1960
1962	1961
1963	1962
1964	1963
1965	1964
1966	1965
1967	1966
1968	1967
1969	1968
1970	1969
1971	1970
1972	1971
1973	1972
1974	1973
1975	1974
1976	1975
1977	1976
1978	1977
1979	1978
...	...	@@ -2422,81 +2421,81 @@
2422	2421	* @param map
2423	2422	*/
2424	2423	private void getSelect(Object object, Map<String, Object> map) {
2425		- if (object instanceof AntExChuModel){
	2424	+ if (object instanceof AntExChuModel) {
2426	2425	AntExChuModel data = (AntExChuModel) object;
2427	2426	String value = data.getGonggaoSelect();
2428	2427	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2429		- map.put("gongGaoSelect",value);
	2428	+ map.put("gongGaoSelect", value);
2430	2429
2431	2430	value = data.getFuweiSelect();
2432	2431	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2433		- map.put("fuweiSelect",value);
	2432	+ map.put("fuweiSelect", value);
2434	2433
2435	2434	value = data.getEdemaSelect();
2436	2435	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2437		- map.put("edemaSelect",value);
	2436	+ map.put("edemaSelect", value);
2438	2437
2439	2438	value = data.getTireNumberSelect();
2440	2439	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2441		- map.put("tireNumberSelect",value);
	2440	+ map.put("tireNumberSelect", value);
2442	2441
2443	2442	value = data.getQuickenSelect();
2444	2443	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2445		- map.put("quickenSelect",value);
	2444	+ map.put("quickenSelect", value);
2446	2445
2447	2446	value = data.getXhdbSelect();
2448	2447	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2449		- map.put("xhdbSelect",value);
	2448	+ map.put("xhdbSelect", value);
2450	2449
2451	2450	value = data.getXhdbSelectOtherVal();
2452	2451	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2453		- map.put("xhdbSelectOtherVal",value);
	2452	+ map.put("xhdbSelectOtherVal", value);
2454	2453
2455	2454	value = data.getNdbSelect();
2456	2455	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2457		- map.put("ndbSelect",value);
	2456	+ map.put("ndbSelect", value);
2458	2457
2459	2458	value = data.getNdbSelectOtherVal();
2460	2459	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2461		- map.put("ndbSelectOtherVal",value);
	2460	+ map.put("ndbSelectOtherVal", value);
2462	2461	}
2463		- if (object instanceof AntenatalExaminationModel){
	2462	+ if (object instanceof AntenatalExaminationModel) {
2464	2463	AntenatalExaminationModel data = (AntenatalExaminationModel) object;
2465	2464	String value = data.getGongGaoSelect();
2466	2465	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2467		- map.put("gongGaoSelect",value);
	2466	+ map.put("gongGaoSelect", value);
2468	2467
2469	2468	value = data.getFuweiSelect();
2470	2469	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2471		- map.put("fuweiSelect",value);
	2470	+ map.put("fuweiSelect", value);
2472	2471
2473	2472	value = data.getEdemaSelect();
2474	2473	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2475		- map.put("edemaSelect",value);
	2474	+ map.put("edemaSelect", value);
2476	2475
2477	2476	value = data.getTireNumberSelect();
2478	2477	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2479		- map.put("tireNumberSelect",value);
	2478	+ map.put("tireNumberSelect", value);
2480	2479
2481	2480	value = data.getQuickenSelect();
2482	2481	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2483		- map.put("quickenSelect",value);
	2482	+ map.put("quickenSelect", value);
2484	2483
2485	2484	value = data.getXhdbSelect();
2486	2485	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2487		- map.put("xhdbSelect",value);
	2486	+ map.put("xhdbSelect", value);
2488	2487
2489	2488	value = data.getXhdbSelectOtherVal();
2490	2489	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2491		- map.put("xhdbSelectOtherVal",value);
	2490	+ map.put("xhdbSelectOtherVal", value);
2492	2491
2493	2492	value = data.getNdbSelect();
2494	2493	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2495		- map.put("ndbSelect",value);
	2494	+ map.put("ndbSelect", value);
2496	2495
2497	2496	value = data.getNdbSelectOtherVal();
2498	2497	value = com.lyms.platform.common.utils.StringUtils.isEmpty(value) ? "" : value;
2499		- map.put("ndbSelectOtherVal",value);
	2498	+ map.put("ndbSelectOtherVal", value);
2500	2499	}
2501	2500
2502	2501	}
2503	2502
...	...	@@ -4164,9 +4163,9 @@
4164	4163
4165	4164	List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getWeakSonInfo());
4166	4165	model.setWeakSonInfo(weakSonInfos);
	4166	+ //后续更改
	4167	+ model.setWeakSon(String.valueOf(babyModel.getWeakSon()));
4167	4168
4168		- model.setWeakSon(babyModel.getWeakSon());
4169		-
4170	4169	model.setSex(SexEnum.getTextById(babyModel.getSex()));
4171	4170
4172	4171	model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
...	...	@@ -4475,6 +4474,7 @@
4475	4474
4476	4475	model.setNextCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
4477	4476	model.setHighRisk(checkModel.getHighRisk() == null ? "否" : checkModel.getHighRisk() == 1 ? "是" : "否");
	4477	+ model.setWeakSon(checkModel.getWaskSon() == null ? "否" : checkModel.getWaskSon() == 1 ? "是" : "否");
4478	4478	model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
4479	4479
4480	4480
...	...	@@ -4530,7 +4530,7 @@
4530	4530	model.setEyeDioptroscopy(checkModel.getEyeDioptroscopy());
4531	4531	String eyeAdvice = checkModel.getEyeAdvice();
4532	4532	String eyeAdviceName = "";
4533		- if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(eyeAdvice)){
	4533	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(eyeAdvice)) {
4534	4534	eyeAdviceName = EyeExaminationEnums.getNameById(Integer.parseInt(eyeAdvice));
4535	4535	}
4536	4536	model.setEyeAdviceName(eyeAdviceName);
4537	4537
4538	4538
4539	4539
4540	4540
4541	4541
4542	4542
...	...	@@ -5843,46 +5843,44 @@
5843	5843	if (CollectionUtils.isNotEmpty(list)) {
5844	5844	Patients patients = list.get(0);
5845	5845
5846		- data.put("userName",patients.getUsername());
5847		- data.put("sex","女");
5848		- data.put("age",DateUtil.getAge(patients.getBirth()));
5849		- data.put("lastMenses",DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
5850		- data.put("phone",patients.getPhone());
	5846	+ data.put("userName", patients.getUsername());
	5847	+ data.put("sex", "女");
	5848	+ data.put("age", DateUtil.getAge(patients.getBirth()));
	5849	+ data.put("lastMenses", DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
	5850	+ data.put("phone", patients.getPhone());
5851	5851
5852	5852	//户籍地址
5853	5853	String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
5854	5854	patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
5855	5855
5856		- data.put("addressRegister",addressRegister);
	5856	+ data.put("addressRegister", addressRegister);
5857	5857
5858		- data.put("husbandName",patients.getHusbandName() == null ? "" : patients.getHusbandName());
5859		- data.put("husbandSex","男");
5860		- data.put("husbandAge",patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
5861		- data.put("husbandPhone",patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
	5858	+ data.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
	5859	+ data.put("husbandSex", "男");
	5860	+ data.put("husbandAge", patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
	5861	+ data.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
5862	5862
5863	5863	data.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
5864	5864
5865		- String husbandAddress = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
	5865	+ String husbandAddress = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
5866	5866	patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(),
5867	5867	basicConfigService);
5868		- data.put("husbandAddress",husbandAddress);
	5868	+ data.put("husbandAddress", husbandAddress);
5869	5869
5870	5870	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
5871	5871	StringBuffer risks = new StringBuffer();
5872	5872
5873		- if (CollectionUtils.isNotEmpty(highScoreResult.getHighRisk()))
5874		- {
5875		- for (Object obj : highScoreResult.getHighRisk())
5876		- {
5877		- Map map = (Map)obj;
	5873	+ if (CollectionUtils.isNotEmpty(highScoreResult.getHighRisk())) {
	5874	+ for (Object obj : highScoreResult.getHighRisk()) {
	5875	+ Map map = (Map) obj;
5878	5876	Object name = map.get("name");
5879	5877	risks.append(name);
5880	5878	risks.append(",");
5881	5879	}
5882	5880	}
5883	5881
5884		- data.put("risks",risks.toString());
5885		- data.put("riskScor",highScoreResult.getScoreStr());
	5882	+ data.put("risks", risks.toString());
	5883	+ data.put("riskScor", highScoreResult.getScoreStr());
5886	5884
5887	5885	AntExChuQuery antExChuQuery = new AntExChuQuery();
5888	5886	antExChuQuery.setYn(YnEnums.YES.getId());
...	...	@@ -5894,7 +5892,7 @@
5894	5892	String platelet = "";
5895	5893	if (CollectionUtils.isNotEmpty(antExChuModels)) {
5896	5894	AntExChuModel an = antExChuModels.get(0);
5897		- hivkt = an.getHivkt() == null ? "" : (an.getHivkt().equals("yin") ? "阴性" : "阳性"); //FunvCommonUtil.checkYiGan(an.getHivkt());
	5895	+ hivkt = an.getHivkt() == null ? "" : (an.getHivkt().equals("yin") ? "阴性" : "阳性"); //FunvCommonUtil.checkYiGan(an.getHivkt());
5898	5896	xhdb = an.getXhdb() == null ? "" : an.getXhdb();
5899	5897	bxbjs = an.getBxbjs() == null ? "" : an.getBxbjs();
5900	5898	platelet = an.getPlatelet() == null ? "" : an.getPlatelet();

...	...	@@ -439,7 +439,7 @@
439	439	private List highRiskInfo;
440	440
441	441	//是否体弱 0 非高危 1高危
442		- private Integer weakSon;
	442	+ private String weakSon;
443	443
444	444	//体弱儿详情
445	445	private List weakSonInfo;
...	...	@@ -520,7 +520,6 @@
520	520	/*增加眼科检查项*/
521	521
522	522
523		-
524	523	public List getHighRiskInfo() {
525	524	return highRiskInfo;
526	525	}
527	526
...	...	@@ -529,11 +528,11 @@
529	528	this.highRiskInfo = highRiskInfo;
530	529	}
531	530
532		- public Integer getWeakSon() {
	531	+ public String getWeakSon() {
533	532	return weakSon;
534	533	}
535	534
536		- public void setWeakSon(Integer weakSon) {
	535	+ public void setWeakSon(String weakSon) {
537	536	this.weakSon = weakSon;
538	537	}
539	538