jiangjiazhi / regional-platform

Commit 3051c786e523b8fde437718cd8bb55eea6042a79

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

产检增加字段

Showing 6 changed files with 140 additions and 15 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java

...	...	@@ -344,8 +344,14 @@
344	344	private String abo ;
345	345	// rh
346	346	private String rh ;
347		- // 血糖
	347	+ // 血糖1
348	348	private String bloodSugar;
	349	+ // 血糖2
	350	+ private String bloodSugar2;
	351	+ // 血糖3
	352	+ private String bloodSugar3;
	353	+ // 血糖4
	354	+ private String bloodSugar4;
349	355	//B超
350	356	private String bChao ;
351	357	//胎数
...	...	@@ -552,6 +558,29 @@
552	558	this.placentas = placentas;
553	559	}
554	560
	561	+ public String getBloodSugar2() {
	562	+ return bloodSugar2;
	563	+ }
	564	+
	565	+ public void setBloodSugar2(String bloodSugar2) {
	566	+ this.bloodSugar2 = bloodSugar2;
	567	+ }
	568	+
	569	+ public String getBloodSugar3() {
	570	+ return bloodSugar3;
	571	+ }
	572	+
	573	+ public void setBloodSugar3(String bloodSugar3) {
	574	+ this.bloodSugar3 = bloodSugar3;
	575	+ }
	576	+
	577	+ public String getBloodSugar4() {
	578	+ return bloodSugar4;
	579	+ }
	580	+
	581	+ public void setBloodSugar4(String bloodSugar4) {
	582	+ this.bloodSugar4 = bloodSugar4;
	583	+ }
555	584
556	585	public String getTireNumber1() {
557	586	return tireNumber1;

...	...	@@ -70,6 +70,12 @@
70	70	private String bChao;
71	71	//血糖
72	72	private String bloodSugar;
	73	+ // 血糖2
	74	+ private String bloodSugar2;
	75	+ // 血糖3
	76	+ private String bloodSugar3;
	77	+ // 血糖4
	78	+ private String bloodSugar4;
73	79	//高危因素
74	80	private String riskFactor;
75	81	// 高危评分
...	...	@@ -102,6 +108,30 @@
102	108	private String cDueWeek;
103	109	//操作人
104	110	private Integer operator;
	111	+
	112	+ public String getBloodSugar2() {
	113	+ return bloodSugar2;
	114	+ }
	115	+
	116	+ public void setBloodSugar2(String bloodSugar2) {
	117	+ this.bloodSugar2 = bloodSugar2;
	118	+ }
	119	+
	120	+ public String getBloodSugar3() {
	121	+ return bloodSugar3;
	122	+ }
	123	+
	124	+ public void setBloodSugar3(String bloodSugar3) {
	125	+ this.bloodSugar3 = bloodSugar3;
	126	+ }
	127	+
	128	+ public String getBloodSugar4() {
	129	+ return bloodSugar4;
	130	+ }
	131	+
	132	+ public void setBloodSugar4(String bloodSugar4) {
	133	+ this.bloodSugar4 = bloodSugar4;
	134	+ }
105	135
106	136	public String getDiagnosisOther() {
107	137	return diagnosisOther;

...	...	@@ -641,6 +641,10 @@
641	641	//孕妇基本信息
642	642	map.put("id",data.getId());
643	643	map.put("diagnosisOther",data.getDiagnosisOther());
	644	+ map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
	645	+ map.put("bloodSugar2",UnitUtils.unitSplice(data.getBloodSugar2(), UnitConstants.MMOLL));
	646	+ map.put("bloodSugar3",UnitUtils.unitSplice(data.getBloodSugar3(), UnitConstants.MMOLL));
	647	+ map.put("bloodSugar4",UnitUtils.unitSplice(data.getBloodSugar4(), UnitConstants.MMOLL));
644	648	map.put("username",patients.getUsername());
645	649	map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
646	650	map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
...	...	@@ -733,7 +737,6 @@
733	737	/* 辅助信息 */
734	738	map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
735	739	map.put("urineProtein",data.getUrineProtein());
736		- map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
737	740	map.put("bChao",data.getbChao());
738	741
739	742	/* 诊断指导 */

...	...	@@ -64,7 +64,10 @@
64	64	// B 炒
65	65	private String bChao;
66	66	//血糖
67		- private String fzBloodSugar;
	67	+ private String bloodSugar;
	68	+ private String bloodSugar2;
	69	+ private String bloodSugar3;
	70	+ private String bloodSugar4;
68	71	//高危因素
69	72	private List<String> riskFactor;
70	73	// 高危评分
...	...	@@ -118,6 +121,30 @@
118	121	this.couponType = couponType;
119	122	}
120	123
	124	+ public String getBloodSugar2() {
	125	+ return bloodSugar2;
	126	+ }
	127	+
	128	+ public void setBloodSugar2(String bloodSugar2) {
	129	+ this.bloodSugar2 = bloodSugar2;
	130	+ }
	131	+
	132	+ public String getBloodSugar3() {
	133	+ return bloodSugar3;
	134	+ }
	135	+
	136	+ public void setBloodSugar3(String bloodSugar3) {
	137	+ this.bloodSugar3 = bloodSugar3;
	138	+ }
	139	+
	140	+ public String getBloodSugar4() {
	141	+ return bloodSugar4;
	142	+ }
	143	+
	144	+ public void setBloodSugar4(String bloodSugar4) {
	145	+ this.bloodSugar4 = bloodSugar4;
	146	+ }
	147	+
121	148	public String getPid() {
122	149	return pid;
123	150	}
...	...	@@ -165,7 +192,10 @@
165	192	examinationModel.setHemoglobin(hemoglobin);
166	193	examinationModel.setUrineProtein(urineProtein);
167	194	examinationModel.setbChao(bChao);
168		- examinationModel.setBloodSugar(fzBloodSugar);
	195	+ examinationModel.setBloodSugar(bloodSugar);
	196	+ examinationModel.setBloodSugar2(bloodSugar2);
	197	+ examinationModel.setBloodSugar3(bloodSugar3);
	198	+ examinationModel.setBloodSugar4(bloodSugar4);
169	199	examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
170	200	examinationModel.setRiskScore(riskScore);
171	201	examinationModel.setOtherRisk(JsonUtil.obj2JsonString(otherRisk));
172	202
...	...	@@ -204,12 +234,12 @@
204	234	this.bChao = bChao;
205	235	}
206	236
207		- public String getFzBloodSugar() {
208		- return fzBloodSugar;
	237	+ public String getBloodSugar() {
	238	+ return bloodSugar;
209	239	}
210	240
211		- public void setFzBloodSugar(String fzBloodSugar) {
212		- this.fzBloodSugar = fzBloodSugar;
	241	+ public void setBloodSugar(String bloodSugar) {
	242	+ this.bloodSugar = bloodSugar;
213	243	}
214	244
215	245	public Map getBp() {

...	...	@@ -157,7 +157,7 @@
157	157	private String ncgOther;
158	158	private String abo;
159	159	private String rh;
160		- // 血糖
	160	+ // 血糖1
161	161	private String bloodSugar;
162	162	// B超
163	163	private String bChao ;

...	...	@@ -47,7 +47,13 @@
47	47	// B 炒
48	48	private String bChao;
49	49	//血糖
50		- private String fzBloodSugar;
	50	+ private String bloodSugar;
	51	+ //血糖2
	52	+ private String bloodSugar2;
	53	+ //血糖3
	54	+ private String bloodSugar3;
	55	+ //血糖4
	56	+ private String bloodSugar4;
51	57	//高危因素
52	58	private List riskFactor;
53	59	// 高危评分
...	...	@@ -134,7 +140,10 @@
134	140
135	141	setAbdominalCircumference(destModel.getAbdominalCircumference());
136	142	setbChao(destModel.getbChao());
137		- setFzBloodSugar(destModel.getBloodSugar());
	143	+ setBloodSugar(destModel.getBloodSugar());
	144	+ setBloodSugar2(destModel.getBloodSugar2());
	145	+ setBloodSugar3(destModel.getBloodSugar3());
	146	+ setBloodSugar4(destModel.getBloodSugar4());
138	147	try {
139	148	setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
140	149	} catch (Exception e) {
141	150
...	...	@@ -202,12 +211,36 @@
202	211	}
203	212
204	213
205		- public String getFzBloodSugar() {
206		- return fzBloodSugar;
	214	+ public String getBloodSugar() {
	215	+ return bloodSugar;
207	216	}
208	217
209		- public void setFzBloodSugar(String fzBloodSugar) {
210		- this.fzBloodSugar = fzBloodSugar;
	218	+ public void setBloodSugar(String bloodSugar) {
	219	+ this.bloodSugar = bloodSugar;
	220	+ }
	221	+
	222	+ public String getBloodSugar2() {
	223	+ return bloodSugar2;
	224	+ }
	225	+
	226	+ public void setBloodSugar2(String bloodSugar2) {
	227	+ this.bloodSugar2 = bloodSugar2;
	228	+ }
	229	+
	230	+ public String getBloodSugar3() {
	231	+ return bloodSugar3;
	232	+ }
	233	+
	234	+ public void setBloodSugar3(String bloodSugar3) {
	235	+ this.bloodSugar3 = bloodSugar3;
	236	+ }
	237	+
	238	+ public String getBloodSugar4() {
	239	+ return bloodSugar4;
	240	+ }
	241	+
	242	+ public void setBloodSugar4(String bloodSugar4) {
	243	+ this.bloodSugar4 = bloodSugar4;
211	244	}
212	245
213	246	public String getCheckDate() {