diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index b0b0118..37dcc05 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -511,8 +511,8 @@ public class PremaritalCheckup extends BaseModel { //梅毒特异性抗体（酶免法）15 private String tp; /***艾滋病筛查***/ - //艾滋病16 - + //HIV抗体（胶金体法）16 + private String lhHiv; /***乙肝表面抗原***/ //乙肝表面抗原（酶免法）17 private String hbsag; @@ -541,6 +541,13 @@ public class PremaritalCheckup extends BaseModel { /************************************************************************/ + public String getLhHiv() { + return lhHiv; + } + + public void setLhHiv(String lhHiv) { + this.lhHiv = lhHiv; + } public String getWbc() { return wbc; } 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 b4b3335..9848388 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 @@ -259,7 +259,7 @@ public class PremaritalCheckupFacade { public PremaritalCheckupResult getResult(PremaritalCheckup result) { PremaritalCheckupResult checkupResult = new PremaritalCheckupResult(); //复制 -// BeanUtils.copy(result, checkupResult); + BeanUtils.copy(result, checkupResult); checkupResult.setCxNum(result.getCxNum()); checkupResult.setId(result.getId()); checkupResult.setParentId(result.getId()); @@ -664,7 +664,7 @@ public class PremaritalCheckupFacade { PremaritalCheckup checkup = new PremaritalCheckup(); //复制 -// BeanUtils.copy(addRequest,checkup); + BeanUtils.copy(addRequest,checkup); if (model.getSex() != null && model.getSex().equals(SystemConfig.WOMAN_ID)) { checkup.setSexType(1); } else { @@ -1866,7 +1866,7 @@ public class PremaritalCheckupFacade { public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) { PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult(); //复制 -// BeanUtils.copy(result, checkupResult); + BeanUtils.copy(result, checkupResult); checkupResult.setCxNum(result.getCxNum()); checkupResult.setBaseSign(result.getBaseSign()); checkupResult.setPhysiqueSign(result.getPhysiqueSign()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 0b50902..9c467c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -460,6 +460,291 @@ public class PremaritalCheckupAddRequest { //异常情况填写内容 private String abnormalTxt; + /** + *隆化11月男女婚检需求(1-18男女共用字段，19-27女性特有。) + */ + /**血常规检查*/ + //白细胞数目1 + private String wbc; + //红细胞数目2 + private String rbc; + //血小板数目3 + private String plt; + //血红蛋白浓度4 + private String hgb; + //中性粒细胞百分比5 + private String neuB; + //嗜酸性粒细胞百分比6 + private String eosB; + //嗜碱性粒细胞百分比7 + private String basB; + //淋巴细胞百分比8 + private String lymB; + //单核细胞百分比9 + private String monB; + /***总胆红素***/ + //总胆红素（钒盐酸法）10 + private String tbil; + /***直接胆红素***/ + //直接胆红素（钒盐酸法）11 + private String dbil; + /***尿常规检查***/ + //葡萄糖12 + private String glu; + /***血型***/ + //Rh血型13 + private String rh; + //ABO血型14 + private String abo; + /***梅毒筛查***/ + //梅毒特异性抗体（酶免法）15 + private String tp; + /***艾滋病筛查***/ + //HIV抗体（胶金体法）16 + private String lhHiv; + /***乙肝表面抗原***/ + //乙肝表面抗原（酶免法）17 + private String hbsag; + /***转氨酶***/ + //谷丙转氨酶18 + private String alt; + /***女性阴道分泌物***/ + //清洁度19 + private String qjd; + //线索细胞20 + private String xsxb; + //滴虫21 + private String dc; + //PH值22 + private String ph; + //念珠菌感染23 + private String nzj; + //沙眼衣原体筛查24 + private String syyyt; + //淋球菌筛查25 + private String lqj; + //胺臭味试验26 + private String acwsy; + //淋球菌筛查27 + private String lqjsc; + /************************************************************************/ + + public String getWbc() { + return wbc; + } + + public void setWbc(String wbc) { + this.wbc = wbc; + } + + public String getRbc() { + return rbc; + } + + public void setRbc(String rbc) { + this.rbc = rbc; + } + + public String getPlt() { + return plt; + } + + public void setPlt(String plt) { + this.plt = plt; + } + + public String getHgb() { + return hgb; + } + + public void setHgb(String hgb) { + this.hgb = hgb; + } + + public String getNeuB() { + return neuB; + } + + public void setNeuB(String neuB) { + this.neuB = neuB; + } + + public String getEosB() { + return eosB; + } + + public void setEosB(String eosB) { + this.eosB = eosB; + } + + public String getBasB() { + return basB; + } + + public void setBasB(String basB) { + this.basB = basB; + } + + public String getLymB() { + return lymB; + } + + public void setLymB(String lymB) { + this.lymB = lymB; + } + + public String getMonB() { + return monB; + } + + public void setMonB(String monB) { + this.monB = monB; + } + + public String getTbil() { + return tbil; + } + + public void setTbil(String tbil) { + this.tbil = tbil; + } + + public String getDbil() { + return dbil; + } + + public void setDbil(String dbil) { + this.dbil = dbil; + } + + public String getGlu() { + return glu; + } + + public void setGlu(String glu) { + this.glu = glu; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public String getAbo() { + return abo; + } + + public void setAbo(String abo) { + this.abo = abo; + } + + public String getTp() { + return tp; + } + + public void setTp(String tp) { + this.tp = tp; + } + + public String getLhHiv() { + return lhHiv; + } + + public void setLhHiv(String lhHiv) { + this.lhHiv = lhHiv; + } + + public String getHbsag() { + return hbsag; + } + + public void setHbsag(String hbsag) { + this.hbsag = hbsag; + } + + public String getAlt() { + return alt; + } + + public void setAlt(String alt) { + this.alt = alt; + } + + public String getQjd() { + return qjd; + } + + public void setQjd(String qjd) { + this.qjd = qjd; + } + + public String getXsxb() { + return xsxb; + } + + public void setXsxb(String xsxb) { + this.xsxb = xsxb; + } + + public String getDc() { + return dc; + } + + public void setDc(String dc) { + this.dc = dc; + } + + public String getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getNzj() { + return nzj; + } + + public void setNzj(String nzj) { + this.nzj = nzj; + } + + public String getSyyyt() { + return syyyt; + } + + public void setSyyyt(String syyyt) { + this.syyyt = syyyt; + } + + public String getLqj() { + return lqj; + } + + public void setLqj(String lqj) { + this.lqj = lqj; + } + + public String getAcwsy() { + return acwsy; + } + + public void setAcwsy(String acwsy) { + this.acwsy = acwsy; + } + + public String getLqjsc() { + return lqjsc; + } + + public void setLqjsc(String lqjsc) { + this.lqjsc = lqjsc; + } + public Integer getxRay() { return xRay; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java index f7b1113..32a9091 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java @@ -424,6 +424,291 @@ public class PremaritalCheckupPageResult { //异常情况填写内容 private String abnormalTxt; + /** + *隆化11月男女婚检需求(1-18男女共用字段，19-27女性特有。) + */ + /**血常规检查*/ + //白细胞数目1 + private String wbc; + //红细胞数目2 + private String rbc; + //血小板数目3 + private String plt; + //血红蛋白浓度4 + private String hgb; + //中性粒细胞百分比5 + private String neuB; + //嗜酸性粒细胞百分比6 + private String eosB; + //嗜碱性粒细胞百分比7 + private String basB; + //淋巴细胞百分比8 + private String lymB; + //单核细胞百分比9 + private String monB; + /***总胆红素***/ + //总胆红素（钒盐酸法）10 + private String tbil; + /***直接胆红素***/ + //直接胆红素（钒盐酸法）11 + private String dbil; + /***尿常规检查***/ + //葡萄糖12 + private String glu; + /***血型***/ + //Rh血型13 + private String rh; + //ABO血型14 + private String abo; + /***梅毒筛查***/ + //梅毒特异性抗体（酶免法）15 + private String tp; + /***艾滋病筛查***/ + //HIV抗体（胶金体法）16 + private String lhHiv; + /***乙肝表面抗原***/ + //乙肝表面抗原（酶免法）17 + private String hbsag; + /***转氨酶***/ + //谷丙转氨酶18 + private String alt; + /***女性阴道分泌物***/ + //清洁度19 + private String qjd; + //线索细胞20 + private String xsxb; + //滴虫21 + private String dc; + //PH值22 + private String ph; + //念珠菌感染23 + private String nzj; + //沙眼衣原体筛查24 + private String syyyt; + //淋球菌筛查25 + private String lqj; + //胺臭味试验26 + private String acwsy; + //淋球菌筛查27 + private String lqjsc; + /************************************************************************/ + + public String getWbc() { + return wbc; + } + + public void setWbc(String wbc) { + this.wbc = wbc; + } + + public String getRbc() { + return rbc; + } + + public void setRbc(String rbc) { + this.rbc = rbc; + } + + public String getPlt() { + return plt; + } + + public void setPlt(String plt) { + this.plt = plt; + } + + public String getHgb() { + return hgb; + } + + public void setHgb(String hgb) { + this.hgb = hgb; + } + + public String getNeuB() { + return neuB; + } + + public void setNeuB(String neuB) { + this.neuB = neuB; + } + + public String getEosB() { + return eosB; + } + + public void setEosB(String eosB) { + this.eosB = eosB; + } + + public String getBasB() { + return basB; + } + + public void setBasB(String basB) { + this.basB = basB; + } + + public String getLymB() { + return lymB; + } + + public void setLymB(String lymB) { + this.lymB = lymB; + } + + public String getMonB() { + return monB; + } + + public void setMonB(String monB) { + this.monB = monB; + } + + public String getTbil() { + return tbil; + } + + public void setTbil(String tbil) { + this.tbil = tbil; + } + + public String getDbil() { + return dbil; + } + + public void setDbil(String dbil) { + this.dbil = dbil; + } + + public String getGlu() { + return glu; + } + + public void setGlu(String glu) { + this.glu = glu; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public String getAbo() { + return abo; + } + + public void setAbo(String abo) { + this.abo = abo; + } + + public String getTp() { + return tp; + } + + public void setTp(String tp) { + this.tp = tp; + } + + public String getLhHiv() { + return lhHiv; + } + + public void setLhHiv(String lhHiv) { + this.lhHiv = lhHiv; + } + + public String getHbsag() { + return hbsag; + } + + public void setHbsag(String hbsag) { + this.hbsag = hbsag; + } + + public String getAlt() { + return alt; + } + + public void setAlt(String alt) { + this.alt = alt; + } + + public String getQjd() { + return qjd; + } + + public void setQjd(String qjd) { + this.qjd = qjd; + } + + public String getXsxb() { + return xsxb; + } + + public void setXsxb(String xsxb) { + this.xsxb = xsxb; + } + + public String getDc() { + return dc; + } + + public void setDc(String dc) { + this.dc = dc; + } + + public String getPh() { + return ph; + } + + public void setPh(String ph) { + this.ph = ph; + } + + public String getNzj() { + return nzj; + } + + public void setNzj(String nzj) { + this.nzj = nzj; + } + + public String getSyyyt() { + return syyyt; + } + + public void setSyyyt(String syyyt) { + this.syyyt = syyyt; + } + + public String getLqj() { + return lqj; + } + + public void setLqj(String lqj) { + this.lqj = lqj; + } + + public String getAcwsy() { + return acwsy; + } + + public void setAcwsy(String acwsy) { + this.acwsy = acwsy; + } + + public String getLqjsc() { + return lqjsc; + } + + public void setLqjsc(String lqjsc) { + this.lqjsc = lqjsc; + } + public Integer getxRay() { return xRay; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 23fa9b1..11046cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -475,8 +475,8 @@ public class PremaritalCheckupResult { //梅毒特异性抗体（酶免法）15 private String tp; /***艾滋病筛查***/ - //艾滋病16 - + //HIV抗体（胶金体法）16 + private String lhHiv; /***乙肝表面抗原***/ //乙肝表面抗原（酶免法）17 private String hbsag; @@ -503,6 +503,13 @@ public class PremaritalCheckupResult { //淋球菌筛查27 private String lqjsc; /************************************************************************/ + public String getLhHiv() { + return lhHiv; + } + + public void setLhHiv(String lhHiv) { + this.lhHiv = lhHiv; + } public String getWbc() { return wbc;