jiangjiazhi / regional-platform

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 73 additions and 2 deletions

...	...	@@ -39,6 +39,9 @@
39	39	//卡介苗接种注射者
40	40	private String bCGInjectUserName;
41	41
	42	+ //遵化定制路北辖区状态 null\|\| ""未选择、 1 ○ 否、2○是
	43	+ private String zhlbxqState;
	44	+
42	45	//是否接种乙肝疫苗 1 已接种 0 未接种
43	46	private Integer isHBV;
44	47	//乙肝疫苗接种日期
...	...	@@ -2635,6 +2638,14 @@
2635	2638
2636	2639	public String gethBIGInjectUserName() {
2637	2640	return hBIGInjectUserName;
	2641	+ }
	2642	+
	2643	+ public String getZhlbxqState() {
	2644	+ return zhlbxqState;
	2645	+ }
	2646	+
	2647	+ public void setZhlbxqState(String zhlbxqState) {
	2648	+ this.zhlbxqState = zhlbxqState;
2638	2649	}
2639	2650
2640	2651	public void sethBIGInjectUserName(String hBIGInjectUserName) {

...	...	@@ -1246,6 +1246,8 @@
1246	1246	private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
1247	1247	// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1248	1248	BabyModel bm = new BabyModel();
	1249	+ //遵化定制路北辖区状态
	1250	+ bm.setZhlbxqState(b.getZhlbxqState());
1249	1251
1250	1252	if (b.getDataStatus() != null && b.getDataStatus() == 1) {
1251	1253	bm.setDataStatus(0);
...	...	@@ -1604,6 +1606,7 @@
1604	1606	if (models != null && models.size() > 0) {
1605	1607	BabyModel model = models.get(0);
1606	1608	result = getBabyBuildResult(model);
	1609	+ result.setZhlbxqState(model.getZhlbxqState());
1607	1610	BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
1608	1611	List <PatientSerResult> patientSerResults = (List <PatientSerResult>) baseResponse.getObject();
1609	1612	result.setPatientSerResults(patientSerResults);

...	...	@@ -56,6 +56,8 @@
56	56	public void setmHighRiskReason(List<String> mHighRiskReason) {
57	57	this.mHighRiskReason = mHighRiskReason;
58	58	}
	59	+ //遵化定制路北辖区状态 null\|\| ""未选择、 1 ○ 否、2○是
	60	+ private String zhlbxqState;
59	61
60	62	//建档Id
61	63	private String id;
...	...	@@ -1319,6 +1321,14 @@
1319	1321
1320	1322	public String getVipEndTime() {
1321	1323	return vipEndTime;
	1324	+ }
	1325	+
	1326	+ public String getZhlbxqState() {
	1327	+ return zhlbxqState;
	1328	+ }
	1329	+
	1330	+ public void setZhlbxqState(String zhlbxqState) {
	1331	+ this.zhlbxqState = zhlbxqState;
1322	1332	}
1323	1333
1324	1334	public void setVipEndTime(String vipEndTime) {

...	...	@@ -63,10 +63,15 @@
63	63
64	64	// 既往史 "yeaOrNo", "yes" "no" , xtxxz:true 先天性心脏病，dx:true 癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
65	65	private Map<String,Object> pastHistory;
	66	+ private String pastHistoryStr;
66	67	//传染病史
67	68	private Map<String,Object> infectDiseases;
	69	+ private String infectDiseasesStr;
	70	+
68	71	//过敏史
69	72	private Map<String,Object> ywgmHistory;
	73	+ private String ywgmHistoryStr;
	74	+
70	75	//家长确认签字
71	76	private String qurenqianzi;
72	77
...	...	@@ -183,6 +188,30 @@
183	188
184	189	public void setRightRefractionDS(String rightRefractionDS) {
185	190	this.rightRefractionDS = rightRefractionDS;
	191	+ }
	192	+
	193	+ public String getPastHistoryStr() {
	194	+ return pastHistoryStr;
	195	+ }
	196	+
	197	+ public void setPastHistoryStr(String pastHistoryStr) {
	198	+ this.pastHistoryStr = pastHistoryStr;
	199	+ }
	200	+
	201	+ public String getInfectDiseasesStr() {
	202	+ return infectDiseasesStr;
	203	+ }
	204	+
	205	+ public void setInfectDiseasesStr(String infectDiseasesStr) {
	206	+ this.infectDiseasesStr = infectDiseasesStr;
	207	+ }
	208	+
	209	+ public String getYwgmHistoryStr() {
	210	+ return ywgmHistoryStr;
	211	+ }
	212	+
	213	+ public void setYwgmHistoryStr(String ywgmHistoryStr) {
	214	+ this.ywgmHistoryStr = ywgmHistoryStr;
186	215	}
187	216
188	217	public String getRightRefractionDC() {

...	...	@@ -44,7 +44,8 @@
44	44
45	45	//文化程度ID
46	46	private String mommyLevelId;
47		-
	47	+ //遵化定制路北辖区状态 null\|\| ""未选择、 1 ○ 否、2○是
	48	+ private String zhlbxqState;
48	49	//职业类别
49	50	private String mommyProfessionTypeId;
50	51
...	...	@@ -1280,6 +1281,14 @@
1280	1281
1281	1282	public void setApgarScore(Map<String, Object> apgarScore) {
1282	1283	this.apgarScore = apgarScore;
	1284	+ }
	1285	+
	1286	+ public String getZhlbxqState() {
	1287	+ return zhlbxqState;
	1288	+ }
	1289	+
	1290	+ public void setZhlbxqState(String zhlbxqState) {
	1291	+ this.zhlbxqState = zhlbxqState;
1283	1292	}
1284	1293
1285	1294	public void setmHighRiskReason2(List mHighRiskReason2) {

...	...	@@ -30,7 +30,8 @@
30	30
31	31	//显示服务信息
32	32	private List<PatientSerResult> patientSerResults;
33		-
	33	+ //遵化定制路北辖区状态 null\|\| ""未选择、 1 ○ 否、2○是
	34	+ private String zhlbxqState;
34	35	//建档Id
35	36	private String id;
36	37
...	...	@@ -1205,6 +1206,8 @@
1205	1206	@Override
1206	1207	public BabyPageResult convertToResult(BabyModel destModel) {
1207	1208	List<String> list = destModel.getmHighRiskReason();
	1209	+ setZhlbxqState(destModel.getZhlbxqState());
	1210	+
1208	1211	/滦平 start /
1209	1212	setEsfs(destModel.getEsfs());
1210	1213	setTxng(destModel.getTxng());
1211	1214
...	...	@@ -1349,6 +1352,12 @@
1349	1352	this.couponCode = couponCode;
1350	1353	}
1351	1354
	1355	+ public String getZhlbxqState() {
	1356	+ return zhlbxqState;
	1357	+ }
1352	1358
	1359	+ public void setZhlbxqState(String zhlbxqState) {
	1360	+ this.zhlbxqState = zhlbxqState;
	1361	+ }
1353	1362	}