Commit 92b5a98b5be884a45262b8b8067b190906706603

Authored by shiyang
1 parent de36577a15

隆化11月需求-妇女健康管理-男女婚检新增字段(缺少艾滋病筛查)

Showing 3 changed files with 562 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 92b5a98
... ... @@ -471,6 +471,284 @@
471 471 //异常情况填写内容
472 472 private String abnormalTxt;
473 473  
  474 + /**
  475 + *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。)
  476 + */
  477 + /**血常规检查*/
  478 + //白细胞数目1
  479 + private String wbc;
  480 + //红细胞数目2
  481 + private String rbc;
  482 + //血小板数目3
  483 + private String plt;
  484 + //血红蛋白浓度4
  485 + private String hgb;
  486 + //中性粒细胞百分比5
  487 + private String neuB;
  488 + //嗜酸性粒细胞百分比6
  489 + private String eosB;
  490 + //嗜碱性粒细胞百分比7
  491 + private String basB;
  492 + //淋巴细胞百分比8
  493 + private String lymB;
  494 + //单核细胞百分比9
  495 + private String monB;
  496 + /***总胆红素***/
  497 + //总胆红素(钒盐酸法)10
  498 + private String tbil;
  499 + /***直接胆红素***/
  500 + //直接胆红素(钒盐酸法)11
  501 + private String dbil;
  502 + /***尿常规检查***/
  503 + //葡萄糖12
  504 + private String glu;
  505 + /***血型***/
  506 + //Rh血型13
  507 + private String rh;
  508 + //ABO血型14
  509 + private String abo;
  510 + /***梅毒筛查***/
  511 + //梅毒特异性抗体(酶免法)15
  512 + private String tp;
  513 + /***艾滋病筛查***/
  514 + //艾滋病16
  515 +
  516 + /***乙肝表面抗原***/
  517 + //乙肝表面抗原(酶免法)17
  518 + private String hbsag;
  519 + /***转氨酶***/
  520 + //谷丙转氨酶18
  521 + private String alt;
  522 + /***女性阴道分泌物***/
  523 + //清洁度19
  524 + private String qjd;
  525 + //线索细胞20
  526 + private String xsxb;
  527 + //滴虫21
  528 + private String dc;
  529 + //PH值22
  530 + private String ph;
  531 + //念珠菌感染23
  532 + private String nzj;
  533 + //沙眼衣原体筛查24
  534 + private String syyyt;
  535 + //淋球菌筛查25
  536 + private String lqj;
  537 + //胺臭味试验26
  538 + private String acwsy;
  539 + //淋球菌筛查27
  540 + private String lqjsc;
  541 +
  542 + /************************************************************************/
  543 +
  544 + public String getWbc() {
  545 + return wbc;
  546 + }
  547 +
  548 + public void setWbc(String wbc) {
  549 + this.wbc = wbc;
  550 + }
  551 +
  552 + public String getRbc() {
  553 + return rbc;
  554 + }
  555 +
  556 + public void setRbc(String rbc) {
  557 + this.rbc = rbc;
  558 + }
  559 +
  560 + public String getPlt() {
  561 + return plt;
  562 + }
  563 +
  564 + public void setPlt(String plt) {
  565 + this.plt = plt;
  566 + }
  567 +
  568 + public String getHgb() {
  569 + return hgb;
  570 + }
  571 +
  572 + public void setHgb(String hgb) {
  573 + this.hgb = hgb;
  574 + }
  575 +
  576 + public String getNeuB() {
  577 + return neuB;
  578 + }
  579 +
  580 + public void setNeuB(String neuB) {
  581 + this.neuB = neuB;
  582 + }
  583 +
  584 + public String getEosB() {
  585 + return eosB;
  586 + }
  587 +
  588 + public void setEosB(String eosB) {
  589 + this.eosB = eosB;
  590 + }
  591 +
  592 + public String getBasB() {
  593 + return basB;
  594 + }
  595 +
  596 + public void setBasB(String basB) {
  597 + this.basB = basB;
  598 + }
  599 +
  600 + public String getLymB() {
  601 + return lymB;
  602 + }
  603 +
  604 + public void setLymB(String lymB) {
  605 + this.lymB = lymB;
  606 + }
  607 +
  608 + public String getMonB() {
  609 + return monB;
  610 + }
  611 +
  612 + public void setMonB(String monB) {
  613 + this.monB = monB;
  614 + }
  615 +
  616 + public String getTbil() {
  617 + return tbil;
  618 + }
  619 +
  620 + public void setTbil(String tbil) {
  621 + this.tbil = tbil;
  622 + }
  623 +
  624 + public String getDbil() {
  625 + return dbil;
  626 + }
  627 +
  628 + public void setDbil(String dbil) {
  629 + this.dbil = dbil;
  630 + }
  631 +
  632 + public String getGlu() {
  633 + return glu;
  634 + }
  635 +
  636 + public void setGlu(String glu) {
  637 + this.glu = glu;
  638 + }
  639 +
  640 + public String getRh() {
  641 + return rh;
  642 + }
  643 +
  644 + public void setRh(String rh) {
  645 + this.rh = rh;
  646 + }
  647 +
  648 + public String getAbo() {
  649 + return abo;
  650 + }
  651 +
  652 + public void setAbo(String abo) {
  653 + this.abo = abo;
  654 + }
  655 +
  656 + public String getTp() {
  657 + return tp;
  658 + }
  659 +
  660 + public void setTp(String tp) {
  661 + this.tp = tp;
  662 + }
  663 +
  664 + public String getHbsag() {
  665 + return hbsag;
  666 + }
  667 +
  668 + public void setHbsag(String hbsag) {
  669 + this.hbsag = hbsag;
  670 + }
  671 +
  672 + public String getAlt() {
  673 + return alt;
  674 + }
  675 +
  676 + public void setAlt(String alt) {
  677 + this.alt = alt;
  678 + }
  679 +
  680 + public String getQjd() {
  681 + return qjd;
  682 + }
  683 +
  684 + public void setQjd(String qjd) {
  685 + this.qjd = qjd;
  686 + }
  687 +
  688 + public String getXsxb() {
  689 + return xsxb;
  690 + }
  691 +
  692 + public void setXsxb(String xsxb) {
  693 + this.xsxb = xsxb;
  694 + }
  695 +
  696 + public String getDc() {
  697 + return dc;
  698 + }
  699 +
  700 + public void setDc(String dc) {
  701 + this.dc = dc;
  702 + }
  703 +
  704 + public String getPh() {
  705 + return ph;
  706 + }
  707 +
  708 + public void setPh(String ph) {
  709 + this.ph = ph;
  710 + }
  711 +
  712 + public String getNzj() {
  713 + return nzj;
  714 + }
  715 +
  716 + public void setNzj(String nzj) {
  717 + this.nzj = nzj;
  718 + }
  719 +
  720 + public String getSyyyt() {
  721 + return syyyt;
  722 + }
  723 +
  724 + public void setSyyyt(String syyyt) {
  725 + this.syyyt = syyyt;
  726 + }
  727 +
  728 + public String getLqj() {
  729 + return lqj;
  730 + }
  731 +
  732 + public void setLqj(String lqj) {
  733 + this.lqj = lqj;
  734 + }
  735 +
  736 + public String getAcwsy() {
  737 + return acwsy;
  738 + }
  739 +
  740 + public void setAcwsy(String acwsy) {
  741 + this.acwsy = acwsy;
  742 + }
  743 +
  744 + public String getLqjsc() {
  745 + return lqjsc;
  746 + }
  747 +
  748 + public void setLqjsc(String lqjsc) {
  749 + this.lqjsc = lqjsc;
  750 + }
  751 +
474 752 public Integer getxRay() {
475 753 return xRay;
476 754 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 92b5a98
... ... @@ -32,6 +32,7 @@
32 32 import org.springframework.beans.factory.annotation.Autowired;
33 33 import org.springframework.data.domain.Sort;
34 34 import org.springframework.stereotype.Component;
  35 +import scala.collection.parallel.ParIterableLike;
35 36  
36 37 import javax.servlet.http.HttpServletResponse;
37 38 import java.io.OutputStream;
... ... @@ -257,6 +258,8 @@
257 258 //返回婚检信息
258 259 public PremaritalCheckupResult getResult(PremaritalCheckup result) {
259 260 PremaritalCheckupResult checkupResult = new PremaritalCheckupResult();
  261 + //复制
  262 +// BeanUtils.copy(result, checkupResult);
260 263 checkupResult.setCxNum(result.getCxNum());
261 264 checkupResult.setId(result.getId());
262 265 checkupResult.setParentId(result.getId());
... ... @@ -660,6 +663,8 @@
660 663 String id = null;
661 664  
662 665 PremaritalCheckup checkup = new PremaritalCheckup();
  666 + //复制
  667 +// BeanUtils.copy(addRequest,checkup);
663 668 if (model.getSex() != null && model.getSex().equals(SystemConfig.WOMAN_ID)) {
664 669 checkup.setSexType(1);
665 670 } else {
... ... @@ -1860,6 +1865,8 @@
1860 1865 //返回婚检信息
1861 1866 public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) {
1862 1867 PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult();
  1868 + //复制
  1869 +// BeanUtils.copy(result, checkupResult);
1863 1870 checkupResult.setCxNum(result.getCxNum());
1864 1871 checkupResult.setBaseSign(result.getBaseSign());
1865 1872 checkupResult.setPhysiqueSign(result.getPhysiqueSign());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ 92b5a98
... ... @@ -435,6 +435,283 @@
435 435 //异常情况填写内容
436 436 private String abnormalTxt;
437 437  
  438 + /**
  439 + *隆化11月男女婚检需求(1-18男女共用字段,19-27女性特有。)
  440 + */
  441 + /**血常规检查*/
  442 + //白细胞数目1
  443 + private String wbc;
  444 + //红细胞数目2
  445 + private String rbc;
  446 + //血小板数目3
  447 + private String plt;
  448 + //血红蛋白浓度4
  449 + private String hgb;
  450 + //中性粒细胞百分比5
  451 + private String neuB;
  452 + //嗜酸性粒细胞百分比6
  453 + private String eosB;
  454 + //嗜碱性粒细胞百分比7
  455 + private String basB;
  456 + //淋巴细胞百分比8
  457 + private String lymB;
  458 + //单核细胞百分比9
  459 + private String monB;
  460 + /***总胆红素***/
  461 + //总胆红素(钒盐酸法)10
  462 + private String tbil;
  463 + /***直接胆红素***/
  464 + //直接胆红素(钒盐酸法)11
  465 + private String dbil;
  466 + /***尿常规检查***/
  467 + //葡萄糖12
  468 + private String glu;
  469 + /***血型***/
  470 + //Rh血型13
  471 + private String rh;
  472 + //ABO血型14
  473 + private String abo;
  474 + /***梅毒筛查***/
  475 + //梅毒特异性抗体(酶免法)15
  476 + private String tp;
  477 + /***艾滋病筛查***/
  478 + //艾滋病16
  479 +
  480 + /***乙肝表面抗原***/
  481 + //乙肝表面抗原(酶免法)17
  482 + private String hbsag;
  483 + /***转氨酶***/
  484 + //谷丙转氨酶18
  485 + private String alt;
  486 + /***女性阴道分泌物***/
  487 + //清洁度19
  488 + private String qjd;
  489 + //线索细胞20
  490 + private String xsxb;
  491 + //滴虫21
  492 + private String dc;
  493 + //PH值22
  494 + private String ph;
  495 + //念珠菌感染23
  496 + private String nzj;
  497 + //沙眼衣原体筛查24
  498 + private String syyyt;
  499 + //淋球菌筛查25
  500 + private String lqj;
  501 + //胺臭味试验26
  502 + private String acwsy;
  503 + //淋球菌筛查27
  504 + private String lqjsc;
  505 + /************************************************************************/
  506 +
  507 + public String getWbc() {
  508 + return wbc;
  509 + }
  510 +
  511 + public void setWbc(String wbc) {
  512 + this.wbc = wbc;
  513 + }
  514 +
  515 + public String getRbc() {
  516 + return rbc;
  517 + }
  518 +
  519 + public void setRbc(String rbc) {
  520 + this.rbc = rbc;
  521 + }
  522 +
  523 + public String getPlt() {
  524 + return plt;
  525 + }
  526 +
  527 + public void setPlt(String plt) {
  528 + this.plt = plt;
  529 + }
  530 +
  531 + public String getHgb() {
  532 + return hgb;
  533 + }
  534 +
  535 + public void setHgb(String hgb) {
  536 + this.hgb = hgb;
  537 + }
  538 +
  539 + public String getNeuB() {
  540 + return neuB;
  541 + }
  542 +
  543 + public void setNeuB(String neuB) {
  544 + this.neuB = neuB;
  545 + }
  546 +
  547 + public String getEosB() {
  548 + return eosB;
  549 + }
  550 +
  551 + public void setEosB(String eosB) {
  552 + this.eosB = eosB;
  553 + }
  554 +
  555 + public String getBasB() {
  556 + return basB;
  557 + }
  558 +
  559 + public void setBasB(String basB) {
  560 + this.basB = basB;
  561 + }
  562 +
  563 + public String getLymB() {
  564 + return lymB;
  565 + }
  566 +
  567 + public void setLymB(String lymB) {
  568 + this.lymB = lymB;
  569 + }
  570 +
  571 + public String getMonB() {
  572 + return monB;
  573 + }
  574 +
  575 + public void setMonB(String monB) {
  576 + this.monB = monB;
  577 + }
  578 +
  579 + public String getTbil() {
  580 + return tbil;
  581 + }
  582 +
  583 + public void setTbil(String tbil) {
  584 + this.tbil = tbil;
  585 + }
  586 +
  587 + public String getDbil() {
  588 + return dbil;
  589 + }
  590 +
  591 + public void setDbil(String dbil) {
  592 + this.dbil = dbil;
  593 + }
  594 +
  595 + public String getGlu() {
  596 + return glu;
  597 + }
  598 +
  599 + public void setGlu(String glu) {
  600 + this.glu = glu;
  601 + }
  602 +
  603 + public String getRh() {
  604 + return rh;
  605 + }
  606 +
  607 + public void setRh(String rh) {
  608 + this.rh = rh;
  609 + }
  610 +
  611 + public String getAbo() {
  612 + return abo;
  613 + }
  614 +
  615 + public void setAbo(String abo) {
  616 + this.abo = abo;
  617 + }
  618 +
  619 + public String getTp() {
  620 + return tp;
  621 + }
  622 +
  623 + public void setTp(String tp) {
  624 + this.tp = tp;
  625 + }
  626 +
  627 + public String getHbsag() {
  628 + return hbsag;
  629 + }
  630 +
  631 + public void setHbsag(String hbsag) {
  632 + this.hbsag = hbsag;
  633 + }
  634 +
  635 + public String getAlt() {
  636 + return alt;
  637 + }
  638 +
  639 + public void setAlt(String alt) {
  640 + this.alt = alt;
  641 + }
  642 +
  643 + public String getQjd() {
  644 + return qjd;
  645 + }
  646 +
  647 + public void setQjd(String qjd) {
  648 + this.qjd = qjd;
  649 + }
  650 +
  651 + public String getXsxb() {
  652 + return xsxb;
  653 + }
  654 +
  655 + public void setXsxb(String xsxb) {
  656 + this.xsxb = xsxb;
  657 + }
  658 +
  659 + public String getDc() {
  660 + return dc;
  661 + }
  662 +
  663 + public void setDc(String dc) {
  664 + this.dc = dc;
  665 + }
  666 +
  667 + public String getPh() {
  668 + return ph;
  669 + }
  670 +
  671 + public void setPh(String ph) {
  672 + this.ph = ph;
  673 + }
  674 +
  675 + public String getNzj() {
  676 + return nzj;
  677 + }
  678 +
  679 + public void setNzj(String nzj) {
  680 + this.nzj = nzj;
  681 + }
  682 +
  683 + public String getSyyyt() {
  684 + return syyyt;
  685 + }
  686 +
  687 + public void setSyyyt(String syyyt) {
  688 + this.syyyt = syyyt;
  689 + }
  690 +
  691 + public String getLqj() {
  692 + return lqj;
  693 + }
  694 +
  695 + public void setLqj(String lqj) {
  696 + this.lqj = lqj;
  697 + }
  698 +
  699 + public String getAcwsy() {
  700 + return acwsy;
  701 + }
  702 +
  703 + public void setAcwsy(String acwsy) {
  704 + this.acwsy = acwsy;
  705 + }
  706 +
  707 + public String getLqjsc() {
  708 + return lqjsc;
  709 + }
  710 +
  711 + public void setLqjsc(String lqjsc) {
  712 + this.lqjsc = lqjsc;
  713 + }
  714 +
438 715 public Integer getxRay() {
439 716 return xRay;
440 717 }