Merge remote-tracking branch 'origin/dev' into dev

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

@@ -40,6 +40,9 @@ public class DiagnosisPrimary implements Serializable {
     @ApiModelProperty("是否删除(0否1是)如删除,仅页面不显示")
     private Integer deleteFlag;
 
+    @ApiModelProperty("患者病情(初步诊断填写)")
+    private String patientDiseaseInfo;
+
     /**
      * 创建人ID
      */

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
+import com.supervision.handler.StringListTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +17,7 @@ import lombok.Data;
  * 诊断结果
  * @TableName vp_diagnosis_result
  */
-@TableName(value ="vp_diagnosis_result")
+@TableName(value ="vp_diagnosis_result",autoResultMap = true)
 @Data
 @ApiModel
 public class DiagnosisResult implements Serializable {
@@ -32,10 +34,11 @@ public class DiagnosisResult implements Serializable {
     private String processId;
 
     /**
-     * 诊断结果
+     * 最终诊断结果
      */
-    @ApiModelProperty("诊断结果")
+    @ApiModelProperty("最终诊断结果")
-    private String finalDiagnosis;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> finalDiagnosis;
 
     /**
      * 治疗计划
@@ -43,6 +46,12 @@ public class DiagnosisResult implements Serializable {
     @ApiModelProperty("治疗计划")
     private String treatmentPlan;
 
+    /**
+     * 治疗计划类型(0门诊 1住院)
+     */
+    @ApiModelProperty("治疗计划类型(0门诊 1住院)")
+    private Integer treatmentPlanType;
+
     /**
      * 论证诊断
      */

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

@@ -61,12 +61,19 @@ public class Disease implements Serializable {
     @ApiModelProperty("鉴别依据")
     private String basisIdentification;
 
+    /**
+     * 治疗计划
+     */
+    @ApiModelProperty("治疗计划")
+    private String diseaseTreatmentPlan;
+
     /**
      * 其他
      */
     @ApiModelProperty("其他")
     private String other;
 
+
     /**
      * 创建人ID
      */

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

@@ -38,11 +38,17 @@ public class DiseaseAncillary implements Serializable {
     private String itemId;
 
     /**
-     * 是否必查
+     * 是否必查-初步诊断依据
      */
-    @ApiModelProperty("是否必查")
+    @ApiModelProperty("是否必查-初步诊断依据(0否1是)")
     private Integer requireCheck;
 
+    @ApiModelProperty("是否是正式诊断依据(0否1是)")
+    private Integer basisConfirm;
+
+    @ApiModelProperty("是否是鉴别依据(0否1是)")
+    private Integer basisIdentification;
+
     /**
      * 结果
      */

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

@@ -44,11 +44,17 @@ public class DiseasePhysical implements Serializable {
     private String locationId;
 
     /**
-     * 是否必查
+     * 是否必查-初步诊断依据
      */
-    @ApiModelProperty("是否必查")
+    @ApiModelProperty("是否必查-初步诊断依据(0否1是)")
     private Integer requireCheck;
 
+    @ApiModelProperty("是否是正式诊断依据(0否1是)")
+    private Integer basisConfirm;
+
+    @ApiModelProperty("是否是鉴别依据(0否1是)")
+    private Integer basisIdentification;
+
     /**
      * 结果
      */

virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java

@@ -9,4 +9,6 @@ import lombok.EqualsAndHashCode;
 public class DiagnosisPrimaryVO extends DiagnosisPrimary {
 
     private String primaryDiseaseName;
+
+
 }

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

@@ -8,6 +8,7 @@
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="processId" column="process_id" jdbcType="VARCHAR"/>
         <result property="primaryDiagnosisId" column="primary_diagnosis_id" jdbcType="VARCHAR"/>
+        <result property="patientDiseaseInfo" column="patient_disease_info" 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 +17,7 @@
 
     <sql id="Base_Column_List">
         id
-        ,process_id,primary_diagnosis,
+        ,process_id,primary_diagnosis,patient_disease_info,
         create_user_id,create_time,update_user_id,
         update_time
     </sql>

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

@@ -7,7 +7,8 @@
     <resultMap id="BaseResultMap" type="com.supervision.model.DiagnosisResult">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="processId" column="process_id" jdbcType="VARCHAR"/>
-            <result property="finalDiagnosis" column="final_diagnosis" jdbcType="VARCHAR"/>
+        <result property="finalDiagnosis" column="final_diagnosis" jdbcType="ARRAY"
+                typeHandler="com.supervision.handler.StringListTypeHandler"/>
         <result property="treatmentPlan" column="treatment_plan" jdbcType="VARCHAR"/>
         <result property="proveDiagnosisDesc" column="prove_diagnosis_desc" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -17,7 +18,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,process_id,final_diagnosis,
+        id
+        ,process_id,final_diagnosis,
         treatment_plan,prove_diagnosis_desc,create_user_id,
         create_time,update_user_id,update_time
     </sql>

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

@@ -9,6 +9,8 @@
         <result property="patientId" column="patient_id" jdbcType="VARCHAR"/>
         <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
         <result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
+        <result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
+        <result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
         <result property="result" column="result" jdbcType="VARCHAR"/>
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -18,7 +20,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,item_id,require_check,
+        id
+        ,item_id,require_check,basis_confirm,basis_identification
         result,description,create_user_id,
         create_time,update_user_id,update_time
     </sql>

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

@@ -12,6 +12,7 @@
         <result property="preliminaryDiagnosis" column="preliminary_diagnosis" jdbcType="VARCHAR"/>
         <result property="confirmingDiagnosis" column="confirming_diagnosis" jdbcType="VARCHAR"/>
         <result property="basisIdentification" column="basis_identification" jdbcType="VARCHAR"/>
+        <result property="diseaseTreatmentPlan" column="disease_treatment_plan" jdbcType="VARCHAR"/>
         <result property="other" column="other" jdbcType="VARCHAR"/>
         <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -20,9 +21,10 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,code,status,
+        id
+        ,code,status,
         expected_diagnosis_result,preliminary_diagnosis,confirming_diagnosis,
-        basis_identification,other,create_user_id,
+        basis_identification,disease_treatment_plan,other,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 </mapper>

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

@@ -10,6 +10,8 @@
             <result property="toolId" column="tool_id" jdbcType="VARCHAR"/>
             <result property="locationId" column="location_id" jdbcType="VARCHAR"/>
             <result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
+        <result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
+        <result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
             <result property="result" column="result" jdbcType="VARCHAR"/>
             <result property="trait" column="trait" jdbcType="VARCHAR"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -20,7 +22,7 @@
 
     <sql id="Base_Column_List">
         id,patient_id,tool_id,location_id,
-        require_check,result,trait,
+        require_check,basis_confirm,basis_identification,result,trait,
         create_user_id,create_time,update_user_id,
         update_time
     </sql>

virtual-patient-web/src/main/java/com/supervision/controller/AskDiagnosisResultController.java

@@ -0,0 +1,30 @@
+package com.supervision.controller;
+
+import com.supervision.pojo.vo.DiagnosisResultResVO;
+import com.supervision.pojo.vo.FinishAskReqVO;
+import com.supervision.service.AskDiagnosisResultService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "问诊结束")
+@RestController
+@RequestMapping("/askDiagnosisResult")
+@RequiredArgsConstructor
+public class AskDiagnosisResultController {
+
+    private final AskDiagnosisResultService askDiagnosisResultService;
+
+    @ApiOperation("结束问诊")
+    @PostMapping("finishAsk")
+    public void finishAsk(@RequestBody FinishAskReqVO reqVO){
+        askDiagnosisResultService.finishAsk(reqVO);
+    }
+
+    @ApiOperation("查询最终诊断结果")
+    @GetMapping("queryDiagnosisResult")
+    public DiagnosisResultResVO queryDiagnosisResult(String processId){
+        return askDiagnosisResultService.queryDiagnosisResult(processId);
+    }
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisConfirmResultResVO.java

@@ -0,0 +1,20 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel
+public class BasisConfirmResultResVO {
+
+    @ApiModelProperty("证实诊断依据")
+    private String confirmingDiagnosis;
+
+    @ApiModelProperty("证实诊断列表")
+    private List<BasisDiagnosisNodeResVO> nodeList;
+
+
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisDiagnosisNodeResVO.java

@@ -0,0 +1,22 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BasisDiagnosisNodeResVO {
+
+    @ApiModelProperty("初步诊断依据 0对话 1体格检查 2辅助检查")
+    private Integer type;
+
+    @ApiModelProperty("记录名称 对话就是对话内容,其他的就是对应的名称")
+    private String recordName;
+
+    @ApiModelProperty("对应的记录ID")
+    private  String recordId;
+
+    @ApiModelProperty("是否正确,1正确")
+    private Integer correct;
+
+
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisIdentificationResultResVO.java

@@ -0,0 +1,9 @@
+package com.supervision.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class BasisIdentificationResultResVO {
+
+
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisPrimaryResultResVO.java

@@ -0,0 +1,17 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BasisPrimaryResultResVO {
+
+
+    @ApiModelProperty("初步诊断依据")
+    private String preliminaryDiagnosis;
+
+    @ApiModelProperty("初步诊断依据列表")
+    private List<BasisDiagnosisNodeResVO> nodeList;
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/DealPlanResVO.java

@@ -0,0 +1,7 @@
+package com.supervision.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class DealPlanResVO {
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisDiseaseResultNodeVO.java

@@ -0,0 +1,21 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class DiagnosisDiseaseResultNodeVO {
+
+    @ApiModelProperty("疾病名称")
+    private String diseaseName;
+
+    @ApiModelProperty("是否正确,1正确")
+    private Integer correct;
+
+    @ApiModelProperty("疾病ID")
+    private Integer diseaseId;
+
+
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisResultResVO.java

@@ -0,0 +1,29 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DiagnosisResultResVO {
+
+    private String id;
+
+    @ApiModelProperty("预期诊断结果")
+    private ExpertDiagnosisResultResVO expertDiagnosisResult;
+
+    @ApiModelProperty("初步诊断依据")
+    private BasisPrimaryResultResVO basisPrimaryResultResVO;
+
+    @ApiModelProperty("证实诊断依据")
+    private BasisConfirmResultResVO basisConfirmResultResVO;
+
+    @ApiModelProperty("鉴别诊断依据")
+    private BasisIdentificationResultResVO basisIdentificationResult;
+
+    @ApiModelProperty("全面检查")
+    private FullCheckResVO fullCheck;
+
+    @ApiModelProperty("处置方案")
+    private DealPlanResVO dealPlan;
+
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java

@@ -0,0 +1,24 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 预期诊断结果
+ */
+@Data
+@ApiModel
+public class ExpertDiagnosisResultResVO {
+
+    @ApiModelProperty("诊断")
+    private String diagnosis;
+
+    @ApiModelProperty("用户诊断结果")
+    private List<DiagnosisDiseaseResultNodeVO> userDiagnosisResult;
+
+    @ApiModelProperty("预期诊断结果")
+    private List<DiagnosisDiseaseResultNodeVO> expertDiagnosisResult;
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/FinishAskReqVO.java

@@ -0,0 +1,18 @@
+package com.supervision.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class FinishAskReqVO {
+
+    private String processId;
+
+    @ApiModelProperty("治疗计划类型(0门诊 1住院)")
+    private Integer treatmentPlanType;
+
+    @ApiModelProperty("治疗计划")
+    private String treatmentPlan;
+}

virtual-patient-web/src/main/java/com/supervision/pojo/vo/FullCheckResVO.java

@@ -0,0 +1,4 @@
+package com.supervision.pojo.vo;
+
+public class FullCheckResVO {
+}

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

@@ -0,0 +1,12 @@
+package com.supervision.service;
+
+import com.supervision.pojo.vo.DiagnosisResultResVO;
+import com.supervision.pojo.vo.FinishAskReqVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface AskDiagnosisResultService {
+
+    void finishAsk(FinishAskReqVO reqVO);
+
+    DiagnosisResultResVO queryDiagnosisResult(String processId);
+}

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

@@ -0,0 +1,48 @@
+package com.supervision.service.impl;
+
+
+import com.supervision.model.DiagnosisPrimary;
+import com.supervision.model.DiagnosisResult;
+import com.supervision.pojo.vo.DiagnosisResultResVO;
+import com.supervision.pojo.vo.FinishAskReqVO;
+import com.supervision.service.AskDiagnosisResultService;
+import com.supervision.service.DiagnosisPrimaryService;
+import com.supervision.service.DiagnosisResultService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService {
+
+    private final DiagnosisResultService diagnosisResultService;
+
+    private final DiagnosisPrimaryService diagnosisPrimaryService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void finishAsk(FinishAskReqVO reqVO) {
+        // 首先保存诊断结果
+        DiagnosisResult diagnosisResult = new DiagnosisResult();
+        diagnosisResult.setProcessId(reqVO.getProcessId());
+        // 最终诊断结果,从初步诊断中获取
+        List<DiagnosisPrimary> list = diagnosisPrimaryService.lambdaQuery()
+                .eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId())
+                .eq(DiagnosisPrimary::getDeleteFlag,0)
+                .list();
+        diagnosisResult.setFinalDiagnosis(list.stream().map(DiagnosisPrimary::getPrimaryDiagnosisId).collect(Collectors.toList()));
+        diagnosisResult.setTreatmentPlanType(reqVO.getTreatmentPlanType());
+        diagnosisResult.setTreatmentPlan(reqVO.getTreatmentPlan());
+        diagnosisResultService.save(diagnosisResult);
+    }
+
+    @Override
+    public DiagnosisResultResVO queryDiagnosisResult(String processId) {
+
+        return null;
+    }
+}

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

@@ -9,6 +9,7 @@ import com.supervision.util.UserUtil;
 import com.supervision.vo.ask.DiagnosisPrimaryVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -31,9 +32,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void savePrimary(DiagnosisPrimary reqVO) {
         reqVO.setCreateUserId(UserUtil.getUser().getId());
         diagnosisPrimaryService.save(reqVO);
+        // 将process关联的所有的患者描述全部都修改
+        diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getPatientDiseaseInfo,reqVO.getPatientDiseaseInfo())
+                .eq(DiagnosisPrimary::getId,reqVO.getProcessId()).update();
     }
 
     @Override