Procházet zdrojové kódy

fix: 医院拜访科室支持精细化-签到详情回显兼容历史数据

lixuesong před 1 rokem
rodič
revize
dd9215fcdd

+ 16 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -2507,8 +2507,23 @@ public class ApiController {
 									}
 								}
 								if (StrUtil.isNotBlank(userSignDetail.getResult())) {
-									userSignDetail.setResultName(UserSignResultEnum.resolve(userSignDetail.getResult()).getName());
+									userSignDetail.setResultName(Objects.requireNonNull(UserSignResultEnum.resolve(userSignDetail.getResult())).getName());
 								}
+
+								// 医院打卡, 兼容历史字段department
+								if ("1".equals(userSign.getSignEntType())) {
+									if (CollUtil.isEmpty(userSignDetail.getDetail()) && ArrayUtil.isNotEmpty(userSignDetail.getDepartment())) {
+										List<Map<String, Object>> detail = new ArrayList<>();
+										for (String dep : userSignDetail.getDepartment()) {
+											Map<String, Object> detailMap = new HashMap<>();
+											detailMap.put("departmentName", dep);
+											detailMap.put("fileUrl", new String[0]);
+											detail.add(detailMap);
+										}
+										userSignDetail.setDetail(detail);
+									}
+								}
+
 								userSign.setUserSignDetail(userSignDetail);
 							}
 						}