jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fd5b603fa84aedde13867f991d90c2f73e33e8f7

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

男性婚检、女性婚检

Showing 7 changed files with 366 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ fd5b603
... ... @@ -91,6 +91,27 @@
91 91 //外祖父母(1:是 2:不是)
92 92 private Integer maternalGrandparents;
93 93  
  94 + /**
  95 + * start 遵化新增字段
  96 + *
  97 + * @param null
  98 + * @Author: 武涛涛
  99 + * @Date: 2020/9/10 16:18
  100 + */
  101 + //中药治疗 yes no，空或者no都是no
  102 + private String zyzlState;
  103 + //输入框
  104 + private String zyzlContent;
  105 + //中医外治治疗
  106 + private String zywzzlState;
  107 + private String zywzzlContent;
  108 + //膏药
  109 + private String gyState;
  110 + private String gyContent;
  111 +
  112 + /*end*/
  113 +
  114 +
94 115 /****************** 体格检查 ********************/
95 116 //精神状态(1: 异常 2: 正常)
96 117 private Integer jingShenZhuangTai;
... ... @@ -819,6 +840,54 @@
819 840  
820 841 public Integer getChildrenNum() {
821 842 return childrenNum;
  843 + }
  844 +
  845 + public String getZyzlState() {
  846 + return zyzlState;
  847 + }
  848 +
  849 + public void setZyzlState(String zyzlState) {
  850 + this.zyzlState = zyzlState;
  851 + }
  852 +
  853 + public String getZyzlContent() {
  854 + return zyzlContent;
  855 + }
  856 +
  857 + public void setZyzlContent(String zyzlContent) {
  858 + this.zyzlContent = zyzlContent;
  859 + }
  860 +
  861 + public String getZywzzlState() {
  862 + return zywzzlState;
  863 + }
  864 +
  865 + public void setZywzzlState(String zywzzlState) {
  866 + this.zywzzlState = zywzzlState;
  867 + }
  868 +
  869 + public String getZywzzlContent() {
  870 + return zywzzlContent;
  871 + }
  872 +
  873 + public void setZywzzlContent(String zywzzlContent) {
  874 + this.zywzzlContent = zywzzlContent;
  875 + }
  876 +
  877 + public String getGyState() {
  878 + return gyState;
  879 + }
  880 +
  881 + public void setGyState(String gyState) {
  882 + this.gyState = gyState;
  883 + }
  884 +
  885 + public String getGyContent() {
  886 + return gyContent;
  887 + }
  888 +
  889 + public void setGyContent(String gyContent) {
  890 + this.gyContent = gyContent;
822 891 }
823 892  
824 893 public void setChildrenNum(Integer childrenNum) {
platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java View file @ fd5b603
... ... @@ -56,6 +56,12 @@
56 56 private Date modifiedStart;
57 57 private Date modifiedEnd;
58 58  
  59 + //中药治疗 yes no，空或者no都是no
  60 + private String zyzlState;
  61 + //中医外治治疗
  62 + private String zywzzlState;
  63 + //膏药
  64 + private String gyState;
59 65  
60 66 @Override
61 67 public MongoQuery convertToQuery() {
... ... @@ -66,6 +72,15 @@
66 72 if (StringUtils.isNotBlank(parentId)) {
67 73 condition = condition.and("parentId", parentId, MongoOper.IS);
68 74 }
  75 + if (StringUtils.isNotBlank(zyzlState) && ("yes".equals(zyzlState) || "no".equals(zyzlState)) ) {
  76 + condition = condition.and("zyzlState", zyzlState, MongoOper.IS);
  77 + }
  78 + if (StringUtils.isNotBlank(zywzzlState) && ("yes".equals(zywzzlState) || "no".equals(zywzzlState)) ) {
  79 + condition = condition.and("zywzzlState", zywzzlState, MongoOper.IS);
  80 + }
  81 + if (StringUtils.isNotBlank(gyState) &&( "yes".equals(gyState) || "no".equals(gyState)) ) {
  82 + condition = condition.and("gyState", gyState, MongoOper.IS);
  83 + }
69 84 if (StringUtils.isNotBlank(hospitalId)) {
70 85 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
71 86 }
... ... @@ -152,6 +167,30 @@
152 167  
153 168 public void setHospitalIds(List<String> hospitalIds) {
154 169 this.hospitalIds = hospitalIds;
  170 + }
  171 +
  172 + public String getZyzlState() {
  173 + return zyzlState;
  174 + }
  175 +
  176 + public void setZyzlState(String zyzlState) {
  177 + this.zyzlState = zyzlState;
  178 + }
  179 +
  180 + public String getZywzzlState() {
  181 + return zywzzlState;
  182 + }
  183 +
  184 + public void setZywzzlState(String zywzzlState) {
  185 + this.zywzzlState = zywzzlState;
  186 + }
  187 +
  188 + public String getGyState() {
  189 + return gyState;
  190 + }
  191 +
  192 + public void setGyState(String gyState) {
  193 + this.gyState = gyState;
155 194 }
156 195  
157 196 public List<String> getParentIds() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ fd5b603
... ... @@ -277,7 +277,21 @@
277 277 checkupResult.setParents(result.getParents());
278 278 checkupResult.setGrandparent(result.getGrandparent());
279 279 checkupResult.setMaternalGrandparents(result.getMaternalGrandparents());
  280 + /**
  281 + * start 遵化新增字段
  282 + *
  283 + * @param null
  284 + * @Author: 武涛涛
  285 + * @Date: 2020/9/10 16:18
  286 + */
  287 + checkupResult.setZyzlState(result.getZyzlState());
  288 + checkupResult.setZyzlContent(result.getZyzlContent());
  289 + checkupResult.setZywzzlState(result.getZywzzlState());
  290 + checkupResult.setZywzzlContent(result.getZywzzlContent());
  291 + checkupResult.setGyState(result.getGyState());
  292 + checkupResult.setGyContent(result.getGyContent());
280 293  
  294 + /*end*/
281 295 checkupResult.setJingShenZhuangTai(result.getJingShenZhuangTai());
282 296 checkupResult.setJingShenZhuangTaiDetails(result.getJingShenZhuangTaiDetails());
283 297 checkupResult.setYuYanNengLi(result.getYuYanNengLi());
... ... @@ -464,7 +478,9 @@
464 478 List<String> parentIds = null;
465 479  
466 480 //用姓名和联系方式查询到的居民建档ID
467   - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo()) || StringUtils.isNotEmpty(request.getQueryNo())) {
  481 + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())
  482 + || StringUtils.isNotEmpty(request.getQueryNo()) || StringUtils.isNotEmpty(request.getZyzlState())
  483 + || StringUtils.isNotEmpty(request.getZywzzlState()) || StringUtils.isNotEmpty(request.getGyState())) {
468 484 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
469 485 archiveQuery.setQueryNo(request.getQueryNo());
470 486 archiveQuery.setYn(YnEnums.YES.getId());
... ... @@ -472,6 +488,7 @@
472 488 archiveQuery.setCertificateNum(request.getCardNo());
473 489 archiveQuery.setPhone(request.getPhone());
474 490 archiveQuery.setHospitalId(request.getHospitalId());
  491 +
475 492 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
476 493 parentIds = new ArrayList<>();
477 494 if (CollectionUtils.isNotEmpty(modelList)) {
... ... @@ -487,6 +504,9 @@
487 504 query.setLimit(request.getLimit());
488 505 query.setNeed("y");
489 506 query.setYn(YnEnums.YES.getId());
  507 + query.setZyzlState(request.getZyzlState());
  508 + query.setZywzzlState(request.getZywzzlState());
  509 + query.setGyState(request.getGyState());
490 510  
491 511 String hospital = autoMatchFacade.getHospitalId(userId);
492 512 if (StringUtils.isNotEmpty(hospital)) {
... ... @@ -514,7 +534,7 @@
514 534 if (parentIds != null) {
515 535 query.setParentIds(parentIds);
516 536 }
517   -
  537 + System.out.println(query.convertToQuery().convertToMongoQuery());
518 538 List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
519 539 List<Map> list = new ArrayList<>();
520 540 if (CollectionUtils.isNotEmpty(data)) {
... ... @@ -693,6 +713,20 @@
693 713 checkup.setMaternalGrandparents(addRequest.getMaternalGrandparents());
694 714  
695 715 checkup.setChildrenNum(addRequest.getChildrenNum());
  716 + /**
  717 + * start 遵化新增字段
  718 + *
  719 + * @param null
  720 + * @Author: 武涛涛
  721 + * @Date: 2020/9/10 16:18
  722 + */
  723 + checkup.setZyzlState(addRequest.getZyzlState());
  724 + checkup.setZyzlContent(addRequest.getZyzlContent());
  725 + checkup.setZywzzlState(addRequest.getZywzzlState());
  726 + checkup.setZywzzlContent(addRequest.getZywzzlContent());
  727 + checkup.setGyState(addRequest.getGyState());
  728 + checkup.setGyContent(addRequest.getGyContent());
  729 + /*end*/
696 730  
697 731 /* 体格检查 */
698 732 checkup.setJingShenZhuangTai(addRequest.getJingShenZhuangTai());
... ... @@ -1758,7 +1792,20 @@
1758 1792 }
1759 1793 checkupResult.setNextOfKin(nextOfKin);
1760 1794 checkupResult.setChildrenNum(result.getChildrenNum() == null ? "" : result.getChildrenNum() + UnitConstants.REN);
1761   -
  1795 + /**
  1796 + * start 遵化新增字段
  1797 + *
  1798 + * @param null
  1799 + * @Author: 武涛涛
  1800 + * @Date: 2020/9/10 16:18
  1801 + */
  1802 + checkupResult.setZyzlState(result.getZyzlState());
  1803 + checkupResult.setZyzlContent(result.getZyzlContent());
  1804 + checkupResult.setZywzzlState(result.getZywzzlState());
  1805 + checkupResult.setZywzzlContent(result.getZywzzlContent());
  1806 + checkupResult.setGyState(result.getGyState());
  1807 + checkupResult.setGyContent(result.getGyContent());
  1808 + /*end*/
1762 1809  
1763 1810 String jingShenZhuangTai = "";
1764 1811 if (result.getJingShenZhuangTai() != null && result.getJingShenZhuangTai() == 1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ fd5b603
... ... @@ -99,7 +99,16 @@
99 99 private String sjzOneSign;
100 100 //医生签字
101 101 private String oneDoctorSign;
102   -
  102 + //中药治疗 yes no，空或者no都是no
  103 + private String zyzlState;
  104 + //输入框
  105 + private String zyzlContent;
  106 + //中医外治治疗
  107 + private String zywzzlState;
  108 + private String zywzzlContent;
  109 + //膏药
  110 + private String gyState;
  111 + private String gyContent;
103 112 /****************** 体格检查 ********************/
104 113 //精神状态(1: 异常 2: 正常)
105 114 private Integer jingShenZhuangTai;
... ... @@ -952,6 +961,54 @@
952 961  
953 962 public void setYanSe(String yanSe) {
954 963 this.yanSe = yanSe;
  964 + }
  965 +
  966 + public String getZyzlState() {
  967 + return zyzlState;
  968 + }
  969 +
  970 + public void setZyzlState(String zyzlState) {
  971 + this.zyzlState = zyzlState;
  972 + }
  973 +
  974 + public String getZyzlContent() {
  975 + return zyzlContent;
  976 + }
  977 +
  978 + public void setZyzlContent(String zyzlContent) {
  979 + this.zyzlContent = zyzlContent;
  980 + }
  981 +
  982 + public String getZywzzlState() {
  983 + return zywzzlState;
  984 + }
  985 +
  986 + public void setZywzzlState(String zywzzlState) {
  987 + this.zywzzlState = zywzzlState;
  988 + }
  989 +
  990 + public String getZywzzlContent() {
  991 + return zywzzlContent;
  992 + }
  993 +
  994 + public void setZywzzlContent(String zywzzlContent) {
  995 + this.zywzzlContent = zywzzlContent;
  996 + }
  997 +
  998 + public String getGyState() {
  999 + return gyState;
  1000 + }
  1001 +
  1002 + public void setGyState(String gyState) {
  1003 + this.gyState = gyState;
  1004 + }
  1005 +
  1006 + public String getGyContent() {
  1007 + return gyContent;
  1008 + }
  1009 +
  1010 + public void setGyContent(String gyContent) {
  1011 + this.gyContent = gyContent;
955 1012 }
956 1013  
957 1014 public String getBuWei() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java View file @ fd5b603
... ... @@ -31,6 +31,37 @@
31 31 //查询号
32 32 private String queryNo;
33 33  
  34 + //中药治疗 yes no，空或者no都是no
  35 + private String zyzlState;
  36 + //中医外治治疗
  37 + private String zywzzlState;
  38 + //膏药
  39 + private String gyState;
  40 +
  41 + public String getZyzlState() {
  42 + return zyzlState;
  43 + }
  44 +
  45 + public void setZyzlState(String zyzlState) {
  46 + this.zyzlState = zyzlState;
  47 + }
  48 +
  49 + public String getZywzzlState() {
  50 + return zywzzlState;
  51 + }
  52 +
  53 + public void setZywzzlState(String zywzzlState) {
  54 + this.zywzzlState = zywzzlState;
  55 + }
  56 +
  57 + public String getGyState() {
  58 + return gyState;
  59 + }
  60 +
  61 + public void setGyState(String gyState) {
  62 + this.gyState = gyState;
  63 + }
  64 +
34 65 public String getQueryNo() {
35 66 return queryNo;
36 67 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java View file @ fd5b603
... ... @@ -101,6 +101,17 @@
101 101 //既往婚育史(1: 有 2: 无)
102 102 private String maritalHistory;
103 103  
  104 +
  105 + //中药治疗 yes no，空或者no都是no
  106 + private String zyzlState;
  107 + //输入框
  108 + private String zyzlContent;
  109 + //中医外治治疗
  110 + private String zywzzlState;
  111 + private String zywzzlContent;
  112 + //膏药
  113 + private String gyState;
  114 + private String gyContent;
104 115 /****************** 体格检查 ********************/
105 116  
106 117 //精神状态(1: 异常 2: 正常)
... ... @@ -1328,6 +1339,54 @@
1328 1339  
1329 1340 public String getYiGanKangYuan() {
1330 1341 return yiGanKangYuan;
  1342 + }
  1343 +
  1344 + public String getZyzlState() {
  1345 + return zyzlState;
  1346 + }
  1347 +
  1348 + public void setZyzlState(String zyzlState) {
  1349 + this.zyzlState = zyzlState;
  1350 + }
  1351 +
  1352 + public String getZyzlContent() {
  1353 + return zyzlContent;
  1354 + }
  1355 +
  1356 + public void setZyzlContent(String zyzlContent) {
  1357 + this.zyzlContent = zyzlContent;
  1358 + }
  1359 +
  1360 + public String getZywzzlState() {
  1361 + return zywzzlState;
  1362 + }
  1363 +
  1364 + public void setZywzzlState(String zywzzlState) {
  1365 + this.zywzzlState = zywzzlState;
  1366 + }
  1367 +
  1368 + public String getZywzzlContent() {
  1369 + return zywzzlContent;
  1370 + }
  1371 +
  1372 + public void setZywzzlContent(String zywzzlContent) {
  1373 + this.zywzzlContent = zywzzlContent;
  1374 + }
  1375 +
  1376 + public String getGyState() {
  1377 + return gyState;
  1378 + }
  1379 +
  1380 + public void setGyState(String gyState) {
  1381 + this.gyState = gyState;
  1382 + }
  1383 +
  1384 + public String getGyContent() {
  1385 + return gyContent;
  1386 + }
  1387 +
  1388 + public void setGyContent(String gyContent) {
  1389 + this.gyContent = gyContent;
1331 1390 }
1332 1391  
1333 1392 public void setYiGanKangYuan(String yiGanKangYuan) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ fd5b603
... ... @@ -76,6 +76,17 @@
76 76 //外祖父母(1:是 2:不是)
77 77 private Integer maternalGrandparents;
78 78  
  79 + //中药治疗 yes no，空或者no都是no
  80 + private String zyzlState;
  81 + //输入框
  82 + private String zyzlContent;
  83 + //中医外治治疗
  84 + private String zywzzlState;
  85 + private String zywzzlContent;
  86 + //膏药
  87 + private String gyState;
  88 + private String gyContent;
  89 +
79 90 /****************** 体格检查 ********************/
80 91 //精神状态(1: 异常 2: 正常)
81 92 private Integer jingShenZhuangTai;
... ... @@ -1719,6 +1730,54 @@
1719 1730  
1720 1731 public void setJianChaJieGuo(Integer jianChaJieGuo) {
1721 1732 this.jianChaJieGuo = jianChaJieGuo;
  1733 + }
  1734 +
  1735 + public String getZyzlState() {
  1736 + return zyzlState;
  1737 + }
  1738 +
  1739 + public void setZyzlState(String zyzlState) {
  1740 + this.zyzlState = zyzlState;
  1741 + }
  1742 +
  1743 + public String getZyzlContent() {
  1744 + return zyzlContent;
  1745 + }
  1746 +
  1747 + public void setZyzlContent(String zyzlContent) {
  1748 + this.zyzlContent = zyzlContent;
  1749 + }
  1750 +
  1751 + public String getZywzzlState() {
  1752 + return zywzzlState;
  1753 + }
  1754 +
  1755 + public void setZywzzlState(String zywzzlState) {
  1756 + this.zywzzlState = zywzzlState;
  1757 + }
  1758 +
  1759 + public String getZywzzlContent() {
  1760 + return zywzzlContent;
  1761 + }
  1762 +
  1763 + public void setZywzzlContent(String zywzzlContent) {
  1764 + this.zywzzlContent = zywzzlContent;
  1765 + }
  1766 +
  1767 + public String getGyState() {
  1768 + return gyState;
  1769 + }
  1770 +
  1771 + public void setGyState(String gyState) {
  1772 + this.gyState = gyState;
  1773 + }
  1774 +
  1775 + public String getGyContent() {
  1776 + return gyContent;
  1777 + }
  1778 +
  1779 + public void setGyContent(String gyContent) {
  1780 + this.gyContent = gyContent;
1722 1781 }
1723 1782  
1724 1783 public String getJianChaDetails() {