jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 28 additions and 0 deletions

...	...	@@ -1292,6 +1292,9 @@
1292	1292	BabyModel bm = new BabyModel();
1293	1293	bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
1294	1294	bm.setYlSelect(b.getYlSelect());
	1295	+ bm.setIsUNHS(b.getIsUNHS());
	1296	+ bm.setHearScrResult(b.getHearScrResult());
	1297	+
1295	1298	//遵化定制路北辖区状态
1296	1299	bm.setZhlbxqState(b.getZhlbxqState());
1297	1300	bm.setKouqNew(b.getKouqNew());

...	...	@@ -152,6 +152,7 @@
152	152	if (archiveModel != null) {
153	153	archiveMap = new HashMap<>();
154	154	archiveMap.put("certificateNum", archiveModel.getCertificateNum());
	155	+ archiveMap.put("vcCardNo", archiveModel.getVcCardNo());
155	156	archiveMap.put("archId", archiveModel.getId());
156	157	archiveMap.put("levelType", FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService));
157	158	archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());

...	...	@@ -15,9 +15,17 @@
15	15
16	16	//月龄下拉框
17	17	private String ylSelect;
	18	+
18	19	//下次预约
19	20	private String nextDate;
20	21
	22	+ // 听力是否筛查（20210122 张洁滦平需求，出院小结听力是否筛查就是 baby耳声发射）
	23	+ private Integer isUNHS;
	24	+ /**
	25	+ * 听筛结果 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过
	26	+ */
	27	+ private Integer hearScrResult;
	28	+
21	29	/*********母亲基本信息*********/
22	30	// 儿童高危因素标记
23	31	private List<String> babyHighRiskReason;
...	...	@@ -848,6 +856,22 @@
848	856
849	857	public Map<String, Object> getJxBcSele() {
850	858	return jxBcSele;
	859	+ }
	860	+
	861	+ public Integer getIsUNHS() {
	862	+ return isUNHS;
	863	+ }
	864	+
	865	+ public void setIsUNHS(Integer isUNHS) {
	866	+ this.isUNHS = isUNHS;
	867	+ }
	868	+
	869	+ public Integer getHearScrResult() {
	870	+ return hearScrResult;
	871	+ }
	872	+
	873	+ public void setHearScrResult(Integer hearScrResult) {
	874	+ this.hearScrResult = hearScrResult;
851	875	}
852	876
853	877	public void setJxBcSele(Map<String, Object> jxBcSele) {