jiangjiazhi / regional-platform

Commit 11c4a6fff43515018cdd1cebe53a4bca2ca2fb3f

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

公卫2.0-新增非首次产前随访(产前检查复诊)

Showing 4 changed files with 176 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java

...	...	@@ -407,6 +407,60 @@
407	407	private Integer jmxsScore;
408	408	private Integer jmxsLevel;
409	409
	410	+ /**
	411	+ * 公卫2.0-新增第一次产前随访(产前检查初诊)
	412	+ */
	413	+ //各厂商对接时，再确定具体的值
	414	+ private Integer isAppCreate;
	415	+ //本次随访医师id
	416	+ private String followupDoctorId;
	417	+ //本次随访医师姓名
	418	+ private String followupDoctorName;
	419	+ //本人姓名
	420	+ private String name;
	421	+ //本次随访日期
	422	+ private String followupDate;
	423	+
	424	+ public Integer getIsAppCreate() {
	425	+ return isAppCreate;
	426	+ }
	427	+
	428	+ public void setIsAppCreate(Integer isAppCreate) {
	429	+ this.isAppCreate = isAppCreate;
	430	+ }
	431	+
	432	+ public String getFollowupDoctorId() {
	433	+ return followupDoctorId;
	434	+ }
	435	+
	436	+ public void setFollowupDoctorId(String followupDoctorId) {
	437	+ this.followupDoctorId = followupDoctorId;
	438	+ }
	439	+
	440	+ public String getFollowupDoctorName() {
	441	+ return followupDoctorName;
	442	+ }
	443	+
	444	+ public void setFollowupDoctorName(String followupDoctorName) {
	445	+ this.followupDoctorName = followupDoctorName;
	446	+ }
	447	+
	448	+ public String getName() {
	449	+ return name;
	450	+ }
	451	+
	452	+ public void setName(String name) {
	453	+ this.name = name;
	454	+ }
	455	+
	456	+ public String getFollowupDate() {
	457	+ return followupDate;
	458	+ }
	459	+
	460	+ public void setFollowupDate(String followupDate) {
	461	+ this.followupDate = followupDate;
	462	+ }
	463	+
410	464	public List<Integer> getJmxspg() {
411	465	return jmxspg;
412	466	}

...	...	@@ -3490,6 +3490,12 @@
3490	3490	map.put("bloodSugar2h", data.getBloodSugar2h());
3491	3491	map.put("productionSieveType", data.getProductionSieveType());
3492	3492
	3493	+ map.put("isAppCreate",data.getIsAppCreate());
	3494	+ map.put("followupDoctorId",data.getFollowupDoctorId());
	3495	+ map.put("followupDoctorName",data.getFollowupDoctorName());
	3496	+ map.put("name",data.getName());
	3497	+ map.put("followupDate",data.getFollowupDate());
	3498	+
3493	3499	br.setErrorcode(ErrorCodeConstants.SUCCESS);
3494	3500	br.setErrormsg("成功");
3495	3501	br.setData(map);

...	...	@@ -1374,7 +1374,60 @@
1374	1374	public void setResultSupple(String resultSupple) {
1375	1375	this.resultSupple = resultSupple;
1376	1376	}
	1377	+ /**
	1378	+ * 公卫2.0-新增第一次产前随访(产前检查初诊)
	1379	+ */
	1380	+ //各厂商对接时，再确定具体的值
	1381	+ private Integer isAppCreate;
	1382	+ //本次随访医师id
	1383	+ private String followupDoctorId;
	1384	+ //本次随访医师姓名
	1385	+ private String followupDoctorName;
	1386	+ //本人姓名
	1387	+ private String name;
	1388	+ //本次随访日期
	1389	+ private String followupDate;
1377	1390
	1391	+ public Integer getIsAppCreate() {
	1392	+ return isAppCreate;
	1393	+ }
	1394	+
	1395	+ public void setIsAppCreate(Integer isAppCreate) {
	1396	+ this.isAppCreate = isAppCreate;
	1397	+ }
	1398	+
	1399	+ public String getFollowupDoctorId() {
	1400	+ return followupDoctorId;
	1401	+ }
	1402	+
	1403	+ public void setFollowupDoctorId(String followupDoctorId) {
	1404	+ this.followupDoctorId = followupDoctorId;
	1405	+ }
	1406	+
	1407	+ public String getFollowupDoctorName() {
	1408	+ return followupDoctorName;
	1409	+ }
	1410	+
	1411	+ public void setFollowupDoctorName(String followupDoctorName) {
	1412	+ this.followupDoctorName = followupDoctorName;
	1413	+ }
	1414	+
	1415	+ public String getName() {
	1416	+ return name;
	1417	+ }
	1418	+
	1419	+ public void setName(String name) {
	1420	+ this.name = name;
	1421	+ }
	1422	+
	1423	+ public String getFollowupDate() {
	1424	+ return followupDate;
	1425	+ }
	1426	+
	1427	+ public void setFollowupDate(String followupDate) {
	1428	+ this.followupDate = followupDate;
	1429	+ }
	1430	+
1378	1431	@Override
1379	1432	public AntenatalExaminationModel convertToDataModel() {
1380	1433	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
...	...	@@ -1578,6 +1631,11 @@
1578	1631	if(null!=productionSieveType) {
1579	1632	examinationModel.setProductionSieveType(productionSieveType);
1580	1633	}
	1634	+ examinationModel.setIsAppCreate(isAppCreate);
	1635	+ examinationModel.setFollowupDoctorId(followupDoctorId);
	1636	+ examinationModel.setFollowupDoctorName(followupDoctorName);
	1637	+ examinationModel.setName(name);
	1638	+ examinationModel.setFollowupDate(followupDate);
1581	1639	return examinationModel;
1582	1640	}
1583	1641

...	...	@@ -1228,7 +1228,60 @@
1228	1228	public void setBloodSugar2h(String bloodSugar2h) {
1229	1229	this.bloodSugar2h = bloodSugar2h;
1230	1230	}
	1231	+ /**
	1232	+ * 公卫2.0-新增第一次产前随访(产前检查初诊)
	1233	+ */
	1234	+ //各厂商对接时，再确定具体的值
	1235	+ private Integer isAppCreate;
	1236	+ //本次随访医师id
	1237	+ private String followupDoctorId;
	1238	+ //本次随访医师姓名
	1239	+ private String followupDoctorName;
	1240	+ //本人姓名
	1241	+ private String name;
	1242	+ //本次随访日期
	1243	+ private String followupDate;
1231	1244
	1245	+ public Integer getIsAppCreate() {
	1246	+ return isAppCreate;
	1247	+ }
	1248	+
	1249	+ public void setIsAppCreate(Integer isAppCreate) {
	1250	+ this.isAppCreate = isAppCreate;
	1251	+ }
	1252	+
	1253	+ public String getFollowupDoctorId() {
	1254	+ return followupDoctorId;
	1255	+ }
	1256	+
	1257	+ public void setFollowupDoctorId(String followupDoctorId) {
	1258	+ this.followupDoctorId = followupDoctorId;
	1259	+ }
	1260	+
	1261	+ public String getFollowupDoctorName() {
	1262	+ return followupDoctorName;
	1263	+ }
	1264	+
	1265	+ public void setFollowupDoctorName(String followupDoctorName) {
	1266	+ this.followupDoctorName = followupDoctorName;
	1267	+ }
	1268	+
	1269	+ public String getName() {
	1270	+ return name;
	1271	+ }
	1272	+
	1273	+ public void setName(String name) {
	1274	+ this.name = name;
	1275	+ }
	1276	+
	1277	+ public String getFollowupDate() {
	1278	+ return followupDate;
	1279	+ }
	1280	+
	1281	+ public void setFollowupDate(String followupDate) {
	1282	+ this.followupDate = followupDate;
	1283	+ }
	1284	+
1232	1285	@Override
1233	1286	public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
1234	1287
...	...	@@ -1405,6 +1458,11 @@
1405	1458	setJmxspg(destModel.getJmxspg());
1406	1459	setJmxsScore(destModel.getJmxsScore());
1407	1460	setJmxsLevel(destModel.getJmxsLevel());
	1461	+ setIsAppCreate(destModel.getIsAppCreate());
	1462	+ setFollowupDoctorId(destModel.getFollowupDoctorId());
	1463	+ setFollowupDoctorName(destModel.getFollowupDoctorName());
	1464	+ setName(destModel.getName());
	1465	+ setFollowupDate(destModel.getFollowupDate());
1408	1466	return this;
1409	1467	}
1410	1468