jiangjiazhi / regional-platform

Commit 5a468fc0de881460f4f1719473fd8d4661cf9b1f

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

两癌

Showing 2 changed files with 93 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -61,7 +61,10 @@
61	61	//季度
62	62	private Integer quarter;
63	63	//编号
64		- private String code;
	64	+ private String areaCode; //行政区划编码
	65	+ private String streetCode;//街道编码
	66	+ private String villageCode;//村委会编码
	67	+ private String seqCode;//顺序编码
65	68
66	69	/**
67	70	* 身份证
...	...	@@ -359,6 +362,93 @@
359	362
360	363	private String hospitalId;
361	364
	365	+ private String tbhospital;//填报单位
	366	+ private String tbUser;//填报用户
	367	+ private String tbDate;//填报日期
	368	+ private String inHospital;//录入单位
	369	+ private String inUser;//录入人
	370	+ private String inDate;//录入日期
	371	+
	372	+ public String getAreaCode() {
	373	+ return areaCode;
	374	+ }
	375	+
	376	+ public void setAreaCode(String areaCode) {
	377	+ this.areaCode = areaCode;
	378	+ }
	379	+
	380	+ public String getStreetCode() {
	381	+ return streetCode;
	382	+ }
	383	+
	384	+ public void setStreetCode(String streetCode) {
	385	+ this.streetCode = streetCode;
	386	+ }
	387	+
	388	+ public String getVillageCode() {
	389	+ return villageCode;
	390	+ }
	391	+
	392	+ public void setVillageCode(String villageCode) {
	393	+ this.villageCode = villageCode;
	394	+ }
	395	+
	396	+ public String getSeqCode() {
	397	+ return seqCode;
	398	+ }
	399	+
	400	+ public void setSeqCode(String seqCode) {
	401	+ this.seqCode = seqCode;
	402	+ }
	403	+
	404	+ public String getTbhospital() {
	405	+ return tbhospital;
	406	+ }
	407	+
	408	+ public void setTbhospital(String tbhospital) {
	409	+ this.tbhospital = tbhospital;
	410	+ }
	411	+
	412	+ public String getTbUser() {
	413	+ return tbUser;
	414	+ }
	415	+
	416	+ public void setTbUser(String tbUser) {
	417	+ this.tbUser = tbUser;
	418	+ }
	419	+
	420	+ public String getTbDate() {
	421	+ return tbDate;
	422	+ }
	423	+
	424	+ public void setTbDate(String tbDate) {
	425	+ this.tbDate = tbDate;
	426	+ }
	427	+
	428	+ public String getInHospital() {
	429	+ return inHospital;
	430	+ }
	431	+
	432	+ public void setInHospital(String inHospital) {
	433	+ this.inHospital = inHospital;
	434	+ }
	435	+
	436	+ public String getInUser() {
	437	+ return inUser;
	438	+ }
	439	+
	440	+ public void setInUser(String inUser) {
	441	+ this.inUser = inUser;
	442	+ }
	443	+
	444	+ public String getInDate() {
	445	+ return inDate;
	446	+ }
	447	+
	448	+ public void setInDate(String inDate) {
	449	+ this.inDate = inDate;
	450	+ }
	451	+
362	452	public Date getNextDate() {
363	453	return nextDate;
364	454	}
365	455
...	...	@@ -495,13 +585,7 @@
495	585	this.quarter = quarter;
496	586	}
497	587
498		- public String getCode() {
499		- return code;
500		- }
501	588
502		- public void setCode(String code) {
503		- this.code = code;
504		- }
505	589
506	590	public String getIdCardNo() {
507	591	return idCardNo;

...	...	@@ -874,14 +874,14 @@
874	874	cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId());
875	875	cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId());
876	876	cervixVisitModel.setAddress(cervicalCancerRequest.getAddress());
877		- cervixVisitModel.setCode(cervicalCancerRequest.getCode());
	877	+ //cervixVisitModel.setCode(cervicalCancerRequest.getCode());
878	878	cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
879	879	cervixVisitModel.setType(0);
880	880	cervixVisitModel.setYn(1);
881	881	cervixVisitService.addOneCervixVisit(cervixVisitModel);
882	882	}else {
883	883	cervixVisitModel.setParentId(cervicalCancerRequest.getId());
884		- cervixVisitModel.setCode(cervicalCancerRequest.getCode());
	884	+ // cervixVisitModel.setCode(cervicalCancerRequest.getCode());
885	885	cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated());
886	886	cervixVisitService.updateOneCervixVisit(cervixVisitModel,2);
887	887	}