jiangjiazhi / regional-platform

Commit d05266b477ae5ff601670fd4fdd144b8c12c7a82

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

转诊单加入诊断结果信息

Showing 4 changed files with 27 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java

...	...	@@ -290,7 +290,7 @@
290	290	model.setHospitalId(hospitalId);
291	291	model.setOperator(userId);
292	292	antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId());
293		- //修改申请单状态
	293	+ //修改转诊申请单状态
294	294	updateApplyOrder(model, antExAddRequest.getParentId());
295	295
296	296	commonThreadPool.execute(new Runnable() {
...	...	@@ -447,6 +447,9 @@
447	447
448	448	ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
449	449	referralApplyOrderModel.setScore(NumberUtils.toInt(antenatalExamination.getRiskScore()));
	450	+ //其他诊断
	451	+ referralApplyOrderModel.setOtherDiagn(antenatalExamination.getOtherRisk());
	452	+ referralApplyOrderModel.setDiagnosis(antenatalExamination.getDiagnosis());
450	453	try {
451	454	List l = JsonUtil.toList(antenatalExamination.getRiskFactor(), List.class);
452	455	referralApplyOrderModel.setrRisk(queryRiskName(l));
...	...	@@ -624,6 +627,8 @@
624	627	model.setRecDoctor(antExChuModel.getProdDoctor());
625	628	model.setModified(new Date());
626	629	model.setStatus(2);
	630	+ model.setDiagnosis(antExChuModel.getDiagnosis());
	631	+ model.setOtherDiagn(antExChuModel.getDiagnosisOther());
627	632	applyOrderService.updateByParentId(referralApplyOrderQuery1, model);
628	633
629	634	ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery();
...	...	@@ -2563,7 +2568,7 @@
2563	2568	antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk());
2564	2569	}
2565	2570	} catch (Exception e) {
2566		-
	2571	+e.printStackTrace();
2567	2572	}
2568	2573	try {
2569	2574	if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
...	...	@@ -2571,6 +2576,7 @@
2571	2576	antexChuResult.setHighrisk(queryRisk(list1, false).getHighRisk());
2572	2577	}
2573	2578	} catch (Exception e) {
	2579	+ e.printStackTrace();
2574	2580	}
2575	2581	String doctorId = antExChuModel.getProdDoctor();
2576	2582	Map<String, String> map1 = new HashMap<>();
...	...	@@ -2639,7 +2645,7 @@
2639	2645	}
2640	2646
2641	2647
2642		- public HighScoreResult queryRisk(List<String> id, boolean n) {
	2648	+ public synchronized HighScoreResult queryRisk(List<String> id, boolean n) {
2643	2649	HighScoreResult highScoreResult = new HighScoreResult();
2644	2650	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
2645	2651	List data = new ArrayList();

...	...	@@ -464,6 +464,14 @@
464	464	referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
465	465	referralApplyOrderResult.setTransferredHospital(map1);
466	466
	467	+ try {
	468	+ if (StringUtils.isNotEmpty(list.get(0).getDiagnosis())) {
	469	+ List diagnosis = JsonUtil.toList(list.get(0).getDiagnosis(), List.class);
	470	+ referralApplyOrderResult.setDiagnosis(antenatalExaminationFacade.queryRisk(diagnosis, false).getHighRisk());
	471	+ }
	472	+ } catch (Exception e) {
	473	+ e.printStackTrace();
	474	+ }
467	475
468	476	Map map = new HashMap();
469	477	if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) {

1	1	package com.lyms.platform.operate.web.request;
2	2
	3	+import com.lyms.platform.common.utils.JsonUtil;
3	4	import com.lyms.platform.pojo.ReferralApplyOrderModel;
4	5
5	6	import java.util.List;
...	...	@@ -14,7 +15,7 @@
14	15	//高危风险因素
15	16	private List<String> rRisk;
16	17	//目前诊断
17		- private String diagnosis;
	18	+ private List diagnosis;
18	19	//其他诊断
19	20	private String otherDiagn;
20	21	//接收医生
21	22
...	...	@@ -44,11 +45,11 @@
44	45	this.rRisk = rRisk;
45	46	}
46	47
47		- public String getDiagnosis() {
	48	+ public List getDiagnosis() {
48	49	return diagnosis;
49	50	}
50	51
51		- public void setDiagnosis(String diagnosis) {
	52	+ public void setDiagnosis(List diagnosis) {
52	53	this.diagnosis = diagnosis;
53	54	}
54	55
...	...	@@ -68,7 +69,9 @@
68	69	public void convertToDataModel(ReferralApplyOrderModel referralApplyOrderModel) {
69	70	referralApplyOrderModel.setId(id);
70	71	referralApplyOrderModel.setrRisk(rRisk);
71		- referralApplyOrderModel.setDiagnosis(diagnosis);
	72	+ if (null != diagnosis) {
	73	+ referralApplyOrderModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
	74	+ }
72	75	referralApplyOrderModel.setOtherDiagn(otherDiagn);
73	76	referralApplyOrderModel.setRecDoctor(recDoctor);
74	77	}

...	...	@@ -69,15 +69,15 @@
69	69	//转入医院
70	70	private String zhuanRname;
71	71	//目前诊断
72		- private String diagnosis;
	72	+ private List diagnosis;
73	73	//其他诊断
74	74	private String otherDiagn;
75	75
76		- public String getDiagnosis() {
	76	+ public List getDiagnosis() {
77	77	return diagnosis;
78	78	}
79	79
80		- public void setDiagnosis(String diagnosis) {
	80	+ public void setDiagnosis(List diagnosis) {
81	81	this.diagnosis = diagnosis;
82	82	}
83	83
84	84
...	...	@@ -266,12 +266,9 @@
266	266	}
267	267
268	268	public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) {
269		- //目前诊断
270		- setDiagnosis(destModel.getDiagnosis());
271	269	//其他诊断
272	270	setOtherDiagn(destModel.getOtherDiagn());
273	271	setId(destModel.getId());
274		- setDiagnosis(destModel.getDiagnosis());
275	272	setDiseaseDesc(destModel.getDiseaseDesc());
276	273	setParentId(destModel.getParentId());
277	274	setName(destModel.getName());