smartor.git - Gitblit

			@@ -51,7 +51,7 @@
			@ApiModelProperty(value = "子任务Id集合")
			private List<Long> subTaskIds;

			@ApiModelProperty(value = "科室病区")
			@ApiModelProperty(value = "科室病区：1，病区统计 2，科室统计")
			private Integer statisticaltype;

			private String visitDeptCode;

			@@ -2371,13 +2371,13 @@
			public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
			log.info("getSfStatistics的入参为：{}", serviceSubtaskCountReq);
			String groupKey = "drcode";
			if (serviceSubtaskCountReq.getLeavehospitaldistrictcodes() != null && !serviceSubtaskCountReq.getLeavehospitaldistrictcodes().isEmpty()) {
			if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 1) {
			if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
			groupKey = "drcode";
			} else {
			groupKey = "leavehospitaldistrictcode";
			}
			} else if (serviceSubtaskCountReq.getDeptcodes() != null && !serviceSubtaskCountReq.getDeptcodes().isEmpty()) {
			} else if (serviceSubtaskCountReq.getStatisticaltype() != null && serviceSubtaskCountReq.getStatisticaltype() == 2) {
			if (serviceSubtaskCountReq.getDrcode() != null && !serviceSubtaskCountReq.getDrcode().isEmpty()) {
			groupKey = "drcode";
			} else {

	smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史