jiangjiazhi / regional-platform

Commit b31dea6b91b481da184693f5ae2b72a1ad27c754

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

转诊单显示诊断结果

Showing 3 changed files with 12 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -328,7 +328,7 @@
328	328	private Integer expType;
329	329	//person表主键
330	330	private String pid;
331		- //是否隐藏 0 隐藏 1 显示更改为：0，转诊建档，待接收 1，转诊建档，已接收
	331	+ //是否隐藏更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
332	332	private String enable;
333	333	//最后一次高危时间
334	334	private Date lastRhTime;

...	...	@@ -127,7 +127,9 @@
127	127	//医院id
128	128	private List<String> hospitalList;
129	129
130		- //0 隐藏 1 显示
	130	+ // 0，转诊建档，待接收
	131	+ // 1，转诊建档，已接收
	132	+ // 2，隐藏建档，在A院建档去B医院做产检-----建档管理里面不展示
131	133	private String enable = "1";
132	134
133	135	private String notEnable;
...	...	@@ -497,7 +499,10 @@
497	499	private String hospitalId;
498	500
499	501	private String hcertificateNum;
500		- //3-转诊建档
	502	+ // 0：孕妇直接建档
	503	+ // 1：儿童建档产生的产妇（不展示在列表中）
	504	+ // 2：自动分娩产生的产妇（直接建档的产妇） =》当自动分娩的孕妇补录分娩信息后更新patient表中buildtype为0
	505	+ // 3：转诊建档
501	506	private Integer buildType = -1;
502	507	private Integer buildTypeNot = -1;
503	508
...	...	@@ -1116,6 +1121,7 @@
1116	1121	}
1117	1122	if (buildType != -1) {
1118	1123	MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS);
	1124	+
1119	1125	MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS);
1120	1126
1121	1127	MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE);

...	...	@@ -142,7 +142,7 @@
142	142	*/
143	143	public String handHideBuild(String pid, String parentId, Integer userId, int type) {
144	144	String hospitalId = autoMatchFacade.getHospitalId(userId);
145		- Patients patients = null;
	145	+ Patients patients;
146	146	Patients patients1 = patientsService.findOnePatientById(parentId);
147	147	if (StringUtils.isEmpty(pid)) {
148	148	pid = patients1.getPid();
149	149
150	150
151	151
...	...	@@ -160,22 +160,20 @@
160	160
161	161	//表示区域的
162	162	if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) {
	163	+ System.out.println("复诊时开始隐藏建档："+patients.getId());
163	164	patients = findOnePatient(null, null, null, null, type, false, pid, false);
164	165	patients.setSource(patients.getId());
165	166	patients.setId(null);
166	167	patients.setHospitalId(hospitalId);
167		-// patients.setType(1);
168	168	patients.setCreated(new Date());
169	169	patients.setBookbuildingDoctor(patients.getBookbuildingDoctor());
170	170	patients.setEnable("2");
171	171	patients.setBookbuildingDate(patients.getBookbuildingDate());
172	172
173		-// patients.setFileCode(null);
174	173	// 产后复查，设置自动分娩，这个字段其实是为了确定是否有对应的分娩记录，但是这种是没有分娩记录的
175	174	if (type == 3) {
176	175	patients.setIsAutoFm(YnEnums.YES.getId());
177	176	}
178		- // hujiaqi添加结束
179	177	patientsService.addPatient(patients);
180	178	return patients.getId();
181	179	}
...	...	@@ -2071,6 +2069,7 @@
2071	2069	patientsQuery.setEnable("2");
2072	2070	}
2073	2071	Patients patients = null;
	2072	+ System.out.println("复诊时查询当前医院是否有隐藏建档条件："+patientsQuery.convertToQuery().convertToMongoQuery());
2074	2073	List<Patients> list = patientsService.queryPatient1(patientsQuery, "modified");
2075	2074	if (CollectionUtils.isNotEmpty(list)) {
2076	2075	return list.get(0);