jiangjiazhi / regional-platform

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 115 additions and 2 deletions

...	...	@@ -17,7 +17,9 @@
17	17	public class AntExChuModel extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
20		-
	20	+ private List<String> jmxspg;
	21	+ private Integer jmxsScore;
	22	+ private Integer jmxsLevel;
21	23	//预约住院分娩医院
22	24	private String yyzyfmHospitalId;
23	25	/**
...	...	@@ -521,6 +523,30 @@
521	523	public String ctpoab;
522	524	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
523	525	public Integer productionSieveType;
	526	+
	527	+ public List<String> getJmxspg() {
	528	+ return jmxspg;
	529	+ }
	530	+
	531	+ public void setJmxspg(List<String> jmxspg) {
	532	+ this.jmxspg = jmxspg;
	533	+ }
	534	+
	535	+ public Integer getJmxsScore() {
	536	+ return jmxsScore;
	537	+ }
	538	+
	539	+ public void setJmxsScore(Integer jmxsScore) {
	540	+ this.jmxsScore = jmxsScore;
	541	+ }
	542	+
	543	+ public Integer getJmxsLevel() {
	544	+ return jmxsLevel;
	545	+ }
	546	+
	547	+ public void setJmxsLevel(Integer jmxsLevel) {
	548	+ this.jmxsLevel = jmxsLevel;
	549	+ }
524	550
525	551	public Integer getProductionSieveType() {
526	552	return productionSieveType;

...	...	@@ -403,6 +403,34 @@
403	403	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
404	404	public Integer productionSieveType;
405	405
	406	+ private List<String> jmxspg;
	407	+ private Integer jmxsScore;
	408	+ private Integer jmxsLevel;
	409	+
	410	+ public List<String> getJmxspg() {
	411	+ return jmxspg;
	412	+ }
	413	+
	414	+ public void setJmxspg(List<String> jmxspg) {
	415	+ this.jmxspg = jmxspg;
	416	+ }
	417	+
	418	+ public Integer getJmxsScore() {
	419	+ return jmxsScore;
	420	+ }
	421	+
	422	+ public void setJmxsScore(Integer jmxsScore) {
	423	+ this.jmxsScore = jmxsScore;
	424	+ }
	425	+
	426	+ public Integer getJmxsLevel() {
	427	+ return jmxsLevel;
	428	+ }
	429	+
	430	+ public void setJmxsLevel(Integer jmxsLevel) {
	431	+ this.jmxsLevel = jmxsLevel;
	432	+ }
	433	+
406	434	public Integer getProductionSieveType() {
407	435	return productionSieveType;
408	436	}

...	...	@@ -29,6 +29,33 @@
29	29	this.registration = registration;
30	30	}
31	31
	32	+ public List<String> getJmxspg() {
	33	+ return jmxspg;
	34	+ }
	35	+
	36	+ public void setJmxspg(List<String> jmxspg) {
	37	+ this.jmxspg = jmxspg;
	38	+ }
	39	+
	40	+ public Integer getJmxsScore() {
	41	+ return jmxsScore;
	42	+ }
	43	+
	44	+ public void setJmxsScore(Integer jmxsScore) {
	45	+ this.jmxsScore = jmxsScore;
	46	+ }
	47	+
	48	+ public Integer getJmxsLevel() {
	49	+ return jmxsLevel;
	50	+ }
	51	+
	52	+ public void setJmxsLevel(Integer jmxsLevel) {
	53	+ this.jmxsLevel = jmxsLevel;
	54	+ }
	55	+
	56	+ private List<String> jmxspg;
	57	+ private Integer jmxsScore;
	58	+ private Integer jmxsLevel;
32	59	//医生签名
33	60	private String doctorSign;
34	61
...	...	@@ -1357,6 +1384,10 @@
1357	1384	examinationModel.setZywzzlContent(zywzzlContent);
1358	1385	examinationModel.setZyatzlState(zyatzlState);
1359	1386	examinationModel.setZyatzlContent(zyatzlContent);
	1387	+
	1388	+ examinationModel.setJmxspg(jmxspg);
	1389	+ examinationModel.setJmxsScore(jmxsScore);
	1390	+ examinationModel.setJmxsLevel(jmxsLevel);
1360	1391
1361	1392	if (null != secondaryDiagnosisId) {
1362	1393	examinationModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));

...	...	@@ -20,9 +20,35 @@
20	20	*/
21	21	@Form
22	22	public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
	23	+ public List<String> getJmxspg() {
	24	+ return jmxspg;
	25	+ }
23	26
	27	+ public void setJmxspg(List<String> jmxspg) {
	28	+ this.jmxspg = jmxspg;
	29	+ }
	30	+
	31	+ public Integer getJmxsScore() {
	32	+ return jmxsScore;
	33	+ }
	34	+
	35	+ public void setJmxsScore(Integer jmxsScore) {
	36	+ this.jmxsScore = jmxsScore;
	37	+ }
	38	+
	39	+ public Integer getJmxsLevel() {
	40	+ return jmxsLevel;
	41	+ }
	42	+
	43	+ public void setJmxsLevel(Integer jmxsLevel) {
	44	+ this.jmxsLevel = jmxsLevel;
	45	+ }
	46	+
24	47	//预约住院分娩医院(初证预约住院分娩医院同时，修改档案的预约住院分娩医院)
25	48	private String yyzyfmHospitalId;
	49	+ private List<String> jmxspg;
	50	+ private Integer jmxsScore;
	51	+ private Integer jmxsLevel;
26	52	/**
27	53	* start
28	54	* 遵化需求新增字段
...	...	@@ -2281,7 +2307,9 @@
2281	2307	antExChuModel.setZyatzlContent(zyatzlContent);
2282	2308	antExChuModel.setYyzyfmHospitalId(yyzyfmHospitalId);
2283	2309
2284		-
	2310	+ antExChuModel.setJmxspg(jmxspg);
	2311	+ antExChuModel.setJmxsScore(jmxsScore);
	2312	+ antExChuModel.setJmxsLevel(jmxsLevel);
2285	2313	//次要诊断
2286	2314	if (null != secondaryDiagnosisId) {
2287	2315	antExChuModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));