jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ceb1e7c114a187e55b012a0a4102115329f30f79

Authored by zhangchao
1 parent 100a284422
Exists in dev

#fix:优化大同产筛查询逻辑

Showing 2 changed files with 120 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ ceb1e7c
... ... @@ -510,6 +510,7 @@
510 510 private String HBeAgj;//乙肝e抗原
511 511 private String HBsAbJ;//乙肝e抗体
512 512 private String HBsAgJ;//乙肝核心抗体
  513 +
513 514 private String HIVJ;//人类免疫缺陷病毒抗体
514 515 private String tp;//梅毒螺旋体抗体
515 516  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ ceb1e7c
... ... @@ -94,6 +94,25 @@
94 94 //孕妇民族
95 95 private String pnationStr;
96 96  
  97 + /**
  98 + * 大同需求
  99 + */
  100 +
  101 + //血糖筛查结果
  102 + private String glucm;//空腹
  103 + private String gluthree;//60分钟血糖
  104 + private String glufour;//120分钟血糖
  105 + //产筛结果
  106 + private String nipt;//唐氏筛查/无创DNA检测
  107 + //传染病筛查
  108 + private String HBcAbJ;//乙肝表面抗原
  109 + private String HBeAbJ;//乙肝表面抗体
  110 + private String HBeAgj;//乙肝e抗原
  111 + private String HBsAbJ;//乙肝e抗体
  112 + private String HBsAgJ;//乙肝核心抗体
  113 + private String HIVJ;//人类免疫缺陷病毒抗体
  114 + private String tp;//梅毒螺旋体抗体
  115 +
97 116 public String getPnationStr() {
98 117 return pnationStr;
99 118 }
... ... @@ -382,6 +401,94 @@
382 401 this.yChanQi = yChanQi;
383 402 }
384 403  
  404 + public String getGlucm() {
  405 + return glucm;
  406 + }
  407 +
  408 + public void setGlucm(String glucm) {
  409 + this.glucm = glucm;
  410 + }
  411 +
  412 + public String getGluthree() {
  413 + return gluthree;
  414 + }
  415 +
  416 + public void setGluthree(String gluthree) {
  417 + this.gluthree = gluthree;
  418 + }
  419 +
  420 + public String getGlufour() {
  421 + return glufour;
  422 + }
  423 +
  424 + public void setGlufour(String glufour) {
  425 + this.glufour = glufour;
  426 + }
  427 +
  428 + public String getNipt() {
  429 + return nipt;
  430 + }
  431 +
  432 + public void setNipt(String nipt) {
  433 + this.nipt = nipt;
  434 + }
  435 +
  436 + public String getHBcAbJ() {
  437 + return HBcAbJ;
  438 + }
  439 +
  440 + public void setHBcAbJ(String HBcAbJ) {
  441 + this.HBcAbJ = HBcAbJ;
  442 + }
  443 +
  444 + public String getHBeAbJ() {
  445 + return HBeAbJ;
  446 + }
  447 +
  448 + public void setHBeAbJ(String HBeAbJ) {
  449 + this.HBeAbJ = HBeAbJ;
  450 + }
  451 +
  452 + public String getHBeAgj() {
  453 + return HBeAgj;
  454 + }
  455 +
  456 + public void setHBeAgj(String HBeAgj) {
  457 + this.HBeAgj = HBeAgj;
  458 + }
  459 +
  460 + public String getHBsAbJ() {
  461 + return HBsAbJ;
  462 + }
  463 +
  464 + public void setHBsAbJ(String HBsAbJ) {
  465 + this.HBsAbJ = HBsAbJ;
  466 + }
  467 +
  468 + public String getHBsAgJ() {
  469 + return HBsAgJ;
  470 + }
  471 +
  472 + public void setHBsAgJ(String HBsAgJ) {
  473 + this.HBsAgJ = HBsAgJ;
  474 + }
  475 +
  476 + public String getHIVJ() {
  477 + return HIVJ;
  478 + }
  479 +
  480 + public void setHIVJ(String HIVJ) {
  481 + this.HIVJ = HIVJ;
  482 + }
  483 +
  484 + public String getTp() {
  485 + return tp;
  486 + }
  487 +
  488 + public void setTp(String tp) {
  489 + this.tp = tp;
  490 + }
  491 +
385 492 public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel, Patients patients, List<AntExChuModel> antExChuModel) {
386 493 if (null != patients) {
387 494 setId(patients.getId());
... ... @@ -424,6 +531,18 @@
424 531 setMensStopEndDay(patients.getMensStopEndDay());
425 532 setMensStopStartDay(patients.getMensStopStartDay());
426 533 setFuckLastMens(DateUtil.getyyyy_MM_dd(patients.getFuckLastMens()));
  534 +
  535 + setGlucm(patients.getGlucm());
  536 + setGluthree(patients.getGluthree());
  537 + setGlufour(patients.getGlufour());
  538 + setNipt(patients.getNipt());
  539 + setHBcAbJ(patients.getHBcAbJ());
  540 + setHBeAbJ(patients.getHBeAbJ());
  541 + setHBeAgj(patients.getHBeAgj());
  542 + setHBsAbJ(patients.getHBsAbJ());
  543 + setHBsAgJ(patients.getHBsAgJ());
  544 + setHIVJ(patients.getHIVJ());
  545 + setTp(patients.getTp());
427 546 }
428 547 return this;
429 548 }