Merge remote-tracking branch 'origin/master'

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/spo2info/Spo2infoController.java

@@ -105,6 +105,12 @@ public class Spo2infoController {
         return success(true);
     }
 
+    @PutMapping("/update-diagnosis")
+    @Operation(summary = "更新诊断结果")
+    public CommonResult<Boolean> upSpoInfodiagnosis(@Valid @RequestBody Spo2diagnosisVo updateReqVO) {
+        spo2infoService.upSpoInfodiagnosis(updateReqVO.getId(), updateReqVO.getDiagnosis());
+        return success(true);
+    }
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/spo2info/vo/Spo2diagnosisVo.java

@@ -0,0 +1,15 @@
+package cn.iocoder.yudao.module.system.controller.admin.spo2info.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class Spo2diagnosisVo {
+
+    private Integer id;
+
+    @Schema(description = "诊断结果")
+    private String diagnosis;
+
+
+}

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/spo2info/Spo2infoService.java

@@ -48,6 +48,11 @@ public interface Spo2infoService {
     *
     * */
     void applySuperiorReview(Integer id, String orgid);
+    /*
+    * 更新诊断结论
+    * */
+    void upSpoInfodiagnosis(Integer id, String diagnosis);
+
     /*
     * 更新设备ID 设备名称
     * */

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/spo2info/Spo2infoServiceImpl.java

@@ -93,6 +93,18 @@ public class Spo2infoServiceImpl implements Spo2infoService {
         Spo2infoDO updateObj = BeanUtils.toBean(updateReqVO, Spo2infoDO.class);
         spo2infoMapper.updateById(updateObj);
     }
+
+
+    @Override
+    public void upSpoInfodiagnosis(Integer id, String diagnosis)
+    {
+        Spo2infoSaveReqVO updateReqVO = new Spo2infoSaveReqVO();
+        updateReqVO.setId(id);
+        updateReqVO.setDiagnosis(diagnosis);
+        Spo2infoDO updateObj = BeanUtils.toBean(updateReqVO, Spo2infoDO.class);
+        spo2infoMapper.updateById(updateObj);
+    }
+
     @Override
     public  void updevice(Integer id, String deviceid, String devicename)
     {