~chenjiahe/phi_platform.git

			@@ -750,7 +750,7 @@
			throw new TipsException("查询不到原治疗单项目信息！");
			}

			if(StringUtils.noNull(oldData.getUserProjectItemId()) && oldData.getUserProjectItemId().equals(treatProject.getUserProjectItemId())){
			if(StringUtils.noNull(oldData.getUserProjectItemId()) && !oldData.getUserProjectItemId().equals(treatProject.getUserProjectItemId())){
			throw new TipsException("已购买治疗单项目不可替换！");
			}
			}

			@@ -707,10 +707,8 @@
			}
			//判断是否替换项目(原关联用户项目id为空、新数据关联用户项目id)
			if(StringUtils.isEmpty(oldTp.getUserProjectItemId()) && StringUtils.noNull(treatProject.getUserProjectItemId())){
			if(oldTp.getNum() != treatProject.getNum()){
			logInfo.append("替换原项目【").append(oldTp.getProjectName()).append(" x ").append(oldTp.getNum()).append("】")
			.append("为已购买【").append(treatProject.getProjectName()).append(" x ").append(treatProject.getNum()).append("】;");
			}
			logInfo.append("替换原项目【").append(oldTp.getProjectName()).append(" x ").append(oldTp.getNum()).append("】")
			.append("为已购买【").append(treatProject.getProjectName()).append(" x ").append(treatProject.getNum()).append("】;");
			}else{
			if(oldTp.getNum() != treatProject.getNum()){
			logInfo.append("修改【").append(oldTp.getProjectName()).append(" x ").append(treatProject.getNum()).append("】").append(";");

	phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史