diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index a2be6e6..26abdd1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -61,7 +61,10 @@ public class CervicalCancerModel extends BaseModel { //季度 private Integer quarter; //编号 - private String code; + private String areaCode; //行政区划编码 + private String streetCode;//街道编码 + private String villageCode;//村委会编码 + private String seqCode;//顺序编码 /** * 身份证 @@ -359,6 +362,93 @@ public class CervicalCancerModel extends BaseModel { private String hospitalId; + private String tbhospital;//填报单位 + private String tbUser;//填报用户 + private String tbDate;//填报日期 + private String inHospital;//录入单位 + private String inUser;//录入人 + private String inDate;//录入日期 + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getStreetCode() { + return streetCode; + } + + public void setStreetCode(String streetCode) { + this.streetCode = streetCode; + } + + public String getVillageCode() { + return villageCode; + } + + public void setVillageCode(String villageCode) { + this.villageCode = villageCode; + } + + public String getSeqCode() { + return seqCode; + } + + public void setSeqCode(String seqCode) { + this.seqCode = seqCode; + } + + public String getTbhospital() { + return tbhospital; + } + + public void setTbhospital(String tbhospital) { + this.tbhospital = tbhospital; + } + + public String getTbUser() { + return tbUser; + } + + public void setTbUser(String tbUser) { + this.tbUser = tbUser; + } + + public String getTbDate() { + return tbDate; + } + + public void setTbDate(String tbDate) { + this.tbDate = tbDate; + } + + public String getInHospital() { + return inHospital; + } + + public void setInHospital(String inHospital) { + this.inHospital = inHospital; + } + + public String getInUser() { + return inUser; + } + + public void setInUser(String inUser) { + this.inUser = inUser; + } + + public String getInDate() { + return inDate; + } + + public void setInDate(String inDate) { + this.inDate = inDate; + } + public Date getNextDate() { return nextDate; } @@ -495,13 +585,7 @@ public class CervicalCancerModel extends BaseModel { this.quarter = quarter; } - public String getCode() { - return code; - } - public void setCode(String code) { - this.code = code; - } public String getIdCardNo() { return idCardNo; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 92a4ff0..3a4f593 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -874,14 +874,14 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { cervixVisitModel.setAreaId(cervicalCancerRequest.getAreaId()); cervixVisitModel.setStreetId(cervicalCancerRequest.getStreetId()); cervixVisitModel.setAddress(cervicalCancerRequest.getAddress()); - cervixVisitModel.setCode(cervicalCancerRequest.getCode()); + //cervixVisitModel.setCode(cervicalCancerRequest.getCode()); cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); cervixVisitModel.setType(0); cervixVisitModel.setYn(1); cervixVisitService.addOneCervixVisit(cervixVisitModel); }else { cervixVisitModel.setParentId(cervicalCancerRequest.getId()); - cervixVisitModel.setCode(cervicalCancerRequest.getCode()); + // cervixVisitModel.setCode(cervicalCancerRequest.getCode()); cervixVisitModel.setCheckDate(cervicalCancerRequest.getCreated()); cervixVisitService.updateOneCervixVisit(cervixVisitModel,2); }