jiangjiazhi / regional-platform

Commit b8d80334747f3b4786f9cf713aeda6111e4d8962

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 228 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.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/facade/BabyHighRiskBabyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java

...	...	@@ -189,6 +189,74 @@
189	189	private String opinion;
190	190	//备注
191	191	private String remarks;
	192	+ //既往患病情况
	193	+ private String jwbqk;
	194	+
	195	+ //转归状态 1 正常 2转诊3 拒转诊 4 失访 5死亡
	196	+ private Integer zgStatus;
	197	+
	198	+
	199	+ //评价方法
	200	+ /**
	201	+ * 1询问儿童近期患病、家庭养育情况
	202	+ 2身体检查
	203	+ 3体格生长监测与评价
	204	+ 4神经心理行为发育监测和评估
	205	+ 5特殊检查
	206	+ */
	207	+ private Integer evalMethod;
	208	+
	209	+ //处理
	210	+ /**
	211	+ * 1预见性指导
	212	+ 2早期干预
	213	+ 3转诊
	214	+ 4结案
	215	+ 5其他
	216	+ */
	217	+ private Integer handle;
	218	+ private String handleOther;
	219	+
	220	+ public Integer getEvalMethod() {
	221	+ return evalMethod;
	222	+ }
	223	+
	224	+ public void setEvalMethod(Integer evalMethod) {
	225	+ this.evalMethod = evalMethod;
	226	+ }
	227	+
	228	+ public Integer getHandle() {
	229	+ return handle;
	230	+ }
	231	+
	232	+ public void setHandle(Integer handle) {
	233	+ this.handle = handle;
	234	+ }
	235	+
	236	+ public String getHandleOther() {
	237	+ return handleOther;
	238	+ }
	239	+
	240	+ public void setHandleOther(String handleOther) {
	241	+ this.handleOther = handleOther;
	242	+ }
	243	+
	244	+ public String getJwbqk() {
	245	+ return jwbqk;
	246	+ }
	247	+
	248	+ public void setJwbqk(String jwbqk) {
	249	+ this.jwbqk = jwbqk;
	250	+ }
	251	+
	252	+ public Integer getZgStatus() {
	253	+ return zgStatus;
	254	+ }
	255	+
	256	+ public void setZgStatus(Integer zgStatus) {
	257	+ this.zgStatus = zgStatus;
	258	+ }
	259	+
192	260
193	261
194	262

...	...	@@ -92,6 +92,7 @@
92	92	// O("已接收", "2"),
93	93	// O1("建议转诊", "3"),
94	94	// O2("拒绝接收", "4");
	95	+// O2("已回转", "5");
95	96	private Integer status;
96	97	//转诊类型 1 儿童 2 孕妇
97	98	private Integer type;

...	...	@@ -2384,10 +2384,20 @@
2384	2384	List<ReferralApplyOrderModel> list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
2385	2385	if (CollectionUtils.isNotEmpty(list))
2386	2386	{
2387		- ReferralApplyOrderModel orderModel = list.get(0);
2388		- orderModel.setBackDate(DateUtil.parseYMD(applyOrderAddRequest.getBackDate()));
2389		- orderModel.setBackUserId(userId.toString());
2390		- applyOrderService.updateReferralApplyOrder(orderModel);
	2387	+ referralApplyOrderQuery = new ReferralApplyOrderQuery();
	2388	+ referralApplyOrderQuery.setPid(list.get(0).getPid());
	2389	+ list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	2390	+
	2391	+ if (CollectionUtils.isNotEmpty(list))
	2392	+ {
	2393	+ for (ReferralApplyOrderModel orderModel : list)
	2394	+ {
	2395	+ orderModel.setBackDate(DateUtil.parseYMD(applyOrderAddRequest.getBackDate()));
	2396	+ orderModel.setBackUserId(userId.toString());
	2397	+ orderModel.setStatus(5);
	2398	+ applyOrderService.updateReferralApplyOrder(orderModel);
	2399	+ }
	2400	+ }
2391	2401	}
2392	2402	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!");
2393	2403	}

...	...	@@ -167,6 +167,11 @@
167	167	model.setXss(request.getXss());
168	168	model.setOpinion(request.getOpinion());
169	169	model.setRemarks(request.getRemarks());
	170	+ model.setJwbqk(request.getJwbqk());
	171	+ model.setZgStatus(request.getZgStatus());
	172	+ model.setEvalMethod(request.getEvalMethod());
	173	+ model.setHandle(request.getHandle());
	174	+ model.setHandleOther(request.getHandleOther());
170	175
171	176	return model;
172	177	}

...	...	@@ -205,6 +205,72 @@
205	205	//备注
206	206	private String remarks;
207	207
	208	+ //既往患病情况
	209	+ private String jwbqk;
	210	+
	211	+ //转归状态 1 正常 2转诊3 拒转诊 4 失访 5死亡
	212	+ private Integer zgStatus;
	213	+ //评价方法
	214	+ /**
	215	+ * 1询问儿童近期患病、家庭养育情况
	216	+ 2身体检查
	217	+ 3体格生长监测与评价
	218	+ 4神经心理行为发育监测和评估
	219	+ 5特殊检查
	220	+ */
	221	+ private Integer evalMethod;
	222	+
	223	+ //处理
	224	+ /**
	225	+ * 1预见性指导
	226	+ 2早期干预
	227	+ 3转诊
	228	+ 4结案
	229	+ 5其他
	230	+ */
	231	+ private Integer handle;
	232	+ private String handleOther;
	233	+
	234	+ public Integer getEvalMethod() {
	235	+ return evalMethod;
	236	+ }
	237	+
	238	+ public void setEvalMethod(Integer evalMethod) {
	239	+ this.evalMethod = evalMethod;
	240	+ }
	241	+
	242	+ public Integer getHandle() {
	243	+ return handle;
	244	+ }
	245	+
	246	+ public void setHandle(Integer handle) {
	247	+ this.handle = handle;
	248	+ }
	249	+
	250	+ public String getHandleOther() {
	251	+ return handleOther;
	252	+ }
	253	+
	254	+ public void setHandleOther(String handleOther) {
	255	+ this.handleOther = handleOther;
	256	+ }
	257	+
	258	+ public String getJwbqk() {
	259	+ return jwbqk;
	260	+ }
	261	+
	262	+ public void setJwbqk(String jwbqk) {
	263	+ this.jwbqk = jwbqk;
	264	+ }
	265	+
	266	+ public Integer getZgStatus() {
	267	+ return zgStatus;
	268	+ }
	269	+
	270	+ public void setZgStatus(Integer zgStatus) {
	271	+ this.zgStatus = zgStatus;
	272	+ }
	273	+
208	274	public String getNumber() {
209	275	return number;
210	276	}

...	...	@@ -191,7 +191,73 @@
191	191	//备注
192	192	private String remarks;
193	193	private String riskCode;
	194	+ //既往患病情况
	195	+ private String jwbqk;
194	196
	197	+ //转归状态 1 正常 2转诊3 拒转诊 4 失访 5死亡
	198	+ private Integer zgStatus;
	199	+
	200	+ //评价方法
	201	+ /**
	202	+ * 1询问儿童近期患病、家庭养育情况
	203	+ 2身体检查
	204	+ 3体格生长监测与评价
	205	+ 4神经心理行为发育监测和评估
	206	+ 5特殊检查
	207	+ */
	208	+ private Integer evalMethod;
	209	+
	210	+ //处理
	211	+ /**
	212	+ * 1预见性指导
	213	+ 2早期干预
	214	+ 3转诊
	215	+ 4结案
	216	+ 5其他
	217	+ */
	218	+ private Integer handle;
	219	+ private String handleOther;
	220	+
	221	+ public Integer getEvalMethod() {
	222	+ return evalMethod;
	223	+ }
	224	+
	225	+ public void setEvalMethod(Integer evalMethod) {
	226	+ this.evalMethod = evalMethod;
	227	+ }
	228	+
	229	+ public Integer getHandle() {
	230	+ return handle;
	231	+ }
	232	+
	233	+ public void setHandle(Integer handle) {
	234	+ this.handle = handle;
	235	+ }
	236	+
	237	+ public String getHandleOther() {
	238	+ return handleOther;
	239	+ }
	240	+
	241	+ public void setHandleOther(String handleOther) {
	242	+ this.handleOther = handleOther;
	243	+ }
	244	+
	245	+ public String getJwbqk() {
	246	+ return jwbqk;
	247	+ }
	248	+
	249	+ public void setJwbqk(String jwbqk) {
	250	+ this.jwbqk = jwbqk;
	251	+ }
	252	+
	253	+ public Integer getZgStatus() {
	254	+ return zgStatus;
	255	+ }
	256	+
	257	+ public void setZgStatus(Integer zgStatus) {
	258	+ this.zgStatus = zgStatus;
	259	+ }
	260	+
195	261	public String getRiskCode() {
196	262	return riskCode;
197	263	}
...	...	@@ -1030,6 +1096,14 @@
1030	1096	setXss(destModel.getXss());
1031	1097	setOpinion(destModel.getOpinion());
1032	1098	setRemarks(destModel.getRemarks());
	1099	+ setJwbqk(destModel.getJwbqk());
	1100	+
	1101	+ setZgStatus(destModel.getZgStatus());
	1102	+
	1103	+ setEvalMethod(destModel.getEvalMethod());
	1104	+ setHandle(destModel.getHandle());
	1105	+ setHandleOther(destModel.getHandleOther());
	1106	+
1033	1107	} catch (Exception e) {
1034	1108	e.printStackTrace();
1035	1109	}