辅助检查及体格检查接口提交,初步诊断接口提交

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

@@ -2,6 +2,9 @@ package com.supervision.mapper;
 
 import com.supervision.model.DiagnosisPrimary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
+
+import java.util.List;
 
 /**
 * @author flevance
@@ -11,6 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface DiagnosisPrimaryMapper extends BaseMapper<DiagnosisPrimary> {
 
+    List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId);
+
 }
 
 

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

@@ -38,11 +38,17 @@ public class DiagnosisAncillaryRecord extends Model<DiagnosisAncillaryRecord> im
     @ApiModelProperty("项目ID")
     private String itemId;
 
+    /**
+     * 初步诊断ID
+     */
+    @ApiModelProperty("初步诊断ID")
+    private String primaryId;
+
     /**
      * 检查结果
      */
     @ApiModelProperty("检查结果")
-    private String value;
+    private String result;
 
     /**
      * 创建人ID

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

@@ -44,6 +44,12 @@ public class DiagnosisPhysicalRecord extends Model<DiagnosisPhysicalRecord> impl
     @ApiModelProperty("体格检查部位ID")
     private String locationId;
 
+    /**
+     * 初步诊断ID
+     */
+    @ApiModelProperty("初步诊断ID")
+    private String primaryId;
+
     /**
      * 体格检查结果
      */

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

@@ -32,10 +32,13 @@ public class DiagnosisPrimary implements Serializable {
     private String processId;
 
     /**
-     * 初步诊断疾病
+     * 初步诊断疾病,关联disease表ID
      */
-    @ApiModelProperty("初步诊断疾病")
+    @ApiModelProperty("初步诊断疾病ID,关联disease表ID")
-    private String primaryDiagnosis;
+    private String primaryDiagnosisId;
+
+    @ApiModelProperty("是否删除(0否1是)如删除,仅页面不显示")
+    private Integer deleteFlag;
 
     /**
      * 创建人ID

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

@@ -2,6 +2,9 @@ package com.supervision.service;
 
 import com.supervision.model.DiagnosisPrimary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
+
+import java.util.List;
 
 /**
 * @author flevance
@@ -10,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface DiagnosisPrimaryService extends IService<DiagnosisPrimary> {
 
+    List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId);
+
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.supervision.model.DiagnosisPrimary;
 import com.supervision.service.DiagnosisPrimaryService;
 import com.supervision.mapper.DiagnosisPrimaryMapper;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author flevance
 * @description 针对表【vp_diagnosis_primary(初步诊断表)】的数据库操作Service实现
@@ -15,6 +18,10 @@ import org.springframework.stereotype.Service;
 public class DiagnosisPrimaryServiceImpl extends ServiceImpl<DiagnosisPrimaryMapper, DiagnosisPrimary>
     implements DiagnosisPrimaryService{
 
+    @Override
+    public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId) {
+        return this.baseMapper.queryAskPrimaryList(processId);
+    }
 }
 
 

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

@@ -0,0 +1,12 @@
+package com.supervision.vo.ask;
+
+import com.supervision.model.DiagnosisPrimary;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DiagnosisPrimaryVO extends DiagnosisPrimary {
+
+    private String primaryDiseaseName;
+}

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

@@ -8,7 +8,8 @@
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="processId" column="process_id" jdbcType="VARCHAR"/>
             <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
-            <result property="value" column="value" jdbcType="VARCHAR"/>
+            <result property="primaryId" column="primary_id" jdbcType="VARCHAR"/>
+            <result property="result" column="result" 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,8 +17,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,process_id,item_id,
+        id,process_id,item_id,primary_id,
-        value,create_user_id,create_time,
+        result,create_user_id,create_time,
         update_user_id,update_time
     </sql>
 </mapper>

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

@@ -5,20 +5,22 @@
 <mapper namespace="com.supervision.mapper.DiagnosisPhysicalRecordMapper">
 
     <resultMap id="BaseResultMap" type="com.supervision.model.DiagnosisPhysicalRecord">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="processId" column="process_id" jdbcType="VARCHAR"/>
+        <result property="processId" column="process_id" jdbcType="VARCHAR"/>
-            <result property="toolId" column="tool_id" jdbcType="VARCHAR"/>
+        <result property="toolId" column="tool_id" jdbcType="VARCHAR"/>
-            <result property="locationId" column="location_id" jdbcType="VARCHAR"/>
+        <result property="locationId" column="location_id" jdbcType="VARCHAR"/>
-            <result property="result" column="result" jdbcType="VARCHAR"/>
+        <result property="primaryId" column="primary_id" jdbcType="VARCHAR"/>
-            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="result" column="result" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
-            <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,process_id,tool_id,
+        id
-        location_id,result,create_user_id,
+        ,process_id,tool_id,
+        location_id,primary_id,result,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 </mapper>

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

@@ -5,18 +5,25 @@
 <mapper namespace="com.supervision.mapper.DiagnosisPrimaryMapper">
 
     <resultMap id="BaseResultMap" type="com.supervision.model.DiagnosisPrimary">
-            <id property="id" column="id" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
-            <result property="processId" column="process_id" jdbcType="VARCHAR"/>
+        <result property="processId" column="process_id" jdbcType="VARCHAR"/>
-            <result property="primaryDiagnosis" column="primary_diagnosis" jdbcType="VARCHAR"/>
+        <result property="primaryDiagnosisId" column="primary_diagnosis_id" jdbcType="VARCHAR"/>
-            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+        <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+        <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,process_id,primary_diagnosis,
+        id
+        ,process_id,primary_diagnosis,
         create_user_id,create_time,update_user_id,
         update_time
     </sql>
+    <select id="queryAskPrimaryList" resultType="com.supervision.vo.ask.DiagnosisPrimaryVO">
+        select t1.*, t2.disease_name as primaryDiseaseName
+        from vp_diagnosis_primary t1
+                 left join vp_disease t2 on t1.primary_diagnosis_id = t2.id
+        where t1.delete_flag = 0
+    </select>
 </mapper>

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

@@ -30,10 +30,10 @@ public class AskAncillaryController {
     }
 
 
-    @ApiOperation("查询辅助检查的结果")
+    @ApiOperation("进行辅助检查,并获取结果")
     @GetMapping("queryAskAncillaryResult")
-    public DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO){
+    public DiagnosisAncillaryRecord execAskAncillaryResult(AskAncillaryResultReqVO reqVO){
-        return askAncillaryService.queryAskAncillaryResult(reqVO);
+        return askAncillaryService.execAskAncillaryResult(reqVO);
     }
 
 

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

@@ -1,11 +1,11 @@
 package com.supervision.controller;
 
-import com.supervision.model.ConfigPhysicalLocation;
 import com.supervision.model.ConfigPhysicalTool;
 import com.supervision.model.DiagnosisPhysicalRecord;
 import com.supervision.pojo.vo.AskPhysicalResultReqVO;
 import com.supervision.service.AskPhysicalService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;

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

@@ -0,0 +1,49 @@
+package com.supervision.controller;
+
+
+import com.supervision.model.DiagnosisPrimary;
+import com.supervision.model.Disease;
+import com.supervision.service.AskPrimaryService;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "初步诊断")
+@RestController
+@RequestMapping("askPrimary")
+@RequiredArgsConstructor
+public class AskPrimaryController {
+
+    private final AskPrimaryService askPrimaryService;
+
+    @ApiOperation("查询初步诊断列表")
+    @GetMapping("queryAskPrimaryList")
+    public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId){
+        return askPrimaryService.queryAskPrimaryList(processId);
+    }
+
+    @ApiOperation("获取初步诊断可选的下拉列表")
+    @GetMapping("queryPrimaryCanChooseList")
+    public List<Disease> queryPrimaryCanChooseList(){
+        return askPrimaryService.queryPrimaryCanChooseList();
+    }
+
+    @ApiOperation("保存初步诊断")
+    @GetMapping("savePrimary")
+    public void savePrimary(@RequestBody DiagnosisPrimary reqVO){
+        askPrimaryService.savePrimary(reqVO);
+    }
+
+    @ApiOperation("删除初步诊断")
+    @GetMapping("deletePrimary")
+    public void deletePrimary(String id){
+        askPrimaryService.deletePrimary(id);
+    }
+}

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

@@ -1,15 +1,24 @@
 package com.supervision.pojo.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
+@ApiModel
 public class AskAncillaryResultReqVO {
 
+    @ApiModelProperty("辅助检查工具ID")
     @NotBlank(message = "辅助检查工具ID不能为空")
     private String itemId;
 
+    @ApiModelProperty("初步诊断ID")
+    @NotBlank(message = "初步诊断ID不能为空")
+    private String primaryId;
+
+    @ApiModelProperty("流程ID")
     @NotBlank(message = "流程ID不能为空")
     private String processId;
 

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

@@ -17,6 +17,10 @@ public class AskPhysicalResultReqVO {
     @ApiModelProperty("位置编码")
     private String locationCode;
 
+    @ApiModelProperty("初步诊断ID")
+    @NotBlank(message = "初步诊断ID不能为空")
+    private String primaryId;
+
     @NotBlank(message = "流程ID不能为空")
     @ApiModelProperty("流程ID")
     private String processId;

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

@@ -13,5 +13,5 @@ public interface AskAncillaryService {
     Map<String, List<ConfigAncillaryItem>> queryAncillaryItemList();
 
 
-    DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO);
+    DiagnosisAncillaryRecord execAskAncillaryResult(AskAncillaryResultReqVO reqVO);
 }

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

@@ -0,0 +1,19 @@
+package com.supervision.service;
+
+import com.supervision.model.DiagnosisPrimary;
+import com.supervision.model.Disease;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+public interface AskPrimaryService {
+
+    List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId);
+
+    List<Disease> queryPrimaryCanChooseList();
+
+    void savePrimary(DiagnosisPrimary reqVO);
+
+    void deletePrimary(String id);
+}

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

@@ -24,8 +24,6 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
 
     private final ConfigAncillaryItemService ancillaryItemService;
 
-    private final ConfigPhysicalLocationService configPhysicalLocationService;
-
     @Override
     public Map<String, List<ConfigAncillaryItem>> queryAncillaryItemList() {
         List<ConfigAncillaryItem> list = ancillaryItemService.lambdaQuery().list();
@@ -33,7 +31,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
     }
 
     @Override
-    public DiagnosisAncillaryRecord queryAskAncillaryResult(AskAncillaryResultReqVO reqVO) {
+    public DiagnosisAncillaryRecord execAskAncillaryResult(AskAncillaryResultReqVO reqVO) {
         // 首先根据process_id查新到流程ID
         Process process = Optional.ofNullable(processService.getById(reqVO.getProcessId())).orElseThrow(() -> new BusinessException("未找到流程ID"));
         // 找到对应的项目的检查结果
@@ -47,7 +45,8 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
         DiagnosisAncillaryRecord record = new DiagnosisAncillaryRecord();
         record.setProcessId(process.getId());
         record.setItemId(reqVO.getItemId());
-        record.setValue(diseaseAncillary.getResult());
+        record.setPrimaryId(reqVO.getPrimaryId());
+        record.setResult(diseaseAncillary.getResult());
         record.setCreateUserId(UserUtil.getUser().getId());
         record.setUpdateUserId(UserUtil.getUser().getId());
         return record;

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

@@ -59,6 +59,7 @@ public class AskPhysicalServiceImpl implements AskPhysicalService {
         diagnosisPhysicalRecord.setProcessId(process.getId());
         diagnosisPhysicalRecord.setToolId(tool.getId());
         diagnosisPhysicalRecord.setLocationId(locationId);
+        diagnosisPhysicalRecord.setPrimaryId(reqVO.getPrimaryId());
         diagnosisPhysicalRecord.setResult(result.getResult());
         diagnosisPhysicalRecord.setCreateUserId(UserUtil.getUser().getCreateUserId());
         diagnosisPhysicalRecord.setUpdateUserId(UserUtil.getUser().getCreateUserId());

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

@@ -0,0 +1,43 @@
+package com.supervision.service.impl;
+
+import com.supervision.model.DiagnosisPrimary;
+import com.supervision.model.Disease;
+import com.supervision.service.AskPrimaryService;
+import com.supervision.service.DiagnosisPrimaryService;
+import com.supervision.service.DiseaseService;
+import com.supervision.util.UserUtil;
+import com.supervision.vo.ask.DiagnosisPrimaryVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class AskPrimaryServiceImpl implements AskPrimaryService {
+
+    private final DiagnosisPrimaryService diagnosisPrimaryService;
+
+    private final DiseaseService diseaseService;
+
+    @Override
+    public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId) {
+        return diagnosisPrimaryService.queryAskPrimaryList(processId);
+    }
+
+    @Override
+    public List<Disease> queryPrimaryCanChooseList() {
+        return diseaseService.list();
+    }
+
+    @Override
+    public void savePrimary(DiagnosisPrimary reqVO) {
+        reqVO.setCreateUserId(UserUtil.getUser().getId());
+        diagnosisPrimaryService.save(reqVO);
+    }
+
+    @Override
+    public void deletePrimary(String id) {
+        diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getDeleteFlag,1).eq(DiagnosisPrimary::getId,id).update();
+    }
+}