shiyang / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master

Showing 6 changed files with 61 additions and 4 deletions

...	...	@@ -17,8 +17,8 @@
17	17	public class AntExChuModel extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
20		-
21		-
	20	+ //条码
	21	+ private String barCode;
22	22	private String id;
23	23	private String parentId;
24	24	private String pid;
...	...	@@ -102,6 +102,14 @@
102	102	private Integer abortionZR;
103	103	//人工流产
104	104	private Integer abortionRG;
	105	+
	106	+ public String getBarCode() {
	107	+ return barCode;
	108	+ }
	109	+
	110	+ public void setBarCode(String barCode) {
	111	+ this.barCode = barCode;
	112	+ }
105	113
106	114	public Integer getAbortionZR() {
107	115	return abortionZR;

...	...	@@ -19,6 +19,7 @@
19	19	private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
20	20
21	21	private String id;
	22	+ private String barCode;
22	23	private String pid;
23	24	private String parentId;
24	25	/* //名字
...	...	@@ -98,6 +99,14 @@
98	99	private String cDueWeek;
99	100	//操作人
100	101	private Integer operator;
	102	+
	103	+ public String getBarCode() {
	104	+ return barCode;
	105	+ }
	106	+
	107	+ public void setBarCode(String barCode) {
	108	+ this.barCode = barCode;
	109	+ }
101	110
102	111	public Integer getOperator() {
103	112	return operator;

...	...	@@ -19,6 +19,16 @@
19	19	// 访视记录id
20	20	private String id;
21	21
	22	+ private String barCode;
	23	+
	24	+ public String getBarCode() {
	25	+ return barCode;
	26	+ }
	27	+
	28	+ public void setBarCode(String barCode) {
	29	+ this.barCode = barCode;
	30	+ }
	31	+
22	32	private String pid;
23	33	//产妇id
24	34	private String parentId;

...	...	@@ -24,6 +24,9 @@
24	24	@FormParam
25	25	@NotEmpty(message = "孕妇id不能为空")
26	26	private String parentId;
	27	+
	28	+ private String barCode;
	29	+
27	30	private String id;
28	31
29	32	private String pid;
...	...	@@ -201,6 +204,14 @@
201	204	//人工流产
202	205	private Integer abortionRG;
203	206
	207	+ public String getBarCode() {
	208	+ return barCode;
	209	+ }
	210	+
	211	+ public void setBarCode(String barCode) {
	212	+ this.barCode = barCode;
	213	+ }
	214	+
204	215	public Integer getAbortionZR() {
205	216	return abortionZR;
206	217	}
...	...	@@ -874,6 +885,7 @@
874	885	public AntExChuModel convertToDataModel() {
875	886	AntExChuModel antExChuModel=new AntExChuModel();
876	887	antExChuModel.setBg(bg);
	888	+ antExChuModel.setBarCode(barCode);
877	889	antExChuModel.setId(id);
878	890	antExChuModel.setParentId(parentId);
879	891	antExChuModel.setSyjg(syjg);

...	...	@@ -14,7 +14,7 @@
14	14	* Created by Administrator on 2016/6/15 0015.
15	15	*/
16	16	public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17		-
	17	+ private String barCode;
18	18	private String id;
19	19	private String isSieve;
20	20	private String parentId;
...	...	@@ -76,6 +76,14 @@
76	76	private int hasSieve;
77	77	private String cDueWeek;
78	78
	79	+ public String getBarCode() {
	80	+ return barCode;
	81	+ }
	82	+
	83	+ public void setBarCode(String barCode) {
	84	+ this.barCode = barCode;
	85	+ }
	86	+
79	87	public String getIsSieve() {
80	88	return isSieve;
81	89	}
...	...	@@ -120,7 +128,7 @@
120	128	public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
121	129	setEdema(destModel.getEdema());
122	130	setParentId(destModel.getParentId());
123		-
	131	+ setBarCode(destModel.getBarCode());
124	132	setUrineProtein(destModel.getUrineProtein());
125	133	setTreatmentOpinion(destModel.getTreatmentOpinion());
126	134

...	...	@@ -14,7 +14,16 @@
14	14	* Created by Administrator on 2016/6/20 0020.
15	15	*/
16	16	public class AntexChuResult {
	17	+ private String barCode;
17	18
	19	+ public String getBarCode() {
	20	+ return barCode;
	21	+ }
	22	+
	23	+ public void setBarCode(String barCode) {
	24	+ this.barCode = barCode;
	25	+ }
	26	+
18	27	private String parentId;
19	28
20	29	private String isSieve;
...	...	@@ -893,6 +902,7 @@
893	902
894	903	public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
895	904	if (null != antExChuModel) {
	905	+ setBarCode(antExChuModel.getBarCode());
896	906	setId(antExChuModel.getId());
897	907	setParentId(antExChuModel.getParentId());
898	908	try {