From fcff56f26e1eda6d4119e3fa5808e4146c26a59e Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Tue, 26 Dec 2023 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?manage:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 virtual-patient-manage/Dockerfile                      |  1 -
 .../impl/DiseaseTreatmentPlanManageServiceImpl.java    |  5 +++++
 .../supervision/mapper/DiseaseTreatmentPlanMapper.java |  1 -
 .../com/supervision/model/DiseaseTreatmentPlan.java    | 10 +++++++++-
 .../resources/mapper/DiseaseTreatmentPlanMapper.xml    |  4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/virtual-patient-manage/Dockerfile b/virtual-patient-manage/Dockerfile
index 4f23a779..710a1b3f 100644
--- a/virtual-patient-manage/Dockerfile
+++ b/virtual-patient-manage/Dockerfile
@@ -1,5 +1,4 @@
 # 设置基础镜像
-# 在137服务器中使用的是 rasa_dev:1.0.0镜像
 FROM openjdk:8
 
 ENV APP_HOME=/home/app
diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
index 7e96e8bf..2eafdf18 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
@@ -46,6 +46,11 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
     @Override
     public void batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) {
         Assert.notEmpty(diseaseTreatmentPlanList,"数据不能为空");
+        diseaseTreatmentPlanList.forEach(item->{
+            if (StrUtil.isEmpty(item.getTreatmentPlanId())){
+                item.setTreatmentPlanId(item.getPlanId());
+            }
+        });
         diseaseTreatmentPlanList.forEach(this::assertDiseaseTreatmentPlan);
 
         diseaseTreatmentPlanService.saveBatch(diseaseTreatmentPlanList);
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
index 3bbc71bc..91b42894 100644
--- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java
@@ -1,6 +1,5 @@
 package com.supervision.mapper;
 
-import com.supervision.model.ConfigTreatmentPlan;
 import com.supervision.model.DiseaseTreatmentPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java
index 486448fb..2de95634 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java
@@ -23,11 +23,19 @@ public class DiseaseTreatmentPlan implements Serializable {
      */
     private String diseaseId;
 
+
     /**
-     * 处置计划id
+     * 兼容 treatmentPlanId
      */
+    @Deprecated
+    @TableField(exist = false)
     private String planId;
 
+    /**
+     * 处置计划id
+     */
+    private String treatmentPlanId;
+
     /**
      * 创建人ID
      */
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
index 9dca3472..77e65697 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseTreatmentPlan">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
-        <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
+        <result property="treatmentPlanId" column="treatment_plan_id" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -16,7 +16,7 @@
 
     <sql id="Base_Column_List">
         id
-        ,disease_id,plan_id,create_user_id,
+        ,disease_id,treatment_plan_id,create_user_id,
         create_time,update_user_id,update_time
     </sql>