新增

1、轮候提交时增加备注记录，医护审批时增加备注记录

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/business/vo/BpmCheckInWaitCreateReqVO.java

@@ -21,6 +21,7 @@ public class BpmCheckInWaitCreateReqVO {
     private String elderName;
 
     @Schema(description = "身份证")
+    @NotBlank(message = "身份证不能为空")
     private String idCard;
 
     @Schema(description = "院区ID", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -40,7 +41,6 @@ public class BpmCheckInWaitCreateReqVO {
     private String medicalRecordsWithinSixMonth;
 
     @Schema(description = "身份证正反面", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "身份证正反面不能为空")
     private String idCardPhoto;
 
     @Schema(description = "近期出院小结")
@@ -64,4 +64,7 @@ public class BpmCheckInWaitCreateReqVO {
 
     @Schema(description = "发起人自选审批人")
     private Map<String, List<Long>> startUserSelectAssignees;
+
+    @Schema(description = "提交备注")
+    private String commitRemark;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -683,7 +683,8 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         }
         if ("second_approve".equals(key)) {
             reqVO.setFirstAuditName(parseString(variables, "firstAuditName"));
-            if (StrUtil.isNotBlank(reqVO.getFirstAuditName())) {
+            reqVO.setMedicalCareRemark(parseString(variables, "medicalCareRemark"));
+            if (StrUtil.isNotBlank(reqVO.getFirstAuditName()) || StrUtil.isNotBlank(reqVO.getMedicalCareRemark())) {
                 checkInWaitApi.updateSecondReviewInfo(reqVO);
             }
             checkInWaitApi.updateCheckInWaitStatusByBusinessId(businessForm.getBusinessId(),

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/bpm/vo/CheckInWaitCreateReqVO.java

@@ -33,5 +33,6 @@ public class CheckInWaitCreateReqVO {
     private String physicalExaminationReport;
 
     private Long bedId;
+    private String commitRemark;
 }
 

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/bpm/vo/CheckInWaitSupplementReqVO.java

@@ -10,7 +10,7 @@ public class CheckInWaitSupplementReqVO {
     private Long nurseLevelId;
 
     private String remark;
-
+    private String medicalCareRemark;
     private String physicalExaminationReport;
 
     private String isPsychosis;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/bpm/BpmCheckInWaitApiImpl.java

@@ -84,6 +84,7 @@ public class BpmCheckInWaitApiImpl implements BpmCheckInWaitApi {
         ElderlyCheckInWaitDO updateDO = new ElderlyCheckInWaitDO();
         updateDO.setId(reqVO.getId());
         updateDO.setFirstAuditName(reqVO.getFirstAuditName());
+        updateDO.setMedicalCareRemark(reqVO.getMedicalCareRemark());
         return checkInWaitMapper.updateById(updateDO);
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyCheckInWaitDO.java

@@ -47,4 +47,8 @@ public class ElderlyCheckInWaitDO extends BaseNoDeleteDO {
     private Long bedId;
 
     private String isPsychosis;
+
+    private String medicalCareRemark;
+    private String commitRemark;
+
 }