ltkj_peis.git - gitblit

			@@ -161,7 +161,7 @@
			}else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(1);
			detailsDto.setSl(project.getSl());
			detailsDtos.add(detailsDto);
			}
			}
			@@ -254,7 +254,7 @@
			}else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(1);
			detailsDto.setSl(project.getSl());
			detailsDtoss.add(detailsDto);
			}

			@@ -338,6 +338,7 @@
			wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
			wq.groupBy(TjProject::getHisXmbm);
			wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
			wq.isNull(TjProject::getDeptId);
			List<TjProject> projects = projectService.list(wq);
			if (null != projects && projects.size() > 0) {
			for (TjProject project : projects) {
			@@ -350,7 +351,7 @@
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(1);
			detailsDto.setSl(project.getSl());
			detailDtos.add(detailsDto);
			}
			}

			@@ -1686,7 +1686,7 @@
			for (TjOrder order : list) {
			TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
			if (null != tjCustomer) {
			order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
			order.setTjCustomerName(tjCustomer.getCusName());
			order.setTjCustomerSex(tjCustomer.getCusSex());
			order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
			order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
			@@ -1740,7 +1740,7 @@
			for (TjOrder order : list) {
			TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
			if (null != tjCustomer) {
			order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
			order.setTjCustomerName(tjCustomer.getCusName());
			order.setTjCustomerSex(tjCustomer.getCusSex());
			order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
			order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));

			@@ -259,6 +259,12 @@
			@ApiModelProperty(value = "是否组合费用")
			private String sfzhfy;

			@ApiModelProperty(value = "his单价")
			private BigDecimal hisdj;

			@ApiModelProperty(value = "数量")
			private Integer sl;

			/**
			* 子项目
			*/

	ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史