jiangjiazhi / regional-platform

Commit dca9de6e5072cb9c2d39eb8eda8330bbd04b2be0

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

两癌

Showing 2 changed files with 97 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java

...	...	@@ -295,9 +295,8 @@
295	295	private Integer isSync;
296	296
297	297
298		- //编号
299		- private String code;
300	298
	299	+
301	300	/**
302	301	* 隆化-乳腺癌检查异常
303	302	*/
...	...	@@ -375,6 +374,100 @@
375	374	//诊断时间
376	375	private Date zHzdSj;
377	376
	377	+ private String areaCode; //行政区划编码 6
	378	+ private String streetCode;//街道编码 3
	379	+ private String villageCode;//村委会编码 3
	380	+ private String seqCode;//顺序编码 5
	381	+
	382	+ private Integer rxxxsf; //乳腺x 1 是 2否
	383	+ private String jyqt;//建议：其他的文字描述字段
	384	+ private String remark;//备注
	385	+
	386	+
	387	+ private String tbhospital;//填报单位
	388	+ private String tbUser;//填报用户
	389	+ private String tbDate;//填报日期
	390	+
	391	+ public String getAreaCode() {
	392	+ return areaCode;
	393	+ }
	394	+
	395	+ public void setAreaCode(String areaCode) {
	396	+ this.areaCode = areaCode;
	397	+ }
	398	+
	399	+ public String getStreetCode() {
	400	+ return streetCode;
	401	+ }
	402	+
	403	+ public void setStreetCode(String streetCode) {
	404	+ this.streetCode = streetCode;
	405	+ }
	406	+
	407	+ public String getVillageCode() {
	408	+ return villageCode;
	409	+ }
	410	+
	411	+ public void setVillageCode(String villageCode) {
	412	+ this.villageCode = villageCode;
	413	+ }
	414	+
	415	+ public String getSeqCode() {
	416	+ return seqCode;
	417	+ }
	418	+
	419	+ public void setSeqCode(String seqCode) {
	420	+ this.seqCode = seqCode;
	421	+ }
	422	+
	423	+ public Integer getRxxxsf() {
	424	+ return rxxxsf;
	425	+ }
	426	+
	427	+ public void setRxxxsf(Integer rxxxsf) {
	428	+ this.rxxxsf = rxxxsf;
	429	+ }
	430	+
	431	+ public String getJyqt() {
	432	+ return jyqt;
	433	+ }
	434	+
	435	+ public void setJyqt(String jyqt) {
	436	+ this.jyqt = jyqt;
	437	+ }
	438	+
	439	+ public String getRemark() {
	440	+ return remark;
	441	+ }
	442	+
	443	+ public void setRemark(String remark) {
	444	+ this.remark = remark;
	445	+ }
	446	+
	447	+ public String getTbhospital() {
	448	+ return tbhospital;
	449	+ }
	450	+
	451	+ public void setTbhospital(String tbhospital) {
	452	+ this.tbhospital = tbhospital;
	453	+ }
	454	+
	455	+ public String getTbUser() {
	456	+ return tbUser;
	457	+ }
	458	+
	459	+ public void setTbUser(String tbUser) {
	460	+ this.tbUser = tbUser;
	461	+ }
	462	+
	463	+ public String getTbDate() {
	464	+ return tbDate;
	465	+ }
	466	+
	467	+ public void setTbDate(String tbDate) {
	468	+ this.tbDate = tbDate;
	469	+ }
	470	+
378	471	public String getOrgProvinceId() {
379	472	return orgProvinceId;
380	473	}
...	...	@@ -855,13 +948,6 @@
855	948	this.lcjcrq = lcjcrq;
856	949	}
857	950
858		- public String getCode() {
859		- return code;
860		- }
861		-
862		- public void setCode(String code) {
863		- this.code = code;
864		- }
865	951
866	952	public Integer getIsSync() {
867	953	return isSync;

...	...	@@ -715,7 +715,7 @@
715	715	breastAfterVisitModel.setAreaId(cancerScreeningModel.getAreaId());
716	716	breastAfterVisitModel.setStreetId(cancerScreeningModel.getStreetId());
717	717	breastAfterVisitModel.setAddress(cancerScreeningModel.getAddress());
718		- breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
	718	+ //breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
719	719	breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
720	720	breastAfterVisitModel.setType(0);
721	721	breastAfterVisitModel.setYn(1);
...	...	@@ -723,7 +723,7 @@
723	723	}else {
724	724	breastAfterVisitModel.setNewRxCssj(cancerScreeningModel.getNewRxCssj());
725	725	breastAfterVisitModel.setParentId(cancerScreeningModel.getId());
726		- breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
	726	+ //breastAfterVisitModel.setCode(cancerScreeningModel.getCode());
727	727	breastAfterVisitModel.setCheckDate(cancerScreeningModel.getCreated());
728	728	breastAfterVisitService.updateOneBreastAfterVisit(breastAfterVisitModel,2);
729	729	}