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

virtual-patient-model/src/main/java/com/supervision/mapper/ConfigTreatmentPlanMapper.java

@@ -1,15 +1,15 @@
 package com.supervision.mapper;
 
-import com.supervision.model.TreatmentPlan;
+import com.supervision.model.ConfigTreatmentPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
 * @author Administrator
 * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Mapper
 * @createDate 2023-11-23 10:24:03
-* @Entity com.supervision.model.TreatmentPlan
+* @Entity com.supervision.model.ConfigTreatmentPlan
 */
-public interface TreatmentPlanMapper extends BaseMapper<TreatmentPlan> {
+public interface ConfigTreatmentPlanMapper extends BaseMapper<ConfigTreatmentPlan> {
 
 }
 

virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java

@@ -1,6 +1,6 @@
 package com.supervision.mapper;
 
-import com.supervision.model.DiseaseTreatmentRelation;
+import com.supervision.model.DiseaseTreatmentPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2023-11-23 10:43:28
 * @Entity com.supervision.model.VpDiseaseTreatmenRelation
 */
-public interface VpDiseaseTreatmenRelationMapper extends BaseMapper<DiseaseTreatmentRelation> {
+public interface DiseaseTreatmentPlanMapper extends BaseMapper<DiseaseTreatmentPlan> {
 
 }
 

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

@@ -1,6 +1,5 @@
 package com.supervision.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -14,7 +13,7 @@ import lombok.Data;
  */
 @TableName(value ="vp_treatment_plan")
 @Data
-public class TreatmentPlan implements Serializable {
+public class ConfigTreatmentPlan implements Serializable {
     /**
      * 主键id
      */
@@ -27,9 +26,9 @@ public class TreatmentPlan implements Serializable {
     private String disposalPlan;
 
     /**
-     * 处置方式
+     * 处置方式(0门诊 1住院)
      */
-    private String disposalMethod;
+    private Integer disposalMethod;
 
     /**
      * 一级措施

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

@@ -9,21 +9,23 @@ import lombok.Data;
 
 /**
  * 疾病处置计划关联表
- * @TableName vp_disease_treatmen_relation
+ * @TableName vp_disease_treatment_plan
  */
-@TableName(value ="vp_disease_treatment_relation")
+@TableName(value ="vp_disease_treatment_plan")
 @Data
-public class DiseaseTreatmentRelation implements Serializable {
+public class DiseaseTreatmentPlan implements Serializable {
+
+    @TableId
+    private String id;
+
     /**
      * 疾病id
      */
-    @TableId
     private String diseaseId;
 
     /**
      * 处置计划id
      */
-    @TableId
     private String planId;
 
     /**

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

@@ -61,11 +61,6 @@ public class MedicalRec implements Serializable {
      */
     private String expectDiseaseTreatmentPlan;
 
-    /**
-     * 初步诊断
-     */
-    private Object primaryDiagnosis;
-
     /**
      * 过敏史
      */

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

@@ -35,6 +35,9 @@ public class Process implements Serializable {
     @ApiModelProperty("病历ID")
     private String medicalRecId;
 
+    @ApiModelProperty("疾病ID")
+    private String diseaseId;
+
     /**
      * 用户ID
      */

virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java

@@ -1,6 +1,6 @@
 package com.supervision.service;
 
-import com.supervision.model.TreatmentPlan;
+import com.supervision.model.ConfigTreatmentPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service
 * @createDate 2023-11-23 10:24:03
 */
-public interface TreatmentPlanService extends IService<TreatmentPlan> {
+public interface ConfigTreatmentPlanService extends IService<ConfigTreatmentPlan> {
 
 }

virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java

@@ -1,6 +1,6 @@
 package com.supervision.service;
 
-import com.supervision.model.DiseaseTreatmentRelation;
+import com.supervision.model.DiseaseTreatmentPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service
 * @createDate 2023-11-23 10:43:28
 */
-public interface VpDiseaseTreatmenRelationService extends IService<DiseaseTreatmentRelation> {
+public interface DiseaseTreatmentPlanService extends IService<DiseaseTreatmentPlan> {
 
 }

virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java

@@ -1,9 +1,9 @@
 package com.supervision.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.supervision.model.TreatmentPlan;
-import com.supervision.service.TreatmentPlanService;
-import com.supervision.mapper.TreatmentPlanMapper;
+import com.supervision.model.ConfigTreatmentPlan;
+import com.supervision.service.ConfigTreatmentPlanService;
+import com.supervision.mapper.ConfigTreatmentPlanMapper;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +12,8 @@ import org.springframework.stereotype.Service;
 * @createDate 2023-11-23 10:24:03
 */
 @Service
-public class TreatmentPlanServiceImpl extends ServiceImpl<TreatmentPlanMapper, TreatmentPlan>
-    implements TreatmentPlanService{
+public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl<ConfigTreatmentPlanMapper, ConfigTreatmentPlan>
+    implements ConfigTreatmentPlanService {
 
 }
 

virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java

@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.DiseaseTreatmentPlan;
+import com.supervision.service.DiseaseTreatmentPlanService;
+import com.supervision.mapper.DiseaseTreatmentPlanMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现
+* @createDate 2023-11-23 10:43:28
+*/
+@Service
+public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl<DiseaseTreatmentPlanMapper, DiseaseTreatmentPlan>
+    implements DiseaseTreatmentPlanService {
+
+}
+
+
+
+

virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java

@@ -1,22 +0,0 @@
-package com.supervision.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.supervision.model.DiseaseTreatmentRelation;
-import com.supervision.service.VpDiseaseTreatmenRelationService;
-import com.supervision.mapper.VpDiseaseTreatmenRelationMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现
-* @createDate 2023-11-23 10:43:28
-*/
-@Service
-public class VpDiseaseTreatmenRelationServiceImpl extends ServiceImpl<VpDiseaseTreatmenRelationMapper, DiseaseTreatmentRelation>
-    implements VpDiseaseTreatmenRelationService{
-
-}
-
-
-
-

virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.supervision.mapper.TreatmentPlanMapper">
+<mapper namespace="com.supervision.mapper.ConfigTreatmentPlanMapper">
 
-    <resultMap id="BaseResultMap" type="com.supervision.model.TreatmentPlan">
+    <resultMap id="BaseResultMap" type="com.supervision.model.ConfigTreatmentPlan">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="disposalPlan" column="disposal_plan" jdbcType="VARCHAR"/>
-            <result property="disposalMethod" column="disposal_method" jdbcType="VARCHAR"/>
+            <result property="disposalMethod" column="disposal_method" jdbcType="INTEGER"/>
             <result property="firstMeasures" column="first_measures" jdbcType="VARCHAR"/>
             <result property="secondMeasures" column="second_measures" jdbcType="VARCHAR"/>
             <result property="recommendedMedication" column="recommended_medication" jdbcType="OTHER"/>

virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.supervision.mapper.VpDiseaseTreatmenRelationMapper">
+<mapper namespace="com.supervision.mapper.DiseaseTreatmentPlanMapper">
 
-    <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseTreatmentRelation">
+    <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseTreatmentPlan">
             <id property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
             <id property="planId" column="plan_id" jdbcType="VARCHAR"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>

virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml

@@ -16,7 +16,6 @@
             <result property="primarilyDiagnosisCriteria" column="primarily_diagnosis_criteria" jdbcType="VARCHAR"/>
             <result property="confirmDiagnosisCriteria" column="confirm_diagnosis_criteria" jdbcType="VARCHAR"/>
             <result property="differentialDiagnosisCriteria" column="differential_diagnosis_criteria" jdbcType="VARCHAR"/>
-            <result property="primaryDiagnosis" column="primary_diagnosis" jdbcType="OTHER"/>
             <result property="allergyHistory" column="allergy_history" jdbcType="VARCHAR"/>
             <result property="previousHistory" column="previous_history" jdbcType="VARCHAR"/>
             <result property="familyHistory" column="family_history" jdbcType="VARCHAR"/>
@@ -27,8 +26,7 @@
         id,no,patient_id,
         patient_self_desc,symptoms,expect_diagnosis_result,
         expect_disease_treatment_plan,primarily_diagnosis_criteria,
-          confirm_diagnosis_criteria,confirm_diagnosis_criteria,
-          primary_diagnosis,allergy_history,
+        confirm_diagnosis_criteria,confirm_diagnosis_criteria,allergy_history,
         previous_history,family_history,marriage_child_history
     </sql>
 </mapper>

virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java

@@ -55,7 +55,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         // 找到对应的项目的检查结果
         DiseaseAncillary diseaseAncillaryQueryBean = new DiseaseAncillary();
         diseaseAncillaryQueryBean.setItemId(reqVO.getItemId());
-        diseaseAncillaryQueryBean.setDiseaseId(process.getMedicalRecId());
+        diseaseAncillaryQueryBean.setDiseaseId(process.getDiseaseId());
         DiseaseAncillaryDto diseaseAncillary = diseaseAncillaryService.queryDiseaseAncillaryDtoOne(diseaseAncillaryQueryBean, () -> {
             DiseaseAncillaryDto get = new DiseaseAncillaryDto();
             get.setResult("无相关资讯");

virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java

@@ -1,13 +1,17 @@
 package com.supervision.service.impl;
 
+import com.supervision.exception.BusinessException;
+import com.supervision.model.MedicalRec;
 import com.supervision.model.Process;
 import com.supervision.model.User;
 import com.supervision.service.AskProcessService;
+import com.supervision.service.MedicalRecService;
 import com.supervision.service.ProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -15,11 +19,15 @@ public class AskProcessServiceImpl implements AskProcessService {
 
     private final ProcessService processService;
 
+    private final MedicalRecService medicalRecService;
+
     @Override
     public Process creatDiagnosisProcess(String patientId,String medicalId, User user) {
+        MedicalRec medicalRec = Optional.ofNullable(medicalRecService.getById(medicalId)).orElseThrow(() -> new BusinessException("未找到病历"));
         Process process = new Process();
         process.setPatientId(patientId);
         process.setMedicalRecId(medicalId);
+        process.setDiseaseId(medicalRec.getDiseaseId());
         process.setUserId(user.getId());
         process.setStatus(0);
         process.setCreateUserId(user.getId());