jiangjiazhi / regional-platform

Authored by jesse.wang almost 3 years ago

Exists in master and in 3 other branches

Showing 2 changed files with 35 additions and 6 deletions

...	...	@@ -1935,9 +1935,9 @@
1935	1935	patientsQuery.setBuildType(1);
1936	1936	patientsQuery.setSort("created");
1937	1937	//在区域组的时候不用查询隐藏档案，但是这里看不见转诊过来的数据
1938		-// if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
1939		-// patientsQuery.setExtEnable(false);
1940		-// }
	1938	+ if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
	1939	+ patientsQuery.setExtEnable(false);
	1940	+ }
1941	1941	System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery());
1942	1942	//获取所有的建档记录
1943	1943	List <Patients> list = patientsService.queryPatient(patientsQuery);

...	...	@@ -52,7 +52,7 @@
52	52	private FilePathModel filePath;
53	53
54	54	//随访医生
55		- private String booksuifangDoctor;
	55	+ private DoctorDTO booksuifangDoctor;
56	56
57	57	//孕妇证件核验方式 1 自动核验 2人工核验
58	58	private String patientVerifType;
59	59
...	...	@@ -83,11 +83,11 @@
83	83	//归属地id
84	84	private String addressId;
85	85
86		- public String getBooksuifangDoctor() {
	86	+ public DoctorDTO getBooksuifangDoctor() {
87	87	return booksuifangDoctor;
88	88	}
89	89
90		- public void setBooksuifangDoctor(String booksuifangDoctor) {
	90	+ public void setBooksuifangDoctor(DoctorDTO booksuifangDoctor) {
91	91	this.booksuifangDoctor = booksuifangDoctor;
92	92	}
93	93
...	...	@@ -1550,6 +1550,35 @@
1550	1550	", fillDate='" + fillDate + '\'' +
1551	1551	", townOrgId='" + townOrgId + '\'' +
1552	1552	'}';
	1553	+ }
	1554	+
	1555	+ public static class DoctorDTO {
	1556	+ private String name;
	1557	+ private Integer id;
	1558	+
	1559	+ @Override
	1560	+ public String toString() {
	1561	+ return "DoctorDTO{" +
	1562	+ "name='" + name + '\'' +
	1563	+ ", id=" + id +
	1564	+ '}';
	1565	+ }
	1566	+
	1567	+ public String getName() {
	1568	+ return name;
	1569	+ }
	1570	+
	1571	+ public void setName(String name) {
	1572	+ this.name = name;
	1573	+ }
	1574	+
	1575	+ public Integer getId() {
	1576	+ return id;
	1577	+ }
	1578	+
	1579	+ public void setId(Integer id) {
	1580	+ this.id = id;
	1581	+ }
1553	1582	}
1554	1583	}