liquanyu / regional-platform

Download as
Browse Code »

Commit 47cd595b4f21670b4c1a96a8c465818271f06e84

Authored by wtt
1 parent fffc479263
Exists in master and in 1 other branch dev

衡水六院+秦皇岛眼保健部分

Showing 10 changed files with 151 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 47cd595
... ... @@ -38,6 +38,7 @@
38 38 /*end*/
39 39  
40 40 private String bgValue;
  41 + private String bgValuehsly;
41 42  
42 43 private String genRemark; // 一般检查备注
43 44 private String gynRemark; // 妇科检查备注
... ... @@ -1662,6 +1663,14 @@
1662 1663  
1663 1664 public void setBld(String bld) {
1664 1665 this.bld = bld;
  1666 + }
  1667 +
  1668 + public String getBgValuehsly() {
  1669 + return bgValuehsly;
  1670 + }
  1671 +
  1672 + public void setBgValuehsly(String bgValuehsly) {
  1673 + this.bgValuehsly = bgValuehsly;
1665 1674 }
1666 1675  
1667 1676 public String getBloodSugar() {
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 47cd595
... ... @@ -18,6 +18,10 @@
18 18 public class BabyModel extends BaseModel {
19 19  
20 20 private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid();
  21 +
  22 + //幼儿园名称,使用基础配置
  23 + private String yeymcId;
  24 +
21 25 //月龄下拉框
22 26 private String ylSelect;
23 27  
... ... @@ -1071,6 +1075,14 @@
1071 1075  
1072 1076 public Map<String, Object> getJxWeSele() {
1073 1077 return jxWeSele;
  1078 + }
  1079 +
  1080 + public String getYeymcId() {
  1081 + return yeymcId;
  1082 + }
  1083 +
  1084 + public void setYeymcId(String yeymcId) {
  1085 + this.yeymcId = yeymcId;
1074 1086 }
1075 1087  
1076 1088 public void setJxWeSele(Map<String, Object> jxWeSele) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 47cd595
... ... @@ -687,6 +687,7 @@
687 687 }
688 688 }
689 689 AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
  690 + antExChuModel.setBgValuehsly(excAddRequest.getBgValuehsly());
690 691 //表示区域的
691 692 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
692 693 String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId, 1);
... ... @@ -4219,7 +4220,7 @@
4219 4220 }
4220 4221  
4221 4222 antexChuResult.convertToResult(antExChuModel);
4222   -
  4223 + antexChuResult.setBgValuehsly(antExChuModel.getBgValuehsly());
4223 4224 antexChuResult.setDoctorSign(antExChuModel.getDoctorSign());
4224 4225 antexChuResult.setPatientSign(antExChuModel.getPatientSign());
4225 4226  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 47cd595
... ... @@ -1294,6 +1294,7 @@
1294 1294 bm.setYlSelect(b.getYlSelect());
1295 1295 bm.setIsUNHS(b.getIsUNHS());
1296 1296 bm.setHearScrResult(b.getHearScrResult());
  1297 + bm.setYeymcId(b.getYeymcId());
1297 1298  
1298 1299 //遵化定制 路北辖区状态
1299 1300 bm.setZhlbxqState(b.getZhlbxqState());
1300 1301  
... ... @@ -1635,8 +1636,25 @@
1635 1636 }
1636 1637 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1637 1638 }
1638   -
1639 1639 /**
  1640 + * 处理幼儿园好班级，
  1641 + */
  1642 + private Map <String, String> getBasicConfigYey(String id) {
  1643 + if(com.lyms.platform.common.utils.StringUtils.isEmpty(id)){
  1644 + return new HashMap <>();
  1645 + }
  1646 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  1647 + basicConfigQuery.setYn(YnEnums.YES.getId());
  1648 + basicConfigQuery.setId(id);
  1649 + List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  1650 + Map <String, String> map = new HashMap <>();
  1651 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
  1652 + map.put("id", datas.get(0).getId());
  1653 + map.put("name", datas.get(0).getName());
  1654 + }
  1655 + return map;
  1656 + }
  1657 + /**
1640 1658 * 儿童建档查询详情，根据ID、
1641 1659 *
1642 1660 * @param id
... ... @@ -1657,6 +1675,12 @@
1657 1675 if (models != null && models.size() > 0) {
1658 1676 BabyModel model = models.get(0);
1659 1677 result = getBabyBuildResult(model);
  1678 + result.setYeymcId(model.getYeymcId());
  1679 + Map <String, String> getYeymcId = getBasicConfigYey(model.getYeymcId());
  1680 + if (getYeymcId != null && getYeymcId.containsKey("name")) {
  1681 + result.setYeymcIdMap(getYeymcId);
  1682 + }
  1683 +
1660 1684 result.setYlSelect(model.getYlSelect());
1661 1685 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
1662 1686 result.setIsUNHS(model.getIsUNHS());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 47cd595
... ... @@ -2315,6 +2315,7 @@
2315 2315 map.put("totalBilirubin", UnitUtils.unitSplice(data.getTotalBilirubin(), UnitConstants.UMOLL));
2316 2316 map.put("jhBilirubin", UnitUtils.unitSplice(data.getJhBilirubin(), UnitConstants.UMOLL));
2317 2317 map.put("bg", FunvCommonUtil.checkYiGan(data.getBg()));
  2318 + map.put("bgValuehsly", data.getBgValuehsly());
2318 2319  
2319 2320 map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky()));
2320 2321 map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt()));
... ... @@ -5235,6 +5236,12 @@
5235 5236 result.setPatientSerResults(patientSerResults);
5236 5237  
5237 5238 result = result.convertToResult(model);
  5239 + result.setYeymcId(model.getYeymcId());
  5240 + Map <String, String> getYeymcId = getBasicConfigYey(model.getYeymcId());
  5241 + if (getYeymcId != null && getYeymcId.containsKey("name")) {
  5242 + result.setYeymcIdMap(getYeymcId);
  5243 + }
  5244 +
5238 5245 result.setYlSelect(model.getYlSelect());
5239 5246 result.setIsUNHS(model.getIsUNHS());
5240 5247 if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){
... ... @@ -5341,7 +5348,24 @@
5341 5348 objectResponse.setErrormsg("成功");
5342 5349 return objectResponse;
5343 5350 }
5344   -
  5351 + /**
  5352 + * 处理幼儿园好班级，
  5353 + */
  5354 + private Map <String, String> getBasicConfigYey(String id) {
  5355 + if(com.lyms.platform.common.utils.StringUtils.isEmpty(id)){
  5356 + return new HashMap <>();
  5357 + }
  5358 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  5359 + basicConfigQuery.setYn(YnEnums.YES.getId());
  5360 + basicConfigQuery.setId(id);
  5361 + List <BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  5362 + Map <String, String> map = new HashMap <>();
  5363 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
  5364 + map.put("id", datas.get(0).getId());
  5365 + map.put("name", datas.get(0).getName());
  5366 + }
  5367 + return map;
  5368 + }
5345 5369 /**
5346 5370 * 通过pid获取儿童信息
5347 5371 *
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 47cd595
... ... @@ -42,6 +42,7 @@
42 42 /*end*/
43 43  
44 44 private String bgValue;
  45 + private String bgValuehsly;
45 46  
46 47 private String genRemark; // 一般检查备注
47 48 private String gynRemark; // 妇科检查备注
... ... @@ -1925,6 +1926,13 @@
1925 1926 this.prodDoctor = prodDoctor;
1926 1927 }
1927 1928  
  1929 + public String getBgValuehsly() {
  1930 + return bgValuehsly;
  1931 + }
  1932 +
  1933 + public void setBgValuehsly(String bgValuehsly) {
  1934 + this.bgValuehsly = bgValuehsly;
  1935 + }
1928 1936  
1929 1937 public String getTireNumber1() {
1930 1938 return tireNumber1;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 47cd595
... ... @@ -13,6 +13,12 @@
13 13 @Form
14 14 public class BabyBookbuildingAddRequest {
15 15  
  16 + //幼儿园名称,使用基础配置
  17 + private String yeymcId;
  18 +
  19 + private Map yeymcIdMap;//不传
  20 +
  21 +
16 22 //月龄下拉框
17 23 private String ylSelect;
18 24  
... ... @@ -680,6 +686,22 @@
680 686  
681 687 public List getHighRiskInfo() {
682 688 return highRiskInfo;
  689 + }
  690 +
  691 + public String getYeymcId() {
  692 + return yeymcId;
  693 + }
  694 +
  695 + public void setYeymcId(String yeymcId) {
  696 + this.yeymcId = yeymcId;
  697 + }
  698 +
  699 + public Map getYeymcIdMap() {
  700 + return yeymcIdMap;
  701 + }
  702 +
  703 + public void setYeymcIdMap(Map yeymcIdMap) {
  704 + this.yeymcIdMap = yeymcIdMap;
683 705 }
684 706  
685 707 public void setHighRiskInfo(List highRiskInfo) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 47cd595
... ... @@ -197,6 +197,7 @@
197 197  
198 198 private String cDueWeek;
199 199 private String bg;
  200 + private String bgValuehsly;
200 201 // 月经周期开始天数
201 202 private String mensDay;
202 203 // 月经周期开始天数
... ... @@ -1744,6 +1745,14 @@
1744 1745  
1745 1746 public String getTextpjbc() {
1746 1747 return textpjbc;
  1748 + }
  1749 +
  1750 + public String getBgValuehsly() {
  1751 + return bgValuehsly;
  1752 + }
  1753 +
  1754 + public void setBgValuehsly(String bgValuehsly) {
  1755 + this.bgValuehsly = bgValuehsly;
1747 1756 }
1748 1757  
1749 1758 public void setTextpjbc(String textpjbc) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 47cd595
... ... @@ -8,6 +8,10 @@
8 8 * Created by lqy on 2016/6/17.
9 9 */
10 10 public class BabyBuildResult {
  11 +
  12 + private String yeymcId;//幼儿园名称,使用基础配置
  13 + private Map yeymcIdMap;//幼儿园名称,使用基础配置
  14 +
11 15 //月龄下拉框
12 16 private String ylSelect;
13 17 //下次预约
... ... @@ -867,6 +871,22 @@
867 871  
868 872 public boolean isJxTszh() {
869 873 return jxTszh;
  874 + }
  875 +
  876 + public String getYeymcId() {
  877 + return yeymcId;
  878 + }
  879 +
  880 + public void setYeymcId(String yeymcId) {
  881 + this.yeymcId = yeymcId;
  882 + }
  883 +
  884 + public Map getYeymcIdMap() {
  885 + return yeymcIdMap;
  886 + }
  887 +
  888 + public void setYeymcIdMap(Map yeymcIdMap) {
  889 + this.yeymcIdMap = yeymcIdMap;
870 890 }
871 891  
872 892 public void setJxTszh(boolean jxTszh) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 47cd595
... ... @@ -22,6 +22,9 @@
22 22 * Created by lqy on 2016/6/17.
23 23 */
24 24 public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> {
  25 +
  26 + private String yeymcId;//幼儿园名称,使用基础配置
  27 + private Map yeymcIdMap;//幼儿园名称,使用基础配置
25 28 //月龄下拉框
26 29 private String ylSelect;
27 30 //下次预约
... ... @@ -564,6 +567,22 @@
564 567  
565 568 public void setJxWn(boolean jxWn) {
566 569 this.jxWn = jxWn;
  570 + }
  571 +
  572 + public String getYeymcId() {
  573 + return yeymcId;
  574 + }
  575 +
  576 + public void setYeymcId(String yeymcId) {
  577 + this.yeymcId = yeymcId;
  578 + }
  579 +
  580 + public Map getYeymcIdMap() {
  581 + return yeymcIdMap;
  582 + }
  583 +
  584 + public void setYeymcIdMap(Map yeymcIdMap) {
  585 + this.yeymcIdMap = yeymcIdMap;
567 586 }
568 587  
569 588 public boolean isJxJzl() {