jiangjiazhi / regional-platform

Commit 06b89b934f44a8da91c35b1eb4061646b3d1fdd0

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Merge branch 'master' of E:\mycelipse_workspace\longmei\regional-platform with conflicts.

Showing 3 changed files with 69 additions and 55 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java

...	...	@@ -204,7 +204,7 @@
204	204	4神经心理行为发育监测和评估
205	205	5特殊检查
206	206	*/
207		- private Integer evalMethod;
	207	+ private List<Integer> evalMethod;
208	208
209	209	//处理
210	210	/**
211	211
212	212
213	213
214	214
...	...	@@ -214,22 +214,22 @@
214	214	4结案
215	215	5其他
216	216	*/
217		- private Integer handle;
	217	+ private List<Integer> handle;
218	218	private String handleOther;
219	219
220		- public Integer getEvalMethod() {
	220	+ public List<Integer> getEvalMethod() {
221	221	return evalMethod;
222	222	}
223	223
224		- public void setEvalMethod(Integer evalMethod) {
	224	+ public void setEvalMethod(List<Integer> evalMethod) {
225	225	this.evalMethod = evalMethod;
226	226	}
227	227
228		- public Integer getHandle() {
	228	+ public List<Integer> getHandle() {
229	229	return handle;
230	230	}
231	231
232		- public void setHandle(Integer handle) {
	232	+ public void setHandle(List<Integer> handle) {
233	233	this.handle = handle;
234	234	}
235	235

...	...	@@ -62,9 +62,8 @@
62	62	@Autowired
63	63	private BasicConfigService basicConfigService;
64	64
	65	+
65	66	@Autowired
66		- private MongoTemplate mongoTemplate;
67		- @Autowired
68	67	private ApplyOrderService applyOrderService;
69	68
70	69	/**
...	...	@@ -293,7 +292,6 @@
293	292	}
294	293	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
295	294	}
296		-
297	295	/**
298	296	* 新增高危儿专科
299	297	*/
...	...	@@ -314,7 +312,7 @@
314	312	operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "高危儿专科检查");
315	313	try {
316	314	//添加检查后更新转诊接受状态
317		- babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(), hospitalId, "gwer");
	315	+ babyDepartmentReferralFacade.setAcceptStatus(model.getBuildId(),hospitalId,"gwer");
318	316	} catch (Exception e) {
319	317	e.printStackTrace();
320	318	}
...	...	@@ -333,7 +331,7 @@
333	331	public BaseResponse update(BabyHighRiskBabyRequest request, Integer userId) {
334	332	//当前登录人医院Id
335	333	String hospitalId = autoMatchFacade.getHospitalId(userId);
336		- if (StringUtils.isEmpty(request.getId())) {
	334	+ if(StringUtils.isEmpty(request.getId())){
337	335	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("ID不能为空");
338	336	}
339	337	BabyHighRiskBabyModel model = getBabyHighRiskBabyModel(request);
...	...	@@ -375,7 +373,7 @@
375	373	BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
376	374	BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
377	375	highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
378		- if (StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
	376	+ if(StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
379	377	&& StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
380	378	&& StringUtils.isEmpty(babyHighRiskBabyModel.getXhdb())
381	379	&& StringUtils.isEmpty(babyHighRiskBabyModel.getXzcc())
382	380
...	...	@@ -383,13 +381,13 @@
383	381	&& StringUtils.isEmpty(babyHighRiskBabyModel.getTlhc())
384	382	&& StringUtils.isEmpty(babyHighRiskBabyModel.getZhipJoint())
385	383	&& StringUtils.isEmpty(babyHighRiskBabyModel.getYhipJoint())
386		- && babyHighRiskBabyModel.getNdt() == null) {
	384	+ && babyHighRiskBabyModel.getNdt()==null ){
387	385	highRiskBabyResult.setFzjcState("1");
388	386	}
389	387
390	388	String bregma = "";
391	389	String bregmaValue = "";
392		- if (babyHighRiskBabyModel.getBregma() != null) {
	390	+ if (babyHighRiskBabyModel.getBregma()!=null) {
393	391	Map map = babyHighRiskBabyModel.getBregma();
394	392	String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
395	393	if ("yes".equals(yesOrNo)) {
...	...	@@ -405,6 +403,10 @@
405	403	highRiskBabyResult.setBregmaValue(bregmaValue);
406	404
407	405
	406	+
	407	+
	408	+
	409	+
408	410	if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCheckDoctor())) {
409	411	Users users = usersService.getUsers(NumberUtils.toInt(babyHighRiskBabyModel.getCheckDoctor()));
410	412	if (users != null && StringUtils.isNotEmpty(users.getName())) {
...	...	@@ -429,6 +431,7 @@
429	431	}
430	432
431	433
	434	+
432	435	/**
433	436	* 根据id,高危儿专科，编辑使用
434	437	*/
435	438
...	...	@@ -576,7 +579,12 @@
576	579	babyQuery.setBirthEnd(babyQuery.getBirthEnd());
577	580	} else {
578	581	babyQuery.setBirthEnd(start);
	582	+ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -babyQuery.getMonthEnd() - 1), 1);
	583	+ babyQuery.setBirthStart(end);
579	584	}
	585	+ if (babyQuery.getBirthEnd() != null) {
	586	+ babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd()));
	587	+ }
580	588
581	589	} else if (null != babyQuery.getMonthStart() && null != babyQuery.getMonthEnd()) {
582	590	Date start = DateUtil.addMonth(currentDate, -babyQuery.getMonthStart());
583	591
584	592
585	593
586	594
587	595
588	596
589	597
590	598
591	599
592	600
593	601
594	602
595	603
...	...	@@ -744,64 +752,68 @@
744	752
745	753	public BaseResponse queryBabyRiskPrint(String id) {
746	754
747		- Map <String, Object> data = new HashMap <>();
	755	+ Map<String,Object> data = new HashMap<>();
748	756	BabyModel babyModel = babyService.getOneBabyById(id);
749		- data.put("babyName", babyModel.getName());
750		- data.put("babySex", babyModel.getSex());
751		- data.put("babyBirth", DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
	757	+ data.put("babyName",babyModel.getName());
	758	+ data.put("babySex",babyModel.getSex());
	759	+ data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
752	760	BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery = new BabyHighRiskBabyModelQuery();
753	761	babyHighRiskBabyModelQuery.setYn(YnEnums.YES.getId());
754	762	babyHighRiskBabyModelQuery.setBuildId(id);
755	763	babyHighRiskBabyModelQuery.setSort("checkDate");
756	764	//查询高危儿专科的检查记录
757		- List <BabyHighRiskBabyModel> checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery);
758		- if (CollectionUtils.isNotEmpty(checkModels)) {
	765	+ List <BabyHighRiskBabyModel> checkModels = babyHighRiskBabyService.queryOne(babyHighRiskBabyModelQuery);
	766	+ if (CollectionUtils.isNotEmpty(checkModels))
	767	+ {
759	768	BabyHighRiskBabyModel riskBabyModel = checkModels.get(checkModels.size() - 1);
760		- data.put("number", riskBabyModel.getNumber());
761		- data.put("manageDate", DateUtil.getyyyy_MM_dd(riskBabyModel.getCheckDate()));
	769	+ data.put("number",riskBabyModel.getNumber());
	770	+ data.put("manageDate",DateUtil.getyyyy_MM_dd(riskBabyModel.getCheckDate()));
762	771
763	772	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
764	773	referralApplyOrderQuery.setParentId(id);
765		- List <ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	774	+ List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
766	775	String referraHospital = "";
767		- if (CollectionUtils.isNotEmpty(list)) {
	776	+ if (CollectionUtils.isNotEmpty(list))
	777	+ {
768	778	ReferralApplyOrderModel orderModel = list.get(0);
769	779	referraHospital = organizationService.getOrganization(Integer.parseInt(orderModel.getTransferredHospital())).getName();
770	780	}
771		- data.put("referraHospital", referraHospital);
772		- data.put("jwbqk", riskBabyModel.getJwbqk());
	781	+ data.put("referraHospital",referraHospital);
	782	+ data.put("jwbqk",riskBabyModel.getJwbqk());
773	783
774	784	BabyHighRiskBabyModel riskBabyModel1 = checkModels.get(0);
775		- data.put("zgStatus", riskBabyModel1.getZgStatus());
776		- data.put("closeDate", DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate()));
	785	+ data.put("zgStatus",riskBabyModel1.getZgStatus());
	786	+ data.put("closeDate",DateUtil.getyyyy_MM_dd(riskBabyModel1.getcCDate()));
777	787
778		- String diagnoseValue = getHighRiskDiagnoseStr(riskBabyModel) + riskBabyModel.getHighRiskQt() == null ? "" : riskBabyModel.getHighRiskQt();
	788	+ String diagnoseValue = getHighRiskDiagnoseStr(riskBabyModel)+riskBabyModel.getHighRiskQt() == null ? "" : riskBabyModel.getHighRiskQt();
779	789
780		- data.put("diagnoseValue", diagnoseValue);
	790	+ data.put("diagnoseValue",diagnoseValue);
781	791
782		- List <Map> fzDatas = new LinkedList <>();
	792	+ List<Map> fzDatas = new LinkedList<>();
783	793
784		- for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels) {
785		- if ("fz".equals(babyHighRiskBabyModel.getCzOrfzProject())) {
	794	+ for (BabyHighRiskBabyModel babyHighRiskBabyModel : checkModels)
	795	+ {
	796	+ if ("fz".equals(babyHighRiskBabyModel.getCzOrfzProject()))
	797	+ {
786	798	Map fzData = new HashMap();
787		- fzData.put("evalMethod", babyHighRiskBabyModel.getEvalMethod());
788		- fzData.put("weight", babyHighRiskBabyModel.getWeight());
789		- fzData.put("height", babyHighRiskBabyModel.getHeight());
	799	+ fzData.put("evalMethod",babyHighRiskBabyModel.getEvalMethod());
	800	+ fzData.put("weight",babyHighRiskBabyModel.getWeight());
	801	+ fzData.put("height",babyHighRiskBabyModel.getHeight());
790	802	fzData.put("head", babyHighRiskBabyModel.getHead());
791	803	fzData.put("handle", babyHighRiskBabyModel.getHandle());
792	804	fzData.put("handleOther", babyHighRiskBabyModel.getHandleOther());
793	805	StringBuffer exection = new StringBuffer();
794	806
795		- handleExecption(babyHighRiskBabyModel.getSkin(), exection);
796		- handleExecption(babyHighRiskBabyModel.getWg(), exection);
797		- handleExecption(babyHighRiskBabyModel.getTooth(), exection);
798		- handleExecption(babyHighRiskBabyModel.getHeart(), exection);
799		- handleExecption(babyHighRiskBabyModel.getLung(), exection);
800		- handleExecption(babyHighRiskBabyModel.getAbdomen(), exection);
801		- handleExecption(babyHighRiskBabyModel.getWszq(), exection);
802		- handleExecption(babyHighRiskBabyModel.getJzsz(), exection);
803		- handleExecption(babyHighRiskBabyModel.getSjxtjc(), exection);
804		- handleExecption(babyHighRiskBabyModel.getXlxwfy(), exection);
	807	+ handleExecption(babyHighRiskBabyModel.getSkin(),exection);
	808	+ handleExecption(babyHighRiskBabyModel.getWg(),exection);
	809	+ handleExecption(babyHighRiskBabyModel.getTooth(),exection);
	810	+ handleExecption(babyHighRiskBabyModel.getHeart(),exection);
	811	+ handleExecption(babyHighRiskBabyModel.getLung(),exection);
	812	+ handleExecption(babyHighRiskBabyModel.getAbdomen(),exection);
	813	+ handleExecption(babyHighRiskBabyModel.getWszq(),exection);
	814	+ handleExecption(babyHighRiskBabyModel.getJzsz(),exection);
	815	+ handleExecption(babyHighRiskBabyModel.getSjxtjc(),exection);
	816	+ handleExecption(babyHighRiskBabyModel.getXlxwfy(),exection);
805	817
806	818	fzData.put("exception", "".equals(exection.toString()) ? null : exection.toString());
807	819
808	820
...	...	@@ -814,13 +826,15 @@
814	826	}
815	827	}
816	828
817		- data.put("fzDatas", fzDatas);
	829	+ data.put("fzDatas",fzDatas);
818	830	}
819	831	return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
820	832	}
821	833
822		- private void handleExecption(String value, StringBuffer sb) {
823		- if (value != null && !"未见异常".equals(value)) {
	834	+ private void handleExecption(String value,StringBuffer sb)
	835	+ {
	836	+ if (value != null && !"未见异常".equals(value))
	837	+ {
824	838	sb.append(value);
825	839	sb.append(" ");
826	840	}

...	...	@@ -218,7 +218,7 @@
218	218	4神经心理行为发育监测和评估
219	219	5特殊检查
220	220	*/
221		- private Integer evalMethod;
	221	+ private List<Integer> evalMethod;
222	222
223	223	//处理
224	224	/**
225	225
226	226
227	227
228	228
...	...	@@ -228,22 +228,22 @@
228	228	4结案
229	229	5其他
230	230	*/
231		- private Integer handle;
	231	+ private List<Integer> handle;
232	232	private String handleOther;
233	233
234		- public Integer getEvalMethod() {
	234	+ public List<Integer> getEvalMethod() {
235	235	return evalMethod;
236	236	}
237	237
238		- public void setEvalMethod(Integer evalMethod) {
	238	+ public void setEvalMethod(List<Integer> evalMethod) {
239	239	this.evalMethod = evalMethod;
240	240	}
241	241
242		- public Integer getHandle() {
	242	+ public List<Integer> getHandle() {
243	243	return handle;
244	244	}
245	245
246		- public void setHandle(Integer handle) {
	246	+ public void setHandle(List<Integer> handle) {
247	247	this.handle = handle;
248	248	}
249	249