jiangjiazhi / regional-platform

Commit 0358ce0f7fc6c04f304cf78e59b9701f2a2e7653

Authored by wtt almost 6 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 184 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java

...	...	@@ -259,6 +259,16 @@
259	259	private boolean huaDaPushResult;
260	260
261	261	//iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入
	262	+ private String timeOfFetuses; //胎次
	263	+ private String diabetes; //糖尿病 "0" 无；“1”有；
	264	+ private String addTSH; //甲亢 "0" 无；“1”有；
	265	+ private String subTSH; //甲减 "0" 无；“1”有
	266	+ private String menses; //月经 "0" 规则；“1”不规则；
	267	+ private Boolean hAFPType ; //hAFP true 选择；false 未选择；Boolean
	268	+ private Boolean bHcgType ; //Free-βhCG true 选择；false 未选择；Boolean
	269	+ private Boolean uE3Type ; //uE3 true 选择；false 未选择；Boolean
	270	+ private Boolean pAPPAType ; //PAPPA true 选择；false 未选择；Boolea
	271	+
262	272	//导出状态 1导出
263	273	private Integer ieStatus;
264	274	//胎数
...	...	@@ -309,6 +319,78 @@
309	319
310	320	public void setCaiyangyunzhou(String caiyangyunzhou) {
311	321	this.caiyangyunzhou = caiyangyunzhou;
	322	+ }
	323	+
	324	+ public String getTimeOfFetuses() {
	325	+ return timeOfFetuses;
	326	+ }
	327	+
	328	+ public void setTimeOfFetuses(String timeOfFetuses) {
	329	+ this.timeOfFetuses = timeOfFetuses;
	330	+ }
	331	+
	332	+ public String getDiabetes() {
	333	+ return diabetes;
	334	+ }
	335	+
	336	+ public void setDiabetes(String diabetes) {
	337	+ this.diabetes = diabetes;
	338	+ }
	339	+
	340	+ public String getAddTSH() {
	341	+ return addTSH;
	342	+ }
	343	+
	344	+ public void setAddTSH(String addTSH) {
	345	+ this.addTSH = addTSH;
	346	+ }
	347	+
	348	+ public String getSubTSH() {
	349	+ return subTSH;
	350	+ }
	351	+
	352	+ public void setSubTSH(String subTSH) {
	353	+ this.subTSH = subTSH;
	354	+ }
	355	+
	356	+ public String getMenses() {
	357	+ return menses;
	358	+ }
	359	+
	360	+ public void setMenses(String menses) {
	361	+ this.menses = menses;
	362	+ }
	363	+
	364	+ public Boolean gethAFPType() {
	365	+ return hAFPType;
	366	+ }
	367	+
	368	+ public void sethAFPType(Boolean hAFPType) {
	369	+ this.hAFPType = hAFPType;
	370	+ }
	371	+
	372	+ public Boolean getbHcgType() {
	373	+ return bHcgType;
	374	+ }
	375	+
	376	+ public void setbHcgType(Boolean bHcgType) {
	377	+ this.bHcgType = bHcgType;
	378	+ }
	379	+
	380	+ public Boolean getuE3Type() {
	381	+ return uE3Type;
	382	+ }
	383	+
	384	+ public void setuE3Type(Boolean uE3Type) {
	385	+ this.uE3Type = uE3Type;
	386	+ }
	387	+
	388	+ public Boolean getpAPPAType() {
	389	+ return pAPPAType;
	390	+ }
	391	+
	392	+ public void setpAPPAType(Boolean pAPPAType) {
	393	+ this.pAPPAType = pAPPAType;
312	394	}
313	395
314	396	public Integer getIeStatus() {

...	...	@@ -1161,6 +1161,16 @@
1161	1161	if (StringUtils.isNotEmpty(lymsSieveId)) {
1162	1162	result.put("lymsSieveId", lymsSieveId);
1163	1163	}
	1164	+ result.put("timeOfFetuses", sieveApply.getTimeOfFetuses());
	1165	+ result.put("diabetes", sieveApply.getDiabetes());
	1166	+ result.put("addTSH", sieveApply.getAddTSH());
	1167	+ result.put("subTSH", sieveApply.getSubTSH());
	1168	+ result.put("menses", sieveApply.getMenses());
	1169	+ result.put("hAFPType", sieveApply.gethAFPType());
	1170	+ result.put("bhcgType", sieveApply.getbHcgType());
	1171	+ result.put("uE3Type", sieveApply.getuE3Type());
	1172	+ result.put("pAPPAType", sieveApply.getpAPPAType());
	1173	+
1164	1174	result.put("noOfFetuses", sieveApply.getNoOfFetuses());
1165	1175	result.put("patientID", sieveApply.getPatientID());
1166	1176	result.put("applicationNo", sieveApply.getApplicationNo());

...	...	@@ -255,6 +255,16 @@
255	255
256	256	private String ypglx;
257	257	//iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入
	258	+ private String timeOfFetuses; //胎次
	259	+ private String diabetes; //糖尿病 "0" 无；“1”有；
	260	+ private String addTSH; //甲亢 "0" 无；“1”有；
	261	+ private String subTSH; //甲减 "0" 无；“1”有
	262	+ private String menses; //月经 "0" 规则；“1”不规则；
	263	+ private Boolean hAFPType ; //hAFP true 选择；false 未选择；Boolean
	264	+ private Boolean bHcgType ; //Free-βhCG true 选择；false 未选择；Boolean
	265	+ private Boolean uE3Type ; //uE3 true 选择；false 未选择；Boolean
	266	+ private Boolean pAPPAType ; //PAPPA true 选择；false 未选择；Boolea
	267	+
258	268	//胎儿数是整数型取值范围1-9
259	269	private String noOfFetuses;
260	270	//孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠
...	...	@@ -301,6 +311,78 @@
301	311
302	312	private String hospitalId;
303	313
	314	+ public String getTimeOfFetuses() {
	315	+ return timeOfFetuses;
	316	+ }
	317	+
	318	+ public void setTimeOfFetuses(String timeOfFetuses) {
	319	+ this.timeOfFetuses = timeOfFetuses;
	320	+ }
	321	+
	322	+ public String getDiabetes() {
	323	+ return diabetes;
	324	+ }
	325	+
	326	+ public void setDiabetes(String diabetes) {
	327	+ this.diabetes = diabetes;
	328	+ }
	329	+
	330	+ public String getAddTSH() {
	331	+ return addTSH;
	332	+ }
	333	+
	334	+ public void setAddTSH(String addTSH) {
	335	+ this.addTSH = addTSH;
	336	+ }
	337	+
	338	+ public String getSubTSH() {
	339	+ return subTSH;
	340	+ }
	341	+
	342	+ public void setSubTSH(String subTSH) {
	343	+ this.subTSH = subTSH;
	344	+ }
	345	+
	346	+ public String getMenses() {
	347	+ return menses;
	348	+ }
	349	+
	350	+ public void setMenses(String menses) {
	351	+ this.menses = menses;
	352	+ }
	353	+
	354	+ public Boolean gethAFPType() {
	355	+ return hAFPType;
	356	+ }
	357	+
	358	+ public void sethAFPType(Boolean hAFPType) {
	359	+ this.hAFPType = hAFPType;
	360	+ }
	361	+
	362	+ public Boolean getbHcgType() {
	363	+ return bHcgType;
	364	+ }
	365	+
	366	+ public void setbHcgType(Boolean bHcgType) {
	367	+ this.bHcgType = bHcgType;
	368	+ }
	369	+
	370	+ public Boolean getuE3Type() {
	371	+ return uE3Type;
	372	+ }
	373	+
	374	+ public void setuE3Type(Boolean uE3Type) {
	375	+ this.uE3Type = uE3Type;
	376	+ }
	377	+
	378	+ public Boolean getpAPPAType() {
	379	+ return pAPPAType;
	380	+ }
	381	+
	382	+ public void setpAPPAType(Boolean pAPPAType) {
	383	+ this.pAPPAType = pAPPAType;
	384	+ }
	385	+
304	386	public String getHospitalId() {
305	387	return hospitalId;
306	388	}
...	...	@@ -528,6 +610,16 @@
528	610	sieveApplyOrderModel.setNasalBone(nasalBone);
529	611	sieveApplyOrderModel.setMonozygous(monozygous);
530	612	sieveApplyOrderModel.setPatientType(patientType);
	613	+
	614	+ sieveApplyOrderModel.setTimeOfFetuses(timeOfFetuses);
	615	+ sieveApplyOrderModel.setDiabetes(diabetes);
	616	+ sieveApplyOrderModel.setAddTSH(addTSH);
	617	+ sieveApplyOrderModel.setSubTSH(subTSH);
	618	+ sieveApplyOrderModel.setMenses(menses);
	619	+ sieveApplyOrderModel.sethAFPType(hAFPType);
	620	+ sieveApplyOrderModel.setbHcgType(bHcgType);
	621	+ sieveApplyOrderModel.setuE3Type(uE3Type);
	622	+ sieveApplyOrderModel.setpAPPAType(pAPPAType);
531	623
532	624
533	625	sieveApplyOrderModel.setBirth(StringUtils.isNotEmpty(birth) ? DateUtil.parseYMD(birth) : null);