jiangjiazhi / regional-platform

Commit e06633c61cb03eaf9654e9bcce1d026f79303877

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

儿童建档

Showing 3 changed files with 69 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java

...	...	@@ -2506,6 +2506,46 @@
2506	2506	result.setExpVip(babyModel.getExpVip());
2507	2507	result.setMremark(babyModel.getMremark() == null ? "" : babyModel.getMremark());
2508	2508
	2509	+
	2510	+ result.setNbnaNum(babyModel.getNbnaNum());
	2511	+ result.setJxWn(babyModel.isJxWn());
	2512	+ result.setJxJzl(babyModel.isJxJzl());
	2513	+ result.setJxNpc(babyModel.isJxNpc());
	2514	+ result.setJxNjs(babyModel.isJxNjs());
	2515	+ result.setJxEl(babyModel.isJxEl());
	2516	+ result.setJxelSele(babyModel.getJxelSele());
	2517	+ result.setJxCl(babyModel.isJxCl());
	2518	+ result.setJxClSele(babyModel.getJxClSele());
	2519	+ result.setJxClhb(babyModel.isJxClhb());
	2520	+ result.setJxClhbSele(babyModel.getJxClhbSele());
	2521	+ result.setJxXe(babyModel.isJxXe());
	2522	+ result.setJxXeSele(babyModel.getJxXeSele());
	2523	+ result.setJxWe(babyModel.isJxWe());
	2524	+ result.setJxWeSele(babyModel.getJxWeSele());
	2525	+ result.setJxSdbs(babyModel.isJxSdbs());
	2526	+ result.setJxZcgm(babyModel.isJxZcgm());
	2527	+ result.setJxNdxl(babyModel.isJxNdxl());
	2528	+ result.setJxPwwf(babyModel.isJxPwwf());
	2529	+ result.setJxMtn(babyModel.isJxMtn());
	2530	+ result.setJxMtnSele(babyModel.getJxMtnSele());
	2531	+ result.setJxDz(babyModel.isJxDz());
	2532	+ result.setJxDzSele(babyModel.getJxDzSele());
	2533	+ result.setJxDc(babyModel.isJxDc());
	2534	+ result.setJxDcSele(babyModel.getJxDcSele());
	2535	+ result.setJxBz(babyModel.isJxBz());
	2536	+ result.setJxBzSele(babyModel.getJxBzSele());
	2537	+ result.setJxBc(babyModel.isJxBc());
	2538	+ result.setJxBcSele(babyModel.getJxBcSele());
	2539	+ result.setJxZtds(babyModel.isJxZtds());
	2540	+ result.setJxZtdsTopSele(babyModel.getJxZtdsTopSele());
	2541	+ result.setJxZtdsBottomSele(babyModel.getJxZtdsBottomSele());
	2542	+ result.setJxXtxe(babyModel.isJxXtxe());
	2543	+ result.setJxQpc(babyModel.isJxQpc());
	2544	+ result.setJxFl(babyModel.isJxFl());
	2545	+ result.setJxLtst(babyModel.isJxLtst());
	2546	+ result.setJxTszh(babyModel.isJxTszh());
	2547	+ result.setJxXtx(babyModel.isJxXtx());
	2548	+ result.setJxOther(babyModel.getJxOther());
2509	2549	}
2510	2550
2511	2551	result.setYn(babyModel.getYn());

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.enums.PatientSerEnums;
5	5	import com.lyms.platform.common.enums.ServiceStatusEnums;
6	6	import com.lyms.platform.common.enums.ServiceTypeEnums;
	7	+import com.lyms.platform.common.enums.YnEnums;
7	8	import com.lyms.platform.common.utils.DateUtil;
8	9	import com.lyms.platform.operate.web.result.PatientSerResult;
9	10	import com.lyms.platform.pojo.BabyModel;
...	...	@@ -140,6 +141,16 @@
140	141	//月龄
141	142	private String monthAge;
142	143
	144	+ private Integer dataStatus;
	145	+
	146	+ public Integer getDataStatus() {
	147	+ return dataStatus;
	148	+ }
	149	+
	150	+ public void setDataStatus(Integer dataStatus) {
	151	+ this.dataStatus = dataStatus;
	152	+ }
	153	+
143	154	public BabyEarBase(BabyModel babyModel) {
144	155	setFileCode(babyModel.getFileCode());
145	156	setBabyId(babyModel.getId());
...	...	@@ -234,6 +245,12 @@
234	245	babyModel.setFbirth(DateUtil.parseYMD(fbirth));
235	246	babyModel.setFproTypeId(fproTypeId);
236	247	babyModel.setFileCode(fileCode);
	248	+
	249	+ if (dataStatus != null && dataStatus == 1)
	250	+ {
	251	+ babyModel.setYn(YnEnums.YES.getId());
	252	+ }
	253	+
237	254	return babyModel;
238	255	}
239	256	public BabyEarBase() {

...	...	@@ -119,6 +119,10 @@
119	119	private Integer malformation;
120	120
121	121	/*畸形详情**/
	122	+
	123	+ //nbna评分(神经测定)
	124	+ private String nbnaNum;
	125	+
122	126	//无脑畸形
123	127	private boolean jxWn;
124	128	//脊柱裂
...	...	@@ -263,6 +267,14 @@
263	267
264	268	//显示服务信息
265	269	private List<PatientSerResult> patientSerResults;
	270	+
	271	+ public String getNbnaNum() {
	272	+ return nbnaNum;
	273	+ }
	274	+
	275	+ public void setNbnaNum(String nbnaNum) {
	276	+ this.nbnaNum = nbnaNum;
	277	+ }
266	278
267	279	public Integer getYn() {
268	280	return yn;