jiangjiazhi / regional-platform

Commit 24bea4f7e65de501fe67eb162561d75221b42ca5

Authored by wtt about 4 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 94 additions and 55 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyHighRiskBabyService.java
platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java

...	...	@@ -53,7 +53,7 @@
53	53	babyQuery.mysqlBuild((int)count(babyQuery.convertToQuery().convertToMongoQuery()));
54	54	query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
55	55	}
56		- query.addOrder(Sort.Direction.DESC, babyQuery.getSort());// Sort "createDate"
	56	+ query.addOrder(Sort.Direction.DESC, StringUtils.isEmpty(babyQuery.getSort()) ? "createDate": babyQuery.getSort());// Sort "createDate"
57	57	return find(query.convertToMongoQuery());
58	58	}
59	59

...	...	@@ -73,6 +73,9 @@
73	73
74	74	private String riskCode;
75	75
	76	+ //高危儿编号
	77	+ private String number;
	78	+
76	79	public String getRiskCode() {
77	80	return riskCode;
78	81	}
...	...	@@ -187,6 +190,14 @@
187	190	this.hospitalId = hospitalId;
188	191	}
189	192
	193	+ public String getNumber() {
	194	+ return number;
	195	+ }
	196	+
	197	+ public void setNumber(String number) {
	198	+ this.number = number;
	199	+ }
	200	+
190	201	public Integer getMonthStart() {
191	202	return monthStart;
192	203	}
...	...	@@ -340,6 +351,9 @@
340	351	}
341	352	if (StringUtils.isNotEmpty(czOrfzProject)) {
342	353	condition = condition.and("czOrfzProject", czOrfzProject, MongoOper.IS);
	354	+ }
	355	+ if (StringUtils.isNotEmpty(number)) {
	356	+ condition = condition.and("number", number, MongoOper.IS);
343	357	}
344	358	Criteria c = null;
345	359	//月龄

...	...	@@ -30,6 +30,8 @@
30	30	import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
31	31	import org.springframework.data.mongodb.core.aggregation.AggregationResults;
32	32	import org.springframework.data.mongodb.core.query.Criteria;
	33	+import org.springframework.data.mongodb.core.query.Query;
	34	+import org.springframework.data.mongodb.core.query.Update;
33	35	import org.springframework.stereotype.Component;
34	36
35	37	import java.util.*;
36	38
...	...	@@ -146,10 +148,8 @@
146	148	model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
147	149	model.setCaseClosed(request.getCaseClosed());
148	150	model.setcCDate(DateUtil.parseYMD(request.getcCDate()));
149		- if ("fz".equals(model.getCzOrfzProject()) && StringUtils.isEmpty(request.getId())) {
150		- model.setNumber(request.getNumber());
151		- }
152	151
	152	+
153	153	model.setHighRiskDiagnose(request.getHighRiskDiagnose());
154	154	model.setHighRiskQt(request.getHighRiskQt());
155	155	model.setZyh(request.getZyh());
156	156
157	157
158	158
159	159
...	...	@@ -295,25 +295,25 @@
295	295	}
296	296	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
297	297	}
	298	+
298	299	/**
299	300	* 新增高危儿专科
300	301	*/
301	302	public BaseResponse add(BabyHighRiskBabyRequest request, Integer userId) {
	303	+ BaseObjectResponse br = new BaseObjectResponse();
302	304
303	305	String hospitalId = autoMatchFacade.getHospitalId(userId);
304		-
305	306	BabyHighRiskBabyModel model = getBabyHighRiskBabyModel(request);
306	307	model.setCreateDate(new Date());
307	308	model.setHospitalId(hospitalId);
308	309
309	310	if ("cz".equals(model.getCzOrfzProject()) && StringUtils.isEmpty(request.getId())) {
310	311	//页面填写了就采用页面的编号
311		- if (StringUtils.isNotEmpty(request.getNumber()))
312		- {
	312	+ if (StringUtils.isNotEmpty(request.getNumber())) {
	313	+ //手动输入避免重复
	314	+ if (isRepeat(request, br, hospitalId)) return br;
313	315	model.setNumber(request.getNumber());
314		- }
315		- else
316		- {
	316	+ } else {
317	317	model.setNumber(getYeaNumberUtil(hospitalId));
318	318	}
319	319	}
320	320
321	321
...	...	@@ -323,12 +323,12 @@
323	323	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "高危儿专科检查");
324	324	try {
325	325	//添加检查后更新转诊接受状态
326		- babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(),hospitalId,"gwer");
	326	+ babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(), hospitalId, "gwer");
327	327	} catch (Exception e) {
328	328	e.printStackTrace();
329	329	}
	330	+
330	331	}
331		- BaseObjectResponse br = new BaseObjectResponse();
332	332	br.setErrorcode(ErrorCodeConstants.SUCCESS);
333	333	br.setErrormsg("成功");
334	334	br.setData(model.getId());
335	335
336	336
337	337
338	338
339	339
...	...	@@ -340,23 +340,56 @@
340	340	* 更新高危儿专科
341	341	*/
342	342	public BaseResponse update(BabyHighRiskBabyRequest request, Integer userId) {
	343	+ BaseObjectResponse br = new BaseObjectResponse();
	344	+
343	345	//当前登录人医院Id
344	346	String hospitalId = autoMatchFacade.getHospitalId(userId);
345		- if(StringUtils.isEmpty(request.getId())){
	347	+ if (StringUtils.isEmpty(request.getId())) {
346	348	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("ID不能为空");
347	349	}
348	350	BabyHighRiskBabyModel model = getBabyHighRiskBabyModel(request);
349		- BabyHighRiskBabyModel models = babyHighRiskBabyService.queryById(request.getId());
	351	+ /* if ("fz".equals(model.getCzOrfzProject()) && StringUtils.isEmpty(request.getId())) {
	352	+ if (isRepeat(request, br, hospitalId)) return br;
	353	+ model.setNumber(request.getNumber());
	354	+ }*/
	355	+ //初诊修改，手动输入避免重复
	356	+ if ("cz".equals(model.getCzOrfzProject()) && StringUtils.isNotEmpty(request.getId()) && StringUtils.isNotEmpty(request.getNumber())) {
	357	+ if (isRepeat(request, br, hospitalId)) return br;
	358	+ model.setNumber(request.getNumber());
	359	+ }
350	360
	361	+ BabyHighRiskBabyModel models = babyHighRiskBabyService.queryById(request.getId());
351	362	if (models != null && models.getId() != null) {
352	363	babyHighRiskBabyService.update(model, request.getId());
353	364	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "高危儿专科检查");
	365	+
	366	+ if ("cz".equals(model.getCzOrfzProject()) && StringUtils.isNotEmpty(model.getBuildId()) && StringUtils.isNotEmpty(model.getNumber())) {
	367	+ Update up = new Update();
	368	+ up.set("number", model.getNumber());
	369	+ mongoTemplate.updateMulti(Query.query(Criteria.where("buildId").is(model.getBuildId())
	370	+ .and("mphone").is(model.getMphone()).and("czOrfzProject").is("fz")), up, BabyHighRiskBabyModel.class);
	371	+ }
354	372	}
355	373	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
356	374
357	375
358	376	}
359	377
	378	+ private boolean isRepeat(BabyHighRiskBabyRequest request, BaseObjectResponse br, String hospitalId) {
	379	+ BabyHighRiskBabyModelQuery babyQuery = new BabyHighRiskBabyModelQuery();
	380	+ babyQuery.setNumber(request.getNumber());
	381	+ babyQuery.setYn(YnEnums.YES.getId());
	382	+ babyQuery.setHospitalId(hospitalId);
	383	+ //babyQuery.setCzOrfzProject("cz");
	384	+ List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery);
	385	+ if (CollectionUtils.isNotEmpty(babyHighRiskBabyModelList)) {
	386	+ br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	387	+ br.setErrormsg("编号已存在");
	388	+ return true;
	389	+ }
	390	+ return false;
	391	+ }
	392	+
360	393	/**
361	394	* 删除高危儿专科
362	395	*
...	...	@@ -384,7 +417,7 @@
384	417	BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
385	418	BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
386	419	highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
387		- if(StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
	420	+ if (StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
388	421	&& StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
389	422	&& StringUtils.isEmpty(babyHighRiskBabyModel.getXhdb())
390	423	&& StringUtils.isEmpty(babyHighRiskBabyModel.getXzcc())
391	424
...	...	@@ -392,13 +425,13 @@
392	425	&& StringUtils.isEmpty(babyHighRiskBabyModel.getTlhc())
393	426	&& StringUtils.isEmpty(babyHighRiskBabyModel.getZhipJoint())
394	427	&& StringUtils.isEmpty(babyHighRiskBabyModel.getYhipJoint())
395		- && babyHighRiskBabyModel.getNdt()==null ){
	428	+ && babyHighRiskBabyModel.getNdt() == null) {
396	429	highRiskBabyResult.setFzjcState("1");
397	430	}
398	431
399	432	String bregma = "";
400	433	String bregmaValue = "";
401		- if (babyHighRiskBabyModel.getBregma()!=null) {
	434	+ if (babyHighRiskBabyModel.getBregma() != null) {
402	435	Map map = babyHighRiskBabyModel.getBregma();
403	436	String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
404	437	if ("yes".equals(yesOrNo)) {
405	438
...	...	@@ -659,12 +692,12 @@
659	692	}
660	693	String number = "0";
661	694	BabyHighRiskBabyModel babyHighRiskBabyModel = mappedResults.get(0);
662		- if (babyHighRiskBabyModel != null && babyHighRiskBabyModel.getNumber().length() > 4) {
	695	+ if (babyHighRiskBabyModel != null && babyHighRiskBabyModel.getNumber().length() > 4) {
663	696	number = babyHighRiskBabyModel.getNumber();
664	697	number = number.substring(4, number.length());//20201
665	698	number = DateUtil.getYeaNumber(number);
666	699	return number;
667		- }else {
	700	+ } else {
668	701	number = DateUtil.getYeaNumber(number);
669	702	}
670	703	return number;
671	704
672	705
673	706
674	707
675	708
676	709
677	710
678	711
...	...	@@ -763,48 +796,42 @@
763	796
764	797	public BaseResponse queryBabyRiskPrint(String id) {
765	798
766		- Map<String,Object> data = new HashMap<>();
	799	+ Map <String, Object> data = new HashMap <>();
767	800	BabyModel babyModel = babyService.getOneBabyById(id);
768		- data.put("babyName",babyModel.getName());
	801	+ data.put("babyName", babyModel.getName());
769	802	data.put("babySex", SexEnum.getTextById(babyModel.getSex()));
770		- data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
	803	+ data.put("babyBirth", DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
771	804	BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery = new BabyHighRiskBabyModelQuery();
772	805	babyHighRiskBabyModelQuery.setYn(YnEnums.YES.getId());
773	806	babyHighRiskBabyModelQuery.setBuildId(id);
774	807	babyHighRiskBabyModelQuery.setSort("checkDate");
775	808	//查询高危儿专科的检查记录
776		- List <BabyHighRiskBabyModel> checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery);
777		- if (CollectionUtils.isNotEmpty(checkModels))
778		- {
779		- List<Map> fzDatas = new LinkedList<>();
780		- for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels)
781		- {
782		- if ("cz".equals(babyHighRiskBabyModel.getCzOrfzProject()))
783		- {
784		- data.put("number",babyHighRiskBabyModel.getNumber());
785		- data.put("manageDate",DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate()));
	809	+ List <BabyHighRiskBabyModel> checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery);
	810	+ if (CollectionUtils.isNotEmpty(checkModels)) {
	811	+ List <Map> fzDatas = new LinkedList <>();
	812	+ for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels) {
	813	+ if ("cz".equals(babyHighRiskBabyModel.getCzOrfzProject())) {
	814	+ data.put("number", babyHighRiskBabyModel.getNumber());
	815	+ data.put("manageDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate()));
786	816
787	817	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
788	818	referralApplyOrderQuery.setParentId(id);
789		- List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	819	+ List <ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
790	820	String referraHospital = "";
791		- if (CollectionUtils.isNotEmpty(list))
792		- {
	821	+ if (CollectionUtils.isNotEmpty(list)) {
793	822	ReferralApplyOrderModel orderModel = list.get(0);
794	823	referraHospital = organizationService.getOrganization(Integer.parseInt(orderModel.getTransferredHospital())).getName();
795	824	}
796		- data.put("referraHospital",referraHospital);
797		- data.put("jwbqk",babyHighRiskBabyModel.getJwbqk());
	825	+ data.put("referraHospital", referraHospital);
	826	+ data.put("jwbqk", babyHighRiskBabyModel.getJwbqk());
798	827
799		- String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel)+(babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " "+ babyHighRiskBabyModel.getHighRiskQt());
800		- data.put("diagnoseValue",diagnoseValue);
801		- }
802		- else
803		- {
	828	+ String diagnoseValue = getHighRiskDiagnoseStr(babyHighRiskBabyModel) + (babyHighRiskBabyModel.getHighRiskQt() == null ? "" : " " + babyHighRiskBabyModel.getHighRiskQt());
	829	+ data.put("diagnoseValue", diagnoseValue);
	830	+ } else {
804	831	Map fzData = new HashMap();
805		- fzData.put("evalMethod",babyHighRiskBabyModel.getEvalMethod());
806		- fzData.put("weight",babyHighRiskBabyModel.getWeight());
807		- fzData.put("height",babyHighRiskBabyModel.getHeight());
	832	+ fzData.put("evalMethod", babyHighRiskBabyModel.getEvalMethod());
	833	+ fzData.put("weight", babyHighRiskBabyModel.getWeight());
	834	+ fzData.put("height", babyHighRiskBabyModel.getHeight());
808	835	fzData.put("head", babyHighRiskBabyModel.getHead());
809	836	fzData.put("handle", babyHighRiskBabyModel.getHandle());
810	837	fzData.put("handleOther", babyHighRiskBabyModel.getHandleOther());
811	838
...	...	@@ -815,13 +842,13 @@
815	842	handleExecption(babyHighRiskBabyModel.getXf(), exection);
816	843	// handleExecption(babyHighRiskBabyModel.getSkin(), exection);
817	844	handleExecption(babyHighRiskBabyModel.getWg(), exection);
818		- handleExecption(babyHighRiskBabyModel.getTooth(),exection);
	845	+ handleExecption(babyHighRiskBabyModel.getTooth(), exection);
819	846	// handleExecption(babyHighRiskBabyModel.getHeart(),exection);
820	847	handleExecption(babyHighRiskBabyModel.getLung(), exection);
821	848	handleExecption(babyHighRiskBabyModel.getAbdomen(), exection);
822	849	handleExecption(babyHighRiskBabyModel.getWszq(), exection);
823		- handleExecption(babyHighRiskBabyModel.getJzsz(),exection);
824		- handleExecption(babyHighRiskBabyModel.getSjxtjc(),exection);
	850	+ handleExecption(babyHighRiskBabyModel.getJzsz(), exection);
	851	+ handleExecption(babyHighRiskBabyModel.getSjxtjc(), exection);
825	852	handleExecption(babyHighRiskBabyModel.getXlxwfy(), exection);
826	853
827	854	fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString());
828	855
829	856
...	...	@@ -829,21 +856,19 @@
829	856	fzData.put("checkDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getCheckDate()));
830	857	fzData.put("age", DateUtil.getBabyMonthAge(babyHighRiskBabyModel.getBirthday(), babyHighRiskBabyModel.getCheckDate()));
831	858	fzData.put("checkDoctor", usersService.getUsers(Integer.parseInt(babyHighRiskBabyModel.getCheckDoctor())).getName());
832		- data.put("zgStatus",babyHighRiskBabyModel.getZgStatus());
833		- data.put("closeDate",DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getcCDate()));
	859	+ data.put("zgStatus", babyHighRiskBabyModel.getZgStatus());
	860	+ data.put("closeDate", DateUtil.getyyyy_MM_dd(babyHighRiskBabyModel.getcCDate()));
834	861	fzDatas.add(fzData);
835	862	}
836	863	}
837	864
838		- data.put("fzDatas",fzDatas);
	865	+ data.put("fzDatas", fzDatas);
839	866	}
840	867	return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
841	868	}
842	869
843		- private void handleExecption(String value,StringBuffer sb)
844		- {
845		- if (value != null && !"未见异常".equals(value))
846		- {
	870	+ private void handleExecption(String value, StringBuffer sb) {
	871	+ if (value != null && !"未见异常".equals(value)) {
847	872	sb.append(value);
848	873	sb.append(" ");
849	874	}