jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 26 additions and 4 deletions

...	...	@@ -53,6 +53,17 @@
53	53	private List<Integer> status;
54	54	private Boolean isStatus;
55	55
	56	+ //分娩记录加住院管床大夫
	57	+ private String gcdfDoctorId;
	58	+
	59	+ public String getGcdfDoctorId() {
	60	+ return gcdfDoctorId;
	61	+ }
	62	+
	63	+ public void setGcdfDoctorId(String gcdfDoctorId) {
	64	+ this.gcdfDoctorId = gcdfDoctorId;
	65	+ }
	66	+
56	67	public Boolean getIsStatus() {
57	68	return isStatus;
58	69	}
...	...	@@ -368,6 +379,9 @@
368	379
369	380	if (tireNumber != null) {
370	381	condition = condition.and("tireNumber", tireNumber, MongoOper.IS);
	382	+ }
	383	+ if (gcdfDoctorId != null) {
	384	+ condition = condition.and("gcdfDoctorId", gcdfDoctorId, MongoOper.IS);
371	385	}
372	386
373	387	if (tireNumbers != null && tireNumbers.size() > 0) {

...	...	@@ -2705,11 +2705,7 @@
2705	2705	/********增加完毕*********/
2706	2706
2707	2707
2708		- if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
2709		- {
2710	2708
2711		- }
2712		-
2713	2709	List <MaternalDeliverModel> maternalDeliverModelList;
2714	2710	if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null
2715	2711	\|\| StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) \|\| childbirthManagerRequest.getWeight() != null)
...	...	@@ -2783,6 +2779,7 @@
2783	2779	matDeliverQuery.setStatus(status);
2784	2780	matDeliverQuery.setIsStatus(true);
2785	2781	}
	2782	+ matDeliverQuery.setGcdfDoctorId(childbirthManagerRequest.getGcdfDoctorId());
2786	2783
2787	2784	matDeliverQuery.setFmHospital(hid);
2788	2785	matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());

...	...	@@ -187,6 +187,17 @@
187	187	//评估状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估
188	188	private Integer status;
189	189
	190	+ //管床大夫
	191	+ private String gcdfDoctorId;
	192	+
	193	+ public String getGcdfDoctorId() {
	194	+ return gcdfDoctorId;
	195	+ }
	196	+
	197	+ public void setGcdfDoctorId(String gcdfDoctorId) {
	198	+ this.gcdfDoctorId = gcdfDoctorId;
	199	+ }
	200	+
190	201	public Integer getType() {
191	202	return type;
192	203	}