jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c393958b9bc206fd57cfdcf8e9b47099b54cf292

Authored by liquanyu
1 parent 42b05ce912
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 7 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ c393958
... ... @@ -128,7 +128,7 @@
128 128 /*****冗余字段*****/
129 129 private String publishName;
130 130 //是否婚检 0 未婚检 1. 已婚检
131   - private String checkup;
  131 + private Integer checkup;
132 132  
133 133 //是否怀孕建档 0 否 1 是
134 134 private String pregnantBuild;
135 135  
... ... @@ -282,11 +282,11 @@
282 282 isHistory = history;
283 283 }
284 284  
285   - public String getCheckup() {
  285 + public Integer getCheckup() {
286 286 return checkup;
287 287 }
288 288  
289   - public void setCheckup(String checkup) {
  289 + public void setCheckup(Integer checkup) {
290 290 this.checkup = checkup;
291 291 }
292 292  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ c393958
... ... @@ -583,7 +583,7 @@
583 583 * 修改妇女的婚检状态
584 584 * */
585 585 ResidentsArchiveModel residentsArchiveModel = new ResidentsArchiveModel();
586   - residentsArchiveModel.setCheckup(StringUtils.isEmpty(archiveModel.getCheckup()) ? "1" : String.valueOf(Integer.parseInt(archiveModel.getCheckup())+1));
  586 + residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup()+1);
587 587 residentsArchiveModel.setCheckupTime(new Date());
588 588 residentsArchiveService.updateResident(residentsArchiveModel, archiveModel.getId());
589 589 id = addOrUpdate(addRequest, userId, archiveModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ c393958
... ... @@ -201,7 +201,7 @@
201 201 model.setStreetRegisterId(streetRegisterId);
202 202 model.setAddressRegister(addressRegister);
203 203 //默认为为婚检
204   - model.setCheckup("0");
  204 + model.setCheckup(0);
205 205 //默认为怀孕建档
206 206 model.setPregnantBuild("0");
207 207  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ChaseVisitHistory.java View file @ c393958
... ... @@ -39,9 +39,9 @@
39 39 for (ResidentsArchiveModel archive : archiveModel) {
40 40 PremaritalCheckup checkup = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(archive.getId())), PremaritalCheckup.class);
41 41 if (null != checkup) {
42   - archive.setCheckup("1");
  42 + archive.setCheckup(1);
43 43 } else {
44   - archive.setCheckup("0");
  44 + archive.setCheckup(0);
45 45 }
46 46 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(archive.getCertificateNum())), Patients.class);
47 47 if (null != patients) {