diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index f24ef0c..870aeb0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -128,7 +128,7 @@ public class ResidentsArchiveModel extends BaseModel { /*****冗余字段*****/ private String publishName; //是否婚检 0 未婚检 1. 已婚检 - private String checkup; + private Integer checkup; //是否怀孕建档 0 否 1 是 private String pregnantBuild; @@ -282,11 +282,11 @@ public class ResidentsArchiveModel extends BaseModel { isHistory = history; } - public String getCheckup() { + public Integer getCheckup() { return checkup; } - public void setCheckup(String checkup) { + public void setCheckup(Integer checkup) { this.checkup = checkup; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index ae424da..45af7a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -583,7 +583,7 @@ public class PremaritalCheckupFacade { * 修改妇女的婚检状态 * */ ResidentsArchiveModel residentsArchiveModel = new ResidentsArchiveModel(); - residentsArchiveModel.setCheckup(StringUtils.isEmpty(archiveModel.getCheckup()) ? "1" : String.valueOf(Integer.parseInt(archiveModel.getCheckup())+1)); + residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup()+1); residentsArchiveModel.setCheckupTime(new Date()); residentsArchiveService.updateResident(residentsArchiveModel, archiveModel.getId()); id = addOrUpdate(addRequest, userId, archiveModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index 37ab351..8d90fdf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -201,7 +201,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert> { for (ResidentsArchiveModel archive : archiveModel) { PremaritalCheckup checkup = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(archive.getId())), PremaritalCheckup.class); if (null != checkup) { - archive.setCheckup("1"); + archive.setCheckup(1); } else { - archive.setCheckup("0"); + archive.setCheckup(0); } Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(archive.getCertificateNum())), Patients.class); if (null != patients) {