Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java

@@ -1,8 +1,6 @@
 package com.supervision.manage.pojo.vo;
 
-import com.supervision.model.AskPatientAnswer;
 import com.supervision.model.MedicalRec;
-import com.supervision.model.Patient;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -151,6 +151,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
         if (!StrUtil.equals(medicalRec.getDiseaseId(), reqVO.getDiseaseId())) {
             throw new BusinessException("修改病例时,不允许修改疾病");
         }
+        BeanUtil.copyProperties(reqVO, medicalRec, "id","patientId");
         medicalRec.updateById();
         // 然后修改问答
         // 首先找到数据库中的问答

virtual-patient-manage/src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
     <logger name="org.springframework.web" level="INFO"/>
 
     <!-- 开发环境 -->
-    <springProfile name="local">
+    <springProfile name="local,dev">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.supervision" level="DEBUG"/>
@@ -13,7 +13,7 @@
     </springProfile>
 
     <!-- 测试环境,生产环境 -->
-    <springProfile name="dev,test,prod">
+    <springProfile name="test,prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.supervision" level="INFO"/>

virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java

@@ -88,6 +88,7 @@ public class MedicalRec extends Model<MedicalRec> implements Serializable {
     /**
      * 病人ID
      */
+    @Deprecated
     private String patientId;
 
     /**