jiangjiazhi / regional-platform

Commit c66d8c02c404f425b8966a50c7deb153a28ee1c7

Authored by Administrator over 6 years ago

Exists in master and in 6 other branches

筛查页面增加“母亲耳聋基因筛查”

Showing 4 changed files with 266 additions and 31 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java

...	...	@@ -82,6 +82,27 @@
82	82	private Integer rrna1555;
83	83
84	84	/**
	85	+ * 母亲耳聋筛查
	86	+ */
	87	+ private Integer motherGjb2Del35;
	88	+
	89	+ private Integer motherGjb2Del176;
	90	+
	91	+ private Integer motherGjb2Del235;
	92	+
	93	+ private Integer motherGjb2Del299;
	94	+
	95	+ private Integer motherGjb3Slc26a4538;
	96	+
	97	+ private Integer motherGjb3Slc26a42168;
	98	+
	99	+ private Integer motherGjb3Slc26a4Ivs7;
	100	+
	101	+ private Integer motherRrna1494;
	102	+
	103	+ private Integer motherRrna1555;
	104	+
	105	+ /**
85	106	* 处理意见 1=复筛 2=诊断
86	107	*/
87	108	private Integer processOptionType;
...	...	@@ -127,6 +148,79 @@
127	148	private String lastUpdateHospitalId;
128	149	//0-正常 1-删除
129	150	private Integer status;
	151	+
	152	+
	153	+ public Integer getMotherGjb2Del35() {
	154	+ return motherGjb2Del35;
	155	+ }
	156	+
	157	+ public void setMotherGjb2Del35(Integer motherGjb2Del35) {
	158	+ this.motherGjb2Del35 = motherGjb2Del35;
	159	+ }
	160	+
	161	+ public Integer getMotherGjb2Del176() {
	162	+ return motherGjb2Del176;
	163	+ }
	164	+
	165	+ public void setMotherGjb2Del176(Integer motherGjb2Del176) {
	166	+ this.motherGjb2Del176 = motherGjb2Del176;
	167	+ }
	168	+
	169	+ public Integer getMotherGjb2Del235() {
	170	+ return motherGjb2Del235;
	171	+ }
	172	+
	173	+ public void setMotherGjb2Del235(Integer motherGjb2Del235) {
	174	+ this.motherGjb2Del235 = motherGjb2Del235;
	175	+ }
	176	+
	177	+ public Integer getMotherGjb2Del299() {
	178	+ return motherGjb2Del299;
	179	+ }
	180	+
	181	+ public void setMotherGjb2Del299(Integer motherGjb2Del299) {
	182	+ this.motherGjb2Del299 = motherGjb2Del299;
	183	+ }
	184	+
	185	+ public Integer getMotherGjb3Slc26a4538() {
	186	+ return motherGjb3Slc26a4538;
	187	+ }
	188	+
	189	+ public void setMotherGjb3Slc26a4538(Integer motherGjb3Slc26a4538) {
	190	+ this.motherGjb3Slc26a4538 = motherGjb3Slc26a4538;
	191	+ }
	192	+
	193	+ public Integer getMotherGjb3Slc26a42168() {
	194	+ return motherGjb3Slc26a42168;
	195	+ }
	196	+
	197	+ public void setMotherGjb3Slc26a42168(Integer motherGjb3Slc26a42168) {
	198	+ this.motherGjb3Slc26a42168 = motherGjb3Slc26a42168;
	199	+ }
	200	+
	201	+ public Integer getMotherGjb3Slc26a4Ivs7() {
	202	+ return motherGjb3Slc26a4Ivs7;
	203	+ }
	204	+
	205	+ public void setMotherGjb3Slc26a4Ivs7(Integer motherGjb3Slc26a4Ivs7) {
	206	+ this.motherGjb3Slc26a4Ivs7 = motherGjb3Slc26a4Ivs7;
	207	+ }
	208	+
	209	+ public Integer getMotherRrna1494() {
	210	+ return motherRrna1494;
	211	+ }
	212	+
	213	+ public void setMotherRrna1494(Integer motherRrna1494) {
	214	+ this.motherRrna1494 = motherRrna1494;
	215	+ }
	216	+
	217	+ public Integer getMotherRrna1555() {
	218	+ return motherRrna1555;
	219	+ }
	220	+
	221	+ public void setMotherRrna1555(Integer motherRrna1555) {
	222	+ this.motherRrna1555 = motherRrna1555;
	223	+ }
130	224
131	225	public String getPid() {
132	226	return pid;

...	...	@@ -496,7 +496,7 @@
496	496	if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
497	497	baby.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
498	498	baby.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
499		- }else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
	499	+ } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
500	500	baby.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
501	501	baby.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
502	502	}
...	...	@@ -521,7 +521,7 @@
521	521	patientService.setParentid(baby.getId());
522	522	patientService.setPid(baby.getPid());
523	523	try {
524		- patientServiceFacade.addPatientService(patientService, userId,hId);
	524	+ patientServiceFacade.addPatientService(patientService, userId, hId);
525	525	} catch (Exception e) {
526	526	System.out.println("儿童建档服务开通异常！");
527	527	e.printStackTrace();
...	...	@@ -800,7 +800,7 @@
800	800	babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode());
801	801	babyEarBaseView.setNation(getBasicConfig(babyPatientExtendEar.getNation()));
802	802	babyEarBaseView.setRemark(babyModel.getMremark());
803		- /* 诊断指导 */
	803	+ /* 诊断指导 */
804	804	String diagnosis = "";
805	805	if (org.apache.commons.lang.StringUtils.isNotEmpty(babyPatientExtendEar.getDischargeDiagnosis())) {
806	806	String[] dischargeDiagnosis = babyPatientExtendEar.getmHighRiskFactorId().split(",");
...	...	@@ -911,7 +911,7 @@
911	911	StringBuffer historyStr = new StringBuffer("");
912	912	if (historyJson.containsKey("yesOrNo")) {
913	913	Integer yesOrNo = historyJson.getInteger("yesOrNo");
914		- if (yesOrNo!=null && yesOrNo == 1) {
	914	+ if (yesOrNo != null && yesOrNo == 1) {
915	915	historyStr.append("有,");
916	916	if (historyJson.containsKey("yinJiu")) {
917	917	boolean yinJiu = historyJson.getBoolean("yinJiu");
918	918
...	...	@@ -1113,11 +1113,11 @@
1113	1113	StringBuffer historyStr = new StringBuffer("");
1114	1114	if (historyJson.containsKey("yesOrNo")) {
1115	1115	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1116		- if (yesOrNo!=null && yesOrNo == 1) {
	1116	+ if (yesOrNo != null && yesOrNo == 1) {
1117	1117	historyStr.append("有");
1118	1118	if (historyJson.containsKey("other")) {
1119	1119	Integer other = historyJson.getInteger("other");
1120		- if(other!=null){
	1120	+ if (other != null) {
1121	1121	historyStr.append("(孕" + other + "周)");
1122	1122	}
1123	1123	}
...	...	@@ -1130,7 +1130,7 @@
1130	1130	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getDrugAppName());
1131	1131	if (historyJson.containsKey("yesOrNo")) {
1132	1132	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1133		- if (yesOrNo!=null && yesOrNo == 1) {
	1133	+ if (yesOrNo != null && yesOrNo == 1) {
1134	1134	historyJson.put("yesOrNo", "有");
1135	1135	} else {
1136	1136	historyJson.put("yesOrNo", "无");
...	...	@@ -1143,7 +1143,7 @@
1143	1143	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getAbortionHistoryType());
1144	1144	if (historyJson.containsKey("yesOrNo")) {
1145	1145	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1146		- if (yesOrNo!=null && yesOrNo == 1) {
	1146	+ if (yesOrNo != null && yesOrNo == 1) {
1147	1147	historyJson.put("yesOrNo", "有");
1148	1148	} else {
1149	1149	historyJson.put("yesOrNo", "无");
...	...	@@ -1161,7 +1161,7 @@
1161	1161	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getHarmfulSubstanceType());
1162	1162	if (historyJson.containsKey("yesOrNo")) {
1163	1163	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1164		- if (yesOrNo!=null && yesOrNo == 1) {
	1164	+ if (yesOrNo != null && yesOrNo == 1) {
1165	1165	historyJson.put("yesOrNo", "有");
1166	1166	} else {
1167	1167	historyJson.put("yesOrNo", "无");
...	...	@@ -1176,7 +1176,7 @@
1176	1176	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBadLifeHistoryType());
1177	1177	if (historyJson.containsKey("yesOrNo")) {
1178	1178	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1179		- if (yesOrNo!=null && yesOrNo == 1) {
	1179	+ if (yesOrNo != null && yesOrNo == 1) {
1180	1180	historyStr.append("有,");
1181	1181	}
1182	1182	}
...	...	@@ -1214,7 +1214,7 @@
1214	1214	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getMedicalHistoryType());
1215	1215	if (historyJson.containsKey("yesOrNo")) {
1216	1216	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1217		- if (yesOrNo!=null && yesOrNo == 1) {
	1217	+ if (yesOrNo != null && yesOrNo == 1) {
1218	1218	historyStr.append("有,");
1219	1219	}
1220	1220	}
...	...	@@ -1268,7 +1268,7 @@
1268	1268	JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBnormalPregnancyHistoryType());
1269	1269	if (historyJson.containsKey("yesOrNo")) {
1270	1270	Integer yesOrNo = historyJson.getInteger("yesOrNo");
1271		- if (yesOrNo!=null && yesOrNo == 1) {
	1271	+ if (yesOrNo != null && yesOrNo == 1) {
1272	1272	historyStr.append("有,");
1273	1273	}
1274	1274	}
...	...	@@ -1401,7 +1401,7 @@
1401	1401	if (babyPatientExtendEarBirth.getApgarScoreOne() != null && babyPatientExtendEarBirth.getApgarScoreFive() != null && babyPatientExtendEarBirth.getApgarScoreTen() != null) {
1402	1402	String apgarScore = babyPatientExtendEarBirth.getApgarScoreOne() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreFive() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreTen() + UnitConstants.FEN;
1403	1403	babyEarBirthView.setApgarScore(apgarScore);
1404		- }else if(babyPatientExtendEarBirth.getApgarUnknown()!=null&&babyPatientExtendEarBirth.getApgarUnknown()==1){
	1404	+ } else if (babyPatientExtendEarBirth.getApgarUnknown() != null && babyPatientExtendEarBirth.getApgarUnknown() == 1) {
1405	1405	babyEarBirthView.setApgarScore("不详");
1406	1406	}
1407	1407
...	...	@@ -1575,7 +1575,7 @@
1575	1575	* @param babyEarId 儿童听筛id
1576	1576	* @return
1577	1577	*/
1578		- public BaseResponse deleteBabyEar(String babyEarId,Integer userId) {
	1578	+ public BaseResponse deleteBabyEar(String babyEarId, Integer userId) {
1579	1579	if (StringUtils.isEmpty(babyEarId)) {
1580	1580	return new BaseResponse().setErrormsg("请传入请求参数").setErrorcode(ErrorCodeConstants.SUCCESS);
1581	1581	}
...	...	@@ -1602,7 +1602,7 @@
1602	1602	babyPatientExtendEar.setId(babyEarId);
1603	1603	babyPatientExtendEarService.updateBabyPatientExtendEar(babyPatientExtendEar);
1604	1604
1605		- operateLogFacade.addDeleteOptLog(userId,Integer.parseInt(babyPatientExtendEar.getCreateHospitalId()),babyPatientExtendEar,OptActionEnums.DELETE.getId(),"删除儿童档案");
	1605	+ operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(babyPatientExtendEar.getCreateHospitalId()), babyPatientExtendEar, OptActionEnums.DELETE.getId(), "删除儿童档案");
1606	1606
1607	1607	return RespBuilder.buildSuccess();
1608	1608	}
...	...	@@ -1761,6 +1761,18 @@
1761	1761	data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494()));
1762	1762	data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() == null ? "" : babyPatientExtendEarScreen.getRrna1555());
1763	1763	data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555()));
	1764	+
	1765	+ data.put("motherGjb2Del35", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del35()));
	1766	+ data.put("motherGjb2Del176", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del176()));
	1767	+ data.put("motherGjb2Del235", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del235()));
	1768	+ data.put("motherGjb2Del299", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb2Del299()));
	1769	+ data.put("motherGjb3Slc26a4538", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4538()));
	1770	+ data.put("motherGjb3Slc26a42168", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a42168()));
	1771	+ data.put("motherGjb3Slc26a4Ivs7", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getMotherGjb3Slc26a4Ivs7()));
	1772	+ data.put("motherRrna1494", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1494() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1494()));
	1773	+ data.put("motherRrna1555", DeafEnums.getTitle(babyPatientExtendEarScreen.getMotherRrna1555() == null ? 0 : babyPatientExtendEarScreen.getMotherRrna1555()));
	1774	+
	1775	+
1764	1776	data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断
1765	1777	data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断
1766	1778	data.put("processOptionDesc", babyPatientExtendEarScreen.getProcessOptionDesc());
...	...	@@ -1844,7 +1856,7 @@
1844	1856
1845	1857	babyPatientExtendEarScreenService.updateBabyPatientExtendEarScreen(babyPatientExtendEarScreen);
1846	1858
1847		- operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before,babyPatientExtendEarScreen, OptActionEnums.ADD.getId(), "修改听力筛查");
	1859	+ operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before, babyPatientExtendEarScreen, OptActionEnums.ADD.getId(), "修改听力筛查");
1848	1860	}
1849	1861
1850	1862	}

...	...	@@ -360,8 +360,6 @@
360	360	patientsQuery.setFmMode(downQueryRequest.getFmType());
361	361	isPatient = true;
362	362	}
363		-
364		-
365	363	if (null != downQueryRequest.getPostpartumDays()) {//产后天数
366	364	Calendar instance = Calendar.getInstance();
367	365	instance.setTime(new Date());
368	366
...	...	@@ -409,13 +407,13 @@
409	407	if (downQueryRequest.getLevel() != null) {//高危等级
410	408	patientsQuery.setrLevel(downQueryRequest.getLevel());
411	409	//只查孕妇
412		- patientsQuery.setType(1);
413	410	patientsQuery.setLastMensesStart(DateUtil.getMonth(-10));//只查询当前时间十个月前的数据考虑性能问题
414	411	isPatient = true;
415	412	}
416	413	if (downQueryRequest.getRiskFactorId() != null) {//高危因素
417	414	//高危统计中的自定义高危
418	415	if ("otherRiskId".equals(downQueryRequest.getLevel())) {
	416	+ patientsQuery.setType(1);
419	417	patientsQuery.setNotoRiskFactor("");
420	418	patientsQuery.setoRiskFactor("true");
421	419	} else {
...	...	@@ -450,7 +448,6 @@
450	448	List<String> pids = new ArrayList<>();
451	449	for (Patients ps : patientses) {
452	450	pids.add(ps.getId());
453		- System.out.println(ps.getId());
454	451	}
455	452	if (downQueryRequest.getTrackType() == 4) {
456	453	List<String> sievePatients = new ArrayList<>();
...	...	@@ -461,7 +458,6 @@
461	458	List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
462	459	for (SieveModel sieveModel : sieveModels) {
463	460	sievePatients.add(sieveModel.getParentId());
464		- System.out.println("未产筛的ParentIds" + sieveModel.getParentId());
465	461	}
466	462	//去掉做个产筛的人
467	463	pids.removeAll(sievePatients);
468	464
...	...	@@ -472,14 +468,39 @@
472	468	}
473	469	//设置查询queryTrackType 如果是4 执行产筛的查询条件
474	470	downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType());
475		-
476		-
477	471	downRecordQuery.setAreaId(downQueryRequest.getAreaId());
478	472	downRecordQuery.setProvinceId(downQueryRequest.getProvinceId());
479	473	downRecordQuery.setCityId(downQueryRequest.getCityId());
480	474	downRecordQuery.setStreetId(downQueryRequest.getStreetId());
481	475	downRecordQuery.setKey(downQueryRequest.getKey());
482	476	/**
	477	+ *孕期检查
	478	+ * */
	479	+ if (downQueryRequest.getTrackType() == 3) {
	480	+ Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -266);
	481	+ downRecordQuery.setLastMensesStart(endDate);
	482	+ }
	483	+
	484	+ /**
	485	+ * 产筛检查
	486	+ * */
	487	+ if (downQueryRequest.getTrackType() == 4) {
	488	+ Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -84);
	489	+ Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -160);
	490	+ downRecordQuery.setLastMensesStart(start);
	491	+ downRecordQuery.setLastMensesEnd(endDate);
	492	+ }
	493	+ /**
	494	+ * 分娩追访
	495	+ * */
	496	+ if (downQueryRequest.getTrackType() == 5) {
	497	+ Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -259);
	498	+ Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -280);
	499	+ downRecordQuery.setLastMensesStart(start);
	500	+ downRecordQuery.setAppointmentDateEnd(endDate);
	501	+ }
	502	+
	503	+ /**
483	504	* 孕妇追访功能新增搜索条件20190709
484	505	* */
485	506	//妇女建档时间
...	...	@@ -707,7 +728,6 @@
707	728	for (TrackDownRecord trackDownRecord : downRecordList) {
708	729	//追访类型
709	730	Integer trackType = trackDownRecord.getTrackType();
710		-
711	731	//查询的追访类型
712	732	trackDownRecord.setTrackType(downQueryRequest.getTrackType());
713	733	Map map = downTypeHandler.build(trackDownRecord, mongoTemplate, downQueryRequest.getEncryption());

...	...	@@ -9,9 +9,8 @@
9	9	import javax.validation.constraints.Pattern;
10	10
11	11	/**
12		- *
13		- * 增加产晒
14		- *
	12	+ * 增加产晒
	13	+ * <p>
15	14	* Created by jiangjiazhi on 2017/5/23.
16	15	*/
17	16	@Form
...	...	@@ -24,7 +23,7 @@
24	23	/**
25	24	* 筛查类型 1=初筛 2=复筛
26	25	*/
27		- @Pattern(regexp = "^[2\|1]$",message = "screenType 非法")
	26	+ @Pattern(regexp = "^[2\|1]$", message = "screenType 非法")
28	27	private Integer screenType;
29	28
30	29	/**
31	30
...	...	@@ -91,7 +90,29 @@
91	90	private Integer rrna1494;
92	91
93	92	private Integer rrna1555;
	93	+
94	94	/**
	95	+ * 母亲耳聋基因筛查
	96	+ */
	97	+ private Integer motherGjb2Del35;
	98	+
	99	+ private Integer motherGjb2Del176;
	100	+
	101	+ private Integer motherGjb2Del235;
	102	+
	103	+ private Integer motherGjb2Del299;
	104	+
	105	+ private Integer motherGjb3Slc26a4538;
	106	+
	107	+ private Integer motherGjb3Slc26a42168;
	108	+
	109	+ private Integer motherGjb3Slc26a4Ivs7;
	110	+
	111	+ private Integer motherRrna1494;
	112	+
	113	+ private Integer motherRrna1555;
	114	+
	115	+ /**
95	116	* 是否通过 1-通过 2-未通过
96	117	*/
97	118	private Integer scrIspass;
98	119
...	...	@@ -116,10 +137,10 @@
116	137	babyPatientExtendEarScreen.setId(id);
117	138	babyPatientExtendEarScreen.setBabyId(babyId);
118	139	babyPatientExtendEarScreen.setScreenType(screenType);
119		- if(null!=screenDate) {
	140	+ if (null != screenDate) {
120	141	babyPatientExtendEarScreen.setScreenDate(DateUtil.parseYMD(screenDate));
121	142	}
122		- if(null!=nextCheckTime) {
	143	+ if (null != nextCheckTime) {
123	144	babyPatientExtendEarScreen.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
124	145	}
125	146	babyPatientExtendEarScreen.setCheckHospitalId(checkHospitalId);
126	147
127	148
...	...	@@ -138,13 +159,28 @@
138	159	babyPatientExtendEarScreen.setGjb3Slc26a42168(gjb3Slc26a42168);
139	160	babyPatientExtendEarScreen.setRrna1494(rrna1494);
140	161	babyPatientExtendEarScreen.setRrna1555(rrna1555);
	162	+ /**
	163	+ * 母亲耳聋基因筛查
	164	+ * */
	165	+ babyPatientExtendEarScreen.setMotherGjb2Del35(motherGjb2Del35);
	166	+ babyPatientExtendEarScreen.setMotherGjb2Del176(motherGjb2Del176);
	167	+ babyPatientExtendEarScreen.setMotherGjb2Del235(motherGjb2Del235);
	168	+ babyPatientExtendEarScreen.setMotherGjb2Del299(motherGjb2Del299);
	169	+ babyPatientExtendEarScreen.setMotherGjb3Slc26a4Ivs7(motherGjb3Slc26a4Ivs7);
	170	+ babyPatientExtendEarScreen.setMotherGjb3Slc26a4538(motherGjb3Slc26a4538);
	171	+ babyPatientExtendEarScreen.setMotherGjb3Slc26a42168(motherGjb3Slc26a42168);
	172	+ babyPatientExtendEarScreen.setMotherRrna1494(motherRrna1494);
	173	+ babyPatientExtendEarScreen.setMotherRrna1555(motherRrna1555);
	174	+
	175	+
141	176	babyPatientExtendEarScreen.setGuidOpinion(guidOpinion);
142	177	babyPatientExtendEarScreen.setCheckDoctorId(checkDoctorId);
143		- if(null!=referralDate){
	178	+ if (null != referralDate) {
144	179	babyPatientExtendEarScreen.setReferralDate(DateUtil.parseYMD(referralDate));
145	180	}
146	181	return babyPatientExtendEarScreen;
147	182	}
	183	+
148	184	/**
149	185	* 指导意见
150	186	*/
...	...	@@ -167,6 +203,79 @@
167	203	* 诊断时间
168	204	*/
169	205	private String referralDate;
	206	+
	207	+
	208	+ public Integer getMotherGjb2Del35() {
	209	+ return motherGjb2Del35;
	210	+ }
	211	+
	212	+ public void setMotherGjb2Del35(Integer motherGjb2Del35) {
	213	+ this.motherGjb2Del35 = motherGjb2Del35;
	214	+ }
	215	+
	216	+ public Integer getMotherGjb2Del176() {
	217	+ return motherGjb2Del176;
	218	+ }
	219	+
	220	+ public void setMotherGjb2Del176(Integer motherGjb2Del176) {
	221	+ this.motherGjb2Del176 = motherGjb2Del176;
	222	+ }
	223	+
	224	+ public Integer getMotherGjb2Del235() {
	225	+ return motherGjb2Del235;
	226	+ }
	227	+
	228	+ public void setMotherGjb2Del235(Integer motherGjb2Del235) {
	229	+ this.motherGjb2Del235 = motherGjb2Del235;
	230	+ }
	231	+
	232	+ public Integer getMotherGjb2Del299() {
	233	+ return motherGjb2Del299;
	234	+ }
	235	+
	236	+ public void setMotherGjb2Del299(Integer motherGjb2Del299) {
	237	+ this.motherGjb2Del299 = motherGjb2Del299;
	238	+ }
	239	+
	240	+ public Integer getMotherGjb3Slc26a4538() {
	241	+ return motherGjb3Slc26a4538;
	242	+ }
	243	+
	244	+ public void setMotherGjb3Slc26a4538(Integer motherGjb3Slc26a4538) {
	245	+ this.motherGjb3Slc26a4538 = motherGjb3Slc26a4538;
	246	+ }
	247	+
	248	+ public Integer getMotherGjb3Slc26a42168() {
	249	+ return motherGjb3Slc26a42168;
	250	+ }
	251	+
	252	+ public void setMotherGjb3Slc26a42168(Integer motherGjb3Slc26a42168) {
	253	+ this.motherGjb3Slc26a42168 = motherGjb3Slc26a42168;
	254	+ }
	255	+
	256	+ public Integer getMotherGjb3Slc26a4Ivs7() {
	257	+ return motherGjb3Slc26a4Ivs7;
	258	+ }
	259	+
	260	+ public void setMotherGjb3Slc26a4Ivs7(Integer motherGjb3Slc26a4Ivs7) {
	261	+ this.motherGjb3Slc26a4Ivs7 = motherGjb3Slc26a4Ivs7;
	262	+ }
	263	+
	264	+ public Integer getMotherRrna1494() {
	265	+ return motherRrna1494;
	266	+ }
	267	+
	268	+ public void setMotherRrna1494(Integer motherRrna1494) {
	269	+ this.motherRrna1494 = motherRrna1494;
	270	+ }
	271	+
	272	+ public Integer getMotherRrna1555() {
	273	+ return motherRrna1555;
	274	+ }
	275	+
	276	+ public void setMotherRrna1555(Integer motherRrna1555) {
	277	+ this.motherRrna1555 = motherRrna1555;
	278	+ }
170	279
171	280	public Integer getAbrLeft() {
172	281	return abrLeft;