Merge remote-tracking branch 'origin/main'

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/checkupresult/CheckUpResultController.java

@@ -74,5 +74,12 @@ public class CheckUpResultController {
         return success(true);
     }
 
+    @GetMapping("/isExistUncheck")
+    @Operation(summary = "患者是否存在未检或者待查")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<Boolean> isExistUncheck(@RequestParam("medicalSn") String medicalSn) {
+        Boolean existUncheck = patientitemsService.isExistUncheck(medicalSn);
+        return success(existUncheck);
+    }
 
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.inspect.controller.admin.inspectpatient.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -32,6 +33,8 @@ public class InspectPatientRespVO {
 
     @Schema(description = "出生日期")
     @ExcelProperty("出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
     private LocalDate birthday;
 
     @Schema(description = "证件类型", example = "1")

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsService.java

@@ -67,4 +67,8 @@ public interface InspectPatientitemsService {
     //更新患者分析结果
     void updateItemsAnalyse(@Valid List<InspectPatientitemsSaveReqVO> updateReqVO );
 
+    //患者是否存在未检或者待查
+    Boolean isExistUncheck(String medicalSn);
+
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatientitems/InspectPatientitemsServiceImpl.java

@@ -125,4 +125,13 @@ public class InspectPatientitemsServiceImpl implements InspectPatientitemsServic
         int updatedRows = patientMapper.update(null, lambdaUpdateWrapper);
     }
 
+    @Override
+    public Boolean isExistUncheck(String medicalSn) {
+        LambdaQueryWrapper<InspectPatientitemsDO> lambdaQuery = new LambdaQueryWrapper<>();
+        lambdaQuery.eq(InspectPatientitemsDO::getMedicalSn, medicalSn)
+                .and(wrapper -> wrapper.eq(InspectPatientitemsDO::getItemStatus, 0).or().eq(InspectPatientitemsDO::getItemStatus,3));
+        List<InspectPatientitemsDO> list = patientitemsMapper.selectList(lambdaQuery);
+        return !list.isEmpty();
+    }
+
 }