jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d3a20ae3a1079f3a12e052464dc2ec1100cf3abb

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

update

Showing 7 changed files with 529 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java View file @ d3a20ae
... ... @@ -18,6 +18,37 @@
18 18 public class BabyHighRiskBabyModel extends BaseModel {
19 19 private static final long serialVersionUID = SerialIdEnum.BabyHighRiskBabyModel.getCid();
20 20  
  21 + /*新增字段*/
  22 + //身长别体重
  23 + private String heightWeight;
  24 + //前囟{闭合、未闭合、未闭合尺寸x-y}
  25 + private Map<String, String> bregma;
  26 + //面色
  27 + private String ms;
  28 + //皮肤
  29 + private String pf;
  30 + //心肺
  31 + private String xf;
  32 + /*辅助检查*/
  33 + //骨密度Z值
  34 + private String gmdz;
  35 + //血红蛋白
  36 + private String xhdb;
  37 + //心脏彩超
  38 + private String xzcc;
  39 + //头颅彩超
  40 + private String tlcc;
  41 + //头颅核磁
  42 + private String tlhc;
  43 + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常，5其他 ______ state:1,qt：123456
  44 + private Map<String, String> ndt;
  45 + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型"
  46 + private String zhipJoint;
  47 + //髋关节 右
  48 + private String yhipJoint;
  49 +
  50 +
  51 +
21 52 /*基础信息*/
22 53 private String id;
23 54 private Integer yn;
... ... @@ -651,6 +682,111 @@
651 682  
652 683 public void setRemarks(String remarks) {
653 684 this.remarks = remarks;
  685 + }
  686 +
  687 +
  688 + public String getHeightWeight() {
  689 + return heightWeight;
  690 + }
  691 +
  692 + public void setHeightWeight(String heightWeight) {
  693 + this.heightWeight = heightWeight;
  694 + }
  695 +
  696 + public Map<String, String> getBregma() {
  697 + return bregma;
  698 + }
  699 +
  700 + public void setBregma(Map<String, String> bregma) {
  701 + this.bregma = bregma;
  702 + }
  703 +
  704 + public String getMs() {
  705 + return ms;
  706 + }
  707 +
  708 + public void setMs(String ms) {
  709 + this.ms = ms;
  710 + }
  711 +
  712 + public String getPf() {
  713 + return pf;
  714 + }
  715 +
  716 + public void setPf(String pf) {
  717 + this.pf = pf;
  718 + }
  719 +
  720 + public String getXf() {
  721 + return xf;
  722 + }
  723 +
  724 + public void setXf(String xf) {
  725 + this.xf = xf;
  726 + }
  727 +
  728 + public String getGmdz() {
  729 + return gmdz;
  730 + }
  731 +
  732 + public void setGmdz(String gmdz) {
  733 + this.gmdz = gmdz;
  734 + }
  735 +
  736 + public String getXhdb() {
  737 + return xhdb;
  738 + }
  739 +
  740 + public void setXhdb(String xhdb) {
  741 + this.xhdb = xhdb;
  742 + }
  743 +
  744 + public String getXzcc() {
  745 + return xzcc;
  746 + }
  747 +
  748 + public void setXzcc(String xzcc) {
  749 + this.xzcc = xzcc;
  750 + }
  751 +
  752 + public String getTlcc() {
  753 + return tlcc;
  754 + }
  755 +
  756 + public void setTlcc(String tlcc) {
  757 + this.tlcc = tlcc;
  758 + }
  759 +
  760 + public String getTlhc() {
  761 + return tlhc;
  762 + }
  763 +
  764 + public void setTlhc(String tlhc) {
  765 + this.tlhc = tlhc;
  766 + }
  767 +
  768 + public Map<String, String> getNdt() {
  769 + return ndt;
  770 + }
  771 +
  772 + public void setNdt(Map<String, String> ndt) {
  773 + this.ndt = ndt;
  774 + }
  775 +
  776 + public String getZhipJoint() {
  777 + return zhipJoint;
  778 + }
  779 +
  780 + public void setZhipJoint(String zhipJoint) {
  781 + this.zhipJoint = zhipJoint;
  782 + }
  783 +
  784 + public String getYhipJoint() {
  785 + return yhipJoint;
  786 + }
  787 +
  788 + public void setYhipJoint(String yhipJoint) {
  789 + this.yhipJoint = yhipJoint;
654 790 }
655 791 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ d3a20ae
... ... @@ -1679,6 +1679,29 @@
1679 1679 if (models != null && models.size() > 0) {
1680 1680 BabyModel model = models.get(0);
1681 1681 result = getBabyBuildResult(model);
  1682 + //计算儿童的预产期 20210203 高危儿专科回填使用
  1683 + if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期
  1684 + String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth());
  1685 + Date ymdBirth = DateUtil.parseYMD(birthStr);
  1686 + if (model.getDueDate() == null || ymdBirth.getTime() == model.getDueDate().getTime()) {//预产期为空或者预产期与生日一致进行计算真实预产期
  1687 + //根据出生孕周计算末次月经
  1688 + Date LastMens = DateUtil.addWeek(model.getBirth(), -model.getDueWeek());
  1689 +
  1690 + if (model.getDueDay() != null) {
  1691 + LastMens = DateUtil.addDay(LastMens, -model.getDueDay());
  1692 + }
  1693 +
  1694 + //根据末次月经计算预产期
  1695 + // Date dueDate = DateUtil.addMonth(LastMens, 9);
  1696 + // dueDate = DateUtil.addDay(dueDate, 7);
  1697 + Date dueDate = DateUtil.addDay(LastMens, 280);
  1698 + //返回预产期
  1699 + result.setyChanQi(DateUtil.getyyyy_MM_dd(dueDate));
  1700 + } else {
  1701 + result.setyChanQi(DateUtil.getyyyy_MM_dd(model.getDueDate()));
  1702 + }
  1703 + }
  1704 +
1682 1705 result.setYeymcId(model.getYeymcId());
1683 1706 Map <String, String> getYeymcId = getBasicConfigYey(model.getYeymcId());
1684 1707 if (getYeymcId != null && getYeymcId.containsKey("name")) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java View file @ d3a20ae
... ... @@ -92,6 +92,21 @@
92 92 if(StringUtils.isEmpty(babyModel.getMname())){
93 93 model.setMname(request.getMname());
94 94 }
  95 + model.setHeightWeight(request.getHeightWeight());
  96 + model.setBregma(request.getBregma());
  97 + model.setMs(request.getMs());
  98 + model.setPf(request.getPf());
  99 + model.setXf(request.getXf());
  100 + model.setGmdz(request.getGmdz());
  101 + model.setXhdb(request.getXhdb());
  102 + model.setXzcc(request.getXzcc());
  103 + model.setTlcc(request.getTlcc());
  104 + model.setTlhc(request.getTlhc());
  105 + model.setNdt(request.getNdt());
  106 + model.setZhipJoint(request.getZhipJoint());
  107 + model.setYhipJoint(request.getYhipJoint());
  108 +
  109 +
95 110 model.setMage(request.getMage());
96 111 model.setJwrss(request.getJwrss());
97 112 model.setBirthDueDate(DateUtil.parseYMD(request.getBirthDueDate()));
... ... @@ -228,6 +243,28 @@
228 243 BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
229 244 highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
230 245  
  246 + String bregma = "";
  247 + String bregmaValue = "";
  248 + if (babyHighRiskBabyModel.getBregma()!=null) {
  249 + Map map = babyHighRiskBabyModel.getBregma();
  250 + String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
  251 + if ("yes".equals(yesOrNo)) {
  252 + bregma = "闭合";
  253 + } else if ("no".equals(yesOrNo)) {
  254 + bregma = "未闭合";
  255 + String one = map.get("wbhcc1") == null ? "" : map.get("wbhcc1").toString();
  256 + String two = map.get("wbhcc2") == null ? "" : map.get("wbhcc2").toString();
  257 + bregmaValue = one + "cm - " + two + "cm";
  258 + }
  259 + }
  260 + highRiskBabyResult.setBregmaStr(bregma);
  261 + highRiskBabyResult.setBregmaValue(bregmaValue);
  262 +
  263 +
  264 +
  265 +
  266 +
  267 +
231 268 if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCheckDoctor())) {
232 269 Users users = usersService.getUsers(NumberUtils.toInt(babyHighRiskBabyModel.getCheckDoctor()));
233 270 if (users != null && StringUtils.isNotEmpty(users.getName())) {
... ... @@ -263,6 +300,7 @@
263 300 BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
264 301 BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult();
265 302 babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModel);
  303 + babyHighRiskBabyResult.setBregma(babyHighRiskBabyModel.getBregma());
266 304  
267 305 //将高危拼装成map
268 306 List <Map <String, String>> list = new ArrayList <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ d3a20ae
... ... @@ -13,6 +13,9 @@
13 13 @Form
14 14 public class BabyBookbuildingAddRequest {
15 15  
  16 + //预产期避免前端误传报错
  17 + private String yChanQi;
  18 +
16 19 //幼儿园名称,使用基础配置
17 20 private String yeymcId;
18 21  
... ... @@ -1349,6 +1352,14 @@
1349 1352  
1350 1353 public void setServiceType(Integer serviceType) {
1351 1354 this.serviceType = serviceType;
  1355 + }
  1356 +
  1357 + public String getyChanQi() {
  1358 + return yChanQi;
  1359 + }
  1360 +
  1361 + public void setyChanQi(String yChanQi) {
  1362 + this.yChanQi = yChanQi;
1352 1363 }
1353 1364  
1354 1365 public String getVcCardNo() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java View file @ d3a20ae
... ... @@ -5,6 +5,7 @@
5 5  
6 6 import java.util.Date;
7 7 import java.util.List;
  8 +import java.util.Map;
8 9  
9 10 /**
10 11 * 高危儿专科 入参类
... ... @@ -13,6 +14,43 @@
13 14 * @Date: 2020/8/18 19:28
14 15 */
15 16 public class BabyHighRiskBabyRequest {
  17 + /*新增字段*/
  18 + //身长别体重
  19 + private String heightWeight;
  20 + /*
  21 + 前囟{闭合、未闭合、未闭合尺寸x-y}
  22 + "bregma": {
  23 + "yeaOrNo": "yes",
  24 + "wbhcc1": "",
  25 + "wbhcc2": ""
  26 + }
  27 + */
  28 + private Map<String, String> bregma;
  29 + //面色
  30 + private String ms;
  31 + //皮肤
  32 + private String pf;
  33 + //心肺
  34 + private String xf;
  35 + /*辅助检查*/
  36 + //骨密度Z值
  37 + private String gmdz;
  38 + //血红蛋白
  39 + private String xhdb;
  40 + //心脏彩超
  41 + private String xzcc;
  42 + //头颅彩超
  43 + private String tlcc;
  44 + //头颅核磁
  45 + private String tlhc;
  46 + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常，5 其他______ state:1,qt：123456
  47 + private Map<String, String> ndt;
  48 + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型"
  49 + private String zhipJoint;
  50 + //髋关节 右
  51 + private String yhipJoint;
  52 +
  53 +
16 54 /*基础信息*/
17 55 private String id;
18 56 private Integer yn;
... ... @@ -114,7 +152,7 @@
114 152 private String weight;
115 153 //头围cm
116 154 private String head;
117   - //前囟 cm
  155 + //前囟 cm 不在使用
118 156 private String anterior;
119 157 //面色/皮肤
120 158 private String skin;
... ... @@ -672,6 +710,110 @@
672 710  
673 711 public void setRemarks(String remarks) {
674 712 this.remarks = remarks;
  713 + }
  714 +
  715 + public String getHeightWeight() {
  716 + return heightWeight;
  717 + }
  718 +
  719 + public void setHeightWeight(String heightWeight) {
  720 + this.heightWeight = heightWeight;
  721 + }
  722 +
  723 + public Map<String, String> getBregma() {
  724 + return bregma;
  725 + }
  726 +
  727 + public void setBregma(Map<String, String> bregma) {
  728 + this.bregma = bregma;
  729 + }
  730 +
  731 + public String getMs() {
  732 + return ms;
  733 + }
  734 +
  735 + public void setMs(String ms) {
  736 + this.ms = ms;
  737 + }
  738 +
  739 + public String getPf() {
  740 + return pf;
  741 + }
  742 +
  743 + public void setPf(String pf) {
  744 + this.pf = pf;
  745 + }
  746 +
  747 + public String getXf() {
  748 + return xf;
  749 + }
  750 +
  751 + public void setXf(String xf) {
  752 + this.xf = xf;
  753 + }
  754 +
  755 + public String getGmdz() {
  756 + return gmdz;
  757 + }
  758 +
  759 + public void setGmdz(String gmdz) {
  760 + this.gmdz = gmdz;
  761 + }
  762 +
  763 + public String getXhdb() {
  764 + return xhdb;
  765 + }
  766 +
  767 + public void setXhdb(String xhdb) {
  768 + this.xhdb = xhdb;
  769 + }
  770 +
  771 + public String getXzcc() {
  772 + return xzcc;
  773 + }
  774 +
  775 + public void setXzcc(String xzcc) {
  776 + this.xzcc = xzcc;
  777 + }
  778 +
  779 + public String getTlcc() {
  780 + return tlcc;
  781 + }
  782 +
  783 + public void setTlcc(String tlcc) {
  784 + this.tlcc = tlcc;
  785 + }
  786 +
  787 + public String getTlhc() {
  788 + return tlhc;
  789 + }
  790 +
  791 + public void setTlhc(String tlhc) {
  792 + this.tlhc = tlhc;
  793 + }
  794 +
  795 + public Map<String, String> getNdt() {
  796 + return ndt;
  797 + }
  798 +
  799 + public void setNdt(Map<String, String> ndt) {
  800 + this.ndt = ndt;
  801 + }
  802 +
  803 + public String getZhipJoint() {
  804 + return zhipJoint;
  805 + }
  806 +
  807 + public void setZhipJoint(String zhipJoint) {
  808 + this.zhipJoint = zhipJoint;
  809 + }
  810 +
  811 + public String getYhipJoint() {
  812 + return yhipJoint;
  813 + }
  814 +
  815 + public void setYhipJoint(String yhipJoint) {
  816 + this.yhipJoint = yhipJoint;
675 817 }
676 818 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ d3a20ae
... ... @@ -9,6 +9,9 @@
9 9 */
10 10 public class BabyBuildResult {
11 11  
  12 + //预产期
  13 + private String yChanQi;
  14 +
12 15 private String yeymcId;//幼儿园名称,使用基础配置
13 16 private Map yeymcIdMap;//幼儿园名称,使用基础配置
14 17  
... ... @@ -735,6 +738,14 @@
735 738  
736 739 public boolean isJxMtn() {
737 740 return jxMtn;
  741 + }
  742 +
  743 + public String getyChanQi() {
  744 + return yChanQi;
  745 + }
  746 +
  747 + public void setyChanQi(String yChanQi) {
  748 + this.yChanQi = yChanQi;
738 749 }
739 750  
740 751 public void setJxMtn(boolean jxMtn) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java View file @ d3a20ae
... ... @@ -11,7 +11,40 @@
11 11  
12 12 public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRiskBabyResult, BabyHighRiskBabyModel> {
13 13  
  14 + /*新增字段*/
  15 + //身长别体重
  16 + private String heightWeight;
  17 + //前囟{闭合、未闭合、未闭合尺寸x-y}
  18 + private Map<String, String> bregma;
  19 + private String bregmaStr;
  20 + private String bregmaValue;
  21 + //面色
  22 + private String ms;
  23 + //皮肤
  24 + private String pf;
  25 + //心肺
  26 + private String xf;
  27 + /*辅助检查*/
  28 + //骨密度Z值
  29 + private String gmdz;
  30 + //血红蛋白
  31 + private String xhdb;
  32 + //心脏彩超
  33 + private String xzcc;
  34 + //头颅彩超
  35 + private String tlcc;
  36 + //头颅核磁
  37 + private String tlhc;
  38 + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常 5 其他 ______ state:1,qt：123456
  39 + private Map<String, String> ndt;
  40 + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型"
  41 + private String zhipJoint;
  42 + //髋关节 右
  43 + private String yhipJoint;
14 44  
  45 +
  46 +
  47 +
15 48 /*基础信息*/
16 49 private String id;
17 50 private Integer yn;
18 51  
... ... @@ -690,10 +723,144 @@
690 723 this.number = number;
691 724 }
692 725  
  726 + public String getHeightWeight() {
  727 + return heightWeight;
  728 + }
  729 +
  730 + public void setHeightWeight(String heightWeight) {
  731 + this.heightWeight = heightWeight;
  732 + }
  733 +
  734 + public Map<String, String> getBregma() {
  735 + return bregma;
  736 + }
  737 +
  738 + public void setBregma(Map<String, String> bregma) {
  739 + this.bregma = bregma;
  740 + }
  741 +
  742 + public String getBregmaValue() {
  743 + return bregmaValue;
  744 + }
  745 +
  746 + public void setBregmaValue(String bregmaValue) {
  747 + this.bregmaValue = bregmaValue;
  748 + }
  749 +
  750 + public String getMs() {
  751 + return ms;
  752 + }
  753 +
  754 + public void setMs(String ms) {
  755 + this.ms = ms;
  756 + }
  757 +
  758 + public String getPf() {
  759 + return pf;
  760 + }
  761 +
  762 + public void setPf(String pf) {
  763 + this.pf = pf;
  764 + }
  765 +
  766 + public String getXf() {
  767 + return xf;
  768 + }
  769 +
  770 + public void setXf(String xf) {
  771 + this.xf = xf;
  772 + }
  773 +
  774 + public String getGmdz() {
  775 + return gmdz;
  776 + }
  777 +
  778 + public void setGmdz(String gmdz) {
  779 + this.gmdz = gmdz;
  780 + }
  781 +
  782 + public String getXhdb() {
  783 + return xhdb;
  784 + }
  785 +
  786 + public void setXhdb(String xhdb) {
  787 + this.xhdb = xhdb;
  788 + }
  789 +
  790 + public String getXzcc() {
  791 + return xzcc;
  792 + }
  793 +
  794 + public void setXzcc(String xzcc) {
  795 + this.xzcc = xzcc;
  796 + }
  797 +
  798 + public String getTlcc() {
  799 + return tlcc;
  800 + }
  801 +
  802 + public void setTlcc(String tlcc) {
  803 + this.tlcc = tlcc;
  804 + }
  805 +
  806 + public String getTlhc() {
  807 + return tlhc;
  808 + }
  809 +
  810 + public void setTlhc(String tlhc) {
  811 + this.tlhc = tlhc;
  812 + }
  813 +
  814 + public Map<String, String> getNdt() {
  815 + return ndt;
  816 + }
  817 +
  818 + public void setNdt(Map<String, String> ndt) {
  819 + this.ndt = ndt;
  820 + }
  821 +
  822 + public String getZhipJoint() {
  823 + return zhipJoint;
  824 + }
  825 +
  826 + public void setZhipJoint(String zhipJoint) {
  827 + this.zhipJoint = zhipJoint;
  828 + }
  829 +
  830 + public String getYhipJoint() {
  831 + return yhipJoint;
  832 + }
  833 +
  834 + public void setYhipJoint(String yhipJoint) {
  835 + this.yhipJoint = yhipJoint;
  836 + }
  837 +
  838 + public String getBregmaStr() {
  839 + return bregmaStr;
  840 + }
  841 +
  842 + public void setBregmaStr(String bregmaStr) {
  843 + this.bregmaStr = bregmaStr;
  844 + }
  845 +
693 846 @Override
694 847 public BabyHighRiskBabyResult convertToResult(BabyHighRiskBabyModel destModel) {
695 848  
696 849 try {
  850 + setHeightWeight(destModel.getHeightWeight());
  851 + setMs(destModel.getMs());
  852 + setPf(destModel.getPf());
  853 + setXf(destModel.getXf());
  854 + setGmdz(destModel.getGmdz());
  855 + setXhdb(destModel.getXhdb());
  856 + setXzcc(destModel.getXzcc());
  857 + setTlcc(destModel.getTlcc());
  858 + setTlhc(destModel.getTlhc());
  859 + setNdt(destModel.getNdt());
  860 + setZhipJoint(destModel.getZhipJoint());
  861 + setYhipJoint(destModel.getYhipJoint());
  862 +
  863 +
697 864 setId(destModel.getId());
698 865 setBuildId(destModel.getBuildId());
699 866 setPid(destModel.getPid());