jiangjiazhi / regional-platform

Commit f9afe304ced8ec73921a3189cdedad2845fd1894

Authored by zhangchao 12 months ago

Exists in dev

#fix:优化孕妇学校及大同产检新增字段

Showing 3 changed files with 102 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java

...	...	@@ -537,6 +537,53 @@
537	537	//本次随访日期
538	538	private String followupDate;
539	539
	540	+ //大同医院专属
	541	+ private String yongyaoshi;//用药史
	542	+ private Integer danshuangtai;//是否单双胎 1是 0否
	543	+ private Integer taishu;//胎数
	544	+ private Integer fuzhurenshen;//是否辅助妊娠 1是 0否
	545	+ private String fuzhufangshi;//辅助方式
	546	+
	547	+ public String getYongyaoshi() {
	548	+ return yongyaoshi;
	549	+ }
	550	+
	551	+ public void setYongyaoshi(String yongyaoshi) {
	552	+ this.yongyaoshi = yongyaoshi;
	553	+ }
	554	+
	555	+ public Integer getDanshuangtai() {
	556	+ return danshuangtai;
	557	+ }
	558	+
	559	+ public void setDanshuangtai(Integer danshuangtai) {
	560	+ this.danshuangtai = danshuangtai;
	561	+ }
	562	+
	563	+ public Integer getTaishu() {
	564	+ return taishu;
	565	+ }
	566	+
	567	+ public void setTaishu(Integer taishu) {
	568	+ this.taishu = taishu;
	569	+ }
	570	+
	571	+ public Integer getFuzhurenshen() {
	572	+ return fuzhurenshen;
	573	+ }
	574	+
	575	+ public void setFuzhurenshen(Integer fuzhurenshen) {
	576	+ this.fuzhurenshen = fuzhurenshen;
	577	+ }
	578	+
	579	+ public String getFuzhufangshi() {
	580	+ return fuzhufangshi;
	581	+ }
	582	+
	583	+ public void setFuzhufangshi(String fuzhufangshi) {
	584	+ this.fuzhufangshi = fuzhufangshi;
	585	+ }
	586	+
540	587	public Integer getIsAppCreate() {
541	588	return isAppCreate;
542	589	}

...	...	@@ -586,7 +586,7 @@
586	586	result.put("courseSpeaker",model.getCourseSpeaker() == null ? "" : model.getCourseSpeaker());
587	587
588	588	result.put("timeLong",model.getTimeLong()+"");
589		-
	589	+ result.put("courseVideo",model.getCourseVideo());
590	590	String hospitalName = "";
591	591	if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) {
592	592	Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId()));

...	...	@@ -551,6 +551,55 @@
551	551	//本次随访日期
552	552	private String followupDate;
553	553
	554	+
	555	+ //大同医院专属
	556	+ private String yongyaoshi;//用药史
	557	+ private Integer danshuangtai;//是否单双胎 1是 0否
	558	+ private Integer taishu;//胎数
	559	+ private Integer fuzhurenshen;//是否辅助妊娠 1是 0否
	560	+ private String fuzhufangshi;//辅助方式
	561	+
	562	+
	563	+ public String getYongyaoshi() {
	564	+ return yongyaoshi;
	565	+ }
	566	+
	567	+ public void setYongyaoshi(String yongyaoshi) {
	568	+ this.yongyaoshi = yongyaoshi;
	569	+ }
	570	+
	571	+ public Integer getDanshuangtai() {
	572	+ return danshuangtai;
	573	+ }
	574	+
	575	+ public void setDanshuangtai(Integer danshuangtai) {
	576	+ this.danshuangtai = danshuangtai;
	577	+ }
	578	+
	579	+ public Integer getTaishu() {
	580	+ return taishu;
	581	+ }
	582	+
	583	+ public void setTaishu(Integer taishu) {
	584	+ this.taishu = taishu;
	585	+ }
	586	+
	587	+ public Integer getFuzhurenshen() {
	588	+ return fuzhurenshen;
	589	+ }
	590	+
	591	+ public void setFuzhurenshen(Integer fuzhurenshen) {
	592	+ this.fuzhurenshen = fuzhurenshen;
	593	+ }
	594	+
	595	+ public String getFuzhufangshi() {
	596	+ return fuzhufangshi;
	597	+ }
	598	+
	599	+ public void setFuzhufangshi(String fuzhufangshi) {
	600	+ this.fuzhufangshi = fuzhufangshi;
	601	+ }
	602	+
554	603	public Integer getIsAppCreate() {
555	604	return isAppCreate;
556	605	}
...	...	@@ -2553,7 +2602,11 @@
2553	2602	antExChuModel.setTpaAb(tpaAb);
2554	2603	antExChuModel.setaTSHR(aTSHR);
2555	2604	antExChuModel.setTgAb(tgAb);
2556		-
	2605	+ antExChuModel.setYongyaoshi(yongyaoshi);
	2606	+ antExChuModel.setDanshuangtai(danshuangtai);
	2607	+ antExChuModel.setTaishu(taishu);
	2608	+ antExChuModel.setFuzhurenshen(fuzhurenshen);
	2609	+ antExChuModel.setFuzhufangshi(fuzhufangshi);
2557	2610
2558	2611	if (null != bp) {
2559	2612	antExChuModel.setBp(JsonUtil.obj2JsonString(bp));