liquanyu / regional-platform

Download as
Browse Code »

Commit ef264afa33567e917ae4e0966bf4771047dce3f4

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

产前检查

Showing 12 changed files with 625 additions and 1 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ ef264af
... ... @@ -188,6 +188,13 @@
188 188 public AntExRecordModel convert(AntenatalExaminationModel antEx) {
189 189 AntExRecordModel antExRecordModel = new AntExRecordModel();
190 190  
  191 + antExRecordModel.setZyzlState(antEx.getZyzlState());
  192 + antExRecordModel.setZyzlContent(antEx.getZyzlContent());
  193 + antExRecordModel.setZywzzlState(antEx.getZywzzlState());
  194 + antExRecordModel.setZywzzlContent(antEx.getZywzzlContent());
  195 + antExRecordModel.setZyatzlState(antEx.getZyatzlState());
  196 + antExRecordModel.setZyatzlContent(antEx.getZyatzlContent());
  197 +
191 198 antExRecordModel.setTreatOpinion(antEx.getTreatmentOpinion());
192 199 antExRecordModel.setScreenResult(antEx.getScreenResult());
193 200 antExRecordModel.setParentId(antEx.getParentId());
... ... @@ -268,6 +275,13 @@
268 275 antExRecordModel.setCheckTime(antExChuModel.getCheckTime());
269 276 antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime());
270 277 antExRecordModel.setFirst(antExChuModel.getFirst());
  278 +
  279 + antExRecordModel.setZyzlState(antExChuModel.getZyzlState());
  280 + antExRecordModel.setZyzlContent(antExChuModel.getZyzlContent());
  281 + antExRecordModel.setZywzzlState(antExChuModel.getZywzzlState());
  282 + antExRecordModel.setZywzzlContent(antExChuModel.getZywzzlContent());
  283 + antExRecordModel.setZyatzlState(antExChuModel.getZyatzlState());
  284 + antExRecordModel.setZyatzlContent(antExChuModel.getZyatzlContent());
271 285  
272 286 //高危信息
273 287 List li = null;
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ ef264af
... ... @@ -18,6 +18,25 @@
18 18  
19 19 private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid();
20 20  
  21 + /**
  22 + * start
  23 + * 遵化需求新增字段
  24 + * @param null
  25 + * @Author: 武涛涛
  26 + * @Date: 2020/9/14 9:04
  27 + */
  28 + //中药治疗 yes no，空或者no都是no
  29 + private String zyzlState;
  30 + //输入框
  31 + private String zyzlContent;
  32 + //中医外治治疗
  33 + private String zywzzlState;
  34 + private String zywzzlContent;
  35 + //逐月安胎中医日常调理
  36 + private String zyatzlState;
  37 + private String zyatzlContent;
  38 + /*end*/
  39 +
21 40 private String bgValue;
22 41  
23 42 private String genRemark; // 一般检查备注
... ... @@ -1411,6 +1430,54 @@
1411 1430  
1412 1431 public void setParentId(String parentId) {
1413 1432 this.parentId = parentId;
  1433 + }
  1434 +
  1435 + public String getZyzlState() {
  1436 + return zyzlState;
  1437 + }
  1438 +
  1439 + public void setZyzlState(String zyzlState) {
  1440 + this.zyzlState = zyzlState;
  1441 + }
  1442 +
  1443 + public String getZyzlContent() {
  1444 + return zyzlContent;
  1445 + }
  1446 +
  1447 + public void setZyzlContent(String zyzlContent) {
  1448 + this.zyzlContent = zyzlContent;
  1449 + }
  1450 +
  1451 + public String getZywzzlState() {
  1452 + return zywzzlState;
  1453 + }
  1454 +
  1455 + public void setZywzzlState(String zywzzlState) {
  1456 + this.zywzzlState = zywzzlState;
  1457 + }
  1458 +
  1459 + public String getZywzzlContent() {
  1460 + return zywzzlContent;
  1461 + }
  1462 +
  1463 + public void setZywzzlContent(String zywzzlContent) {
  1464 + this.zywzzlContent = zywzzlContent;
  1465 + }
  1466 +
  1467 + public String getZyatzlState() {
  1468 + return zyatzlState;
  1469 + }
  1470 +
  1471 + public void setZyatzlState(String zyatzlState) {
  1472 + this.zyatzlState = zyatzlState;
  1473 + }
  1474 +
  1475 + public String getZyatzlContent() {
  1476 + return zyatzlContent;
  1477 + }
  1478 +
  1479 + public void setZyatzlContent(String zyatzlContent) {
  1480 + this.zyatzlContent = zyatzlContent;
1414 1481 }
1415 1482  
1416 1483 public String getPastHistory() {
platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java View file @ ef264af
... ... @@ -16,6 +16,24 @@
16 16 public class AntExRecordModel extends BaseModel {
17 17  
18 18 private static final long serialVersionUID = SerialIdEnum.AntExRecordModel.getCid();
  19 + /**
  20 + * start
  21 + * 遵化需求新增字段
  22 + * @param null
  23 + * @Author: 武涛涛
  24 + * @Date: 2020/9/14 9:04
  25 + */
  26 + //中药治疗 yes no，空或者no都是no
  27 + private String zyzlState;
  28 + //输入框
  29 + private String zyzlContent;
  30 + //中医外治治疗
  31 + private String zywzzlState;
  32 + private String zywzzlContent;
  33 + //逐月安胎中医日常调理
  34 + private String zyatzlState;
  35 + private String zyatzlContent;
  36 + /*end*/
19 37  
20 38 private String id;
21 39 //原始表的id
... ... @@ -93,6 +111,54 @@
93 111  
94 112 //处理意见
95 113 private String treatOpinion;
  114 +
  115 + public String getZyzlState() {
  116 + return zyzlState;
  117 + }
  118 +
  119 + public void setZyzlState(String zyzlState) {
  120 + this.zyzlState = zyzlState;
  121 + }
  122 +
  123 + public String getZyzlContent() {
  124 + return zyzlContent;
  125 + }
  126 +
  127 + public void setZyzlContent(String zyzlContent) {
  128 + this.zyzlContent = zyzlContent;
  129 + }
  130 +
  131 + public String getZywzzlState() {
  132 + return zywzzlState;
  133 + }
  134 +
  135 + public void setZywzzlState(String zywzzlState) {
  136 + this.zywzzlState = zywzzlState;
  137 + }
  138 +
  139 + public String getZywzzlContent() {
  140 + return zywzzlContent;
  141 + }
  142 +
  143 + public void setZywzzlContent(String zywzzlContent) {
  144 + this.zywzzlContent = zywzzlContent;
  145 + }
  146 +
  147 + public String getZyatzlState() {
  148 + return zyatzlState;
  149 + }
  150 +
  151 + public void setZyatzlState(String zyatzlState) {
  152 + this.zyatzlState = zyatzlState;
  153 + }
  154 +
  155 + public String getZyatzlContent() {
  156 + return zyatzlContent;
  157 + }
  158 +
  159 + public void setZyatzlContent(String zyatzlContent) {
  160 + this.zyatzlContent = zyatzlContent;
  161 + }
96 162  
97 163 public String getTreatOpinion() {
98 164 return treatOpinion;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ ef264af
... ... @@ -16,6 +16,25 @@
16 16 @Document(collection = "lyms_antex")
17 17 public class AntenatalExaminationModel extends BaseModel {
18 18  
  19 + /**
  20 + * start
  21 + * 遵化需求新增字段
  22 + * @param null
  23 + * @Author: 武涛涛
  24 + * @Date: 2020/9/14 9:04
  25 + */
  26 + //中药治疗 yes no，空或者no都是no
  27 + private String zyzlState;
  28 + //输入框
  29 + private String zyzlContent;
  30 + //中医外治治疗
  31 + private String zywzzlState;
  32 + private String zywzzlContent;
  33 + //逐月安胎中医日常调理
  34 + private String zyatzlState;
  35 + private String zyatzlContent;
  36 + /*end*/
  37 +
19 38 private String genRemark; // 一般检查备注
20 39  
21 40 //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
... ... @@ -414,6 +433,54 @@
414 433  
415 434 public void setNdbSelect(String ndbSelect) {
416 435 this.ndbSelect = ndbSelect;
  436 + }
  437 +
  438 + public String getZyzlState() {
  439 + return zyzlState;
  440 + }
  441 +
  442 + public void setZyzlState(String zyzlState) {
  443 + this.zyzlState = zyzlState;
  444 + }
  445 +
  446 + public String getZyzlContent() {
  447 + return zyzlContent;
  448 + }
  449 +
  450 + public void setZyzlContent(String zyzlContent) {
  451 + this.zyzlContent = zyzlContent;
  452 + }
  453 +
  454 + public String getZywzzlState() {
  455 + return zywzzlState;
  456 + }
  457 +
  458 + public void setZywzzlState(String zywzzlState) {
  459 + this.zywzzlState = zywzzlState;
  460 + }
  461 +
  462 + public String getZywzzlContent() {
  463 + return zywzzlContent;
  464 + }
  465 +
  466 + public void setZywzzlContent(String zywzzlContent) {
  467 + this.zywzzlContent = zywzzlContent;
  468 + }
  469 +
  470 + public String getZyatzlState() {
  471 + return zyatzlState;
  472 + }
  473 +
  474 + public void setZyatzlState(String zyatzlState) {
  475 + this.zyatzlState = zyatzlState;
  476 + }
  477 +
  478 + public String getZyatzlContent() {
  479 + return zyatzlContent;
  480 + }
  481 +
  482 + public void setZyatzlContent(String zyatzlContent) {
  483 + this.zyatzlContent = zyatzlContent;
417 484 }
418 485  
419 486 public String getNdbSelectOtherVal() {
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ ef264af
... ... @@ -16,6 +16,14 @@
16 16 * Created by Administrator on 2016/6/21 0021.
17 17 */
18 18 public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery {
  19 +
  20 + //中药治疗 yes no，空或者no都是no
  21 + private String zyzlState;
  22 + //中医外治治疗
  23 + private String zywzzlState;
  24 + //逐月安胎中医日常调理
  25 + private String zyatzlState;
  26 +
19 27 private String parentId;
20 28 private String id;
21 29 private List<String> ids;
... ... @@ -106,6 +114,30 @@
106 114 this.treatOpinion = treatOpinion;
107 115 }
108 116  
  117 + public String getZyzlState() {
  118 + return zyzlState;
  119 + }
  120 +
  121 + public void setZyzlState(String zyzlState) {
  122 + this.zyzlState = zyzlState;
  123 + }
  124 +
  125 + public String getZywzzlState() {
  126 + return zywzzlState;
  127 + }
  128 +
  129 + public void setZywzzlState(String zywzzlState) {
  130 + this.zywzzlState = zywzzlState;
  131 + }
  132 +
  133 + public String getZyatzlState() {
  134 + return zyatzlState;
  135 + }
  136 +
  137 + public void setZyatzlState(String zyatzlState) {
  138 + this.zyatzlState = zyatzlState;
  139 + }
  140 +
109 141 public List<String> getIds() {
110 142 return ids;
111 143 }
... ... @@ -566,6 +598,17 @@
566 598 if (null != barCode) {
567 599 condition = condition.and("barCode", barCode, MongoOper.IS);
568 600 }
  601 +
  602 + if (org.apache.commons.lang.StringUtils.isNotBlank(zyzlState) && ("yes".equals(zyzlState) || "no".equals(zyzlState)) ) {
  603 + condition = condition.and("zyzlState", zyzlState, MongoOper.IS);
  604 + }
  605 + if (org.apache.commons.lang.StringUtils.isNotBlank(zywzzlState) && ("yes".equals(zywzzlState) || "no".equals(zywzzlState)) ) {
  606 + condition = condition.and("zywzzlState", zywzzlState, MongoOper.IS);
  607 + }
  608 + if (org.apache.commons.lang.StringUtils.isNotBlank(zyatzlState) && ("yes".equals(zyatzlState) || "no".equals(zyatzlState)) ) {
  609 + condition = condition.and("zyatzlState", zyatzlState, MongoOper.IS);
  610 + }
  611 +
569 612  
570 613 if (null != ids && ids.size() > 0) {
571 614 condition = condition.and("id", ids, MongoOper.IN);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ ef264af
... ... @@ -120,6 +120,11 @@
120 120 private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) {
121 121  
122 122 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  123 +
  124 + antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState());
  125 + antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState());
  126 + antExRecordQuery.setZyatzlState(antExManagerQueryRequest.getZyatzlState());
  127 +
123 128 antExRecordQuery.setNeed(isPage);
124 129 antExRecordQuery.setPage(antExManagerQueryRequest.getPage());
125 130 antExRecordQuery.setLimit(antExManagerQueryRequest.getLimit());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ ef264af
... ... @@ -1582,6 +1582,22 @@
1582 1582 }
1583 1583  
1584 1584 Map<String, Object> map = new HashMap<>();
  1585 +
  1586 + /**
  1587 + * start
  1588 + * 遵化市妇幼新增字段
  1589 + * @param id
  1590 + * @Author: 武涛涛
  1591 + * @Date: 2020/9/14 9:24
  1592 + */
  1593 + map.put("zyzlState", data.getZyzlState());
  1594 + map.put("zyzlContent", data.getZyzlContent());
  1595 + map.put("zywzzlState", data.getZywzzlState());
  1596 + map.put("zywzzlContent", data.getZywzzlContent());
  1597 + map.put("zyatzlState", data.getZyatzlState());
  1598 + map.put("zyatzlContent", data.getZyatzlContent());
  1599 +
  1600 + /*end*/
1585 1601 /***新增字段***/
1586 1602 map.put("ttita", data.getTtita());
1587 1603 map.put("vcCardNo", patients.getVcCardNo());
1588 1604  
... ... @@ -2816,7 +2832,21 @@
2816 2832 }
2817 2833  
2818 2834 Map<String, Object> map = new HashMap<>();
  2835 + /**
  2836 + * start
  2837 + * 遵化市妇幼新增字段
  2838 + * @param id
  2839 + * @Author: 武涛涛
  2840 + * @Date: 2020/9/14 9:24
  2841 + */
  2842 + map.put("zyzlState", data.getZyzlState());
  2843 + map.put("zyzlContent", data.getZyzlContent());
  2844 + map.put("zywzzlState", data.getZywzzlState());
  2845 + map.put("zywzzlContent", data.getZywzzlContent());
  2846 + map.put("zyatzlState", data.getZyatzlState());
  2847 + map.put("zyatzlContent", data.getZyatzlContent());
2819 2848  
  2849 + /*end*/
2820 2850 /***新增字段***/
2821 2851 map.put("vcCardNo", patients.getVcCardNo());
2822 2852 map.put("ttita", data.getTtita());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ ef264af
... ... @@ -18,6 +18,25 @@
18 18 @Form
19 19 public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
20 20  
  21 + /**
  22 + * start
  23 + * 遵化需求新增字段
  24 + * @param null
  25 + * @Author: 武涛涛
  26 + * @Date: 2020/9/14 9:04
  27 + */
  28 + //中药治疗 yes no，空或者no都是no
  29 + private String zyzlState;
  30 + //输入框
  31 + private String zyzlContent;
  32 + //中医外治治疗
  33 + private String zywzzlState;
  34 + private String zywzzlContent;
  35 + //逐月安胎中医日常调理
  36 + private String zyatzlState;
  37 + private String zyatzlContent;
  38 + /*end*/
  39 +
21 40 private String genRemark; // 一般检查备注
22 41  
23 42  
... ... @@ -720,6 +739,54 @@
720 739 this.mHighRiskReason = mHighRiskReason;
721 740 }
722 741  
  742 + public String getZyzlState() {
  743 + return zyzlState;
  744 + }
  745 +
  746 + public void setZyzlState(String zyzlState) {
  747 + this.zyzlState = zyzlState;
  748 + }
  749 +
  750 + public String getZyzlContent() {
  751 + return zyzlContent;
  752 + }
  753 +
  754 + public void setZyzlContent(String zyzlContent) {
  755 + this.zyzlContent = zyzlContent;
  756 + }
  757 +
  758 + public String getZywzzlState() {
  759 + return zywzzlState;
  760 + }
  761 +
  762 + public void setZywzzlState(String zywzzlState) {
  763 + this.zywzzlState = zywzzlState;
  764 + }
  765 +
  766 + public String getZywzzlContent() {
  767 + return zywzzlContent;
  768 + }
  769 +
  770 + public void setZywzzlContent(String zywzzlContent) {
  771 + this.zywzzlContent = zywzzlContent;
  772 + }
  773 +
  774 + public String getZyatzlState() {
  775 + return zyatzlState;
  776 + }
  777 +
  778 + public void setZyatzlState(String zyatzlState) {
  779 + this.zyatzlState = zyatzlState;
  780 + }
  781 +
  782 + public String getZyatzlContent() {
  783 + return zyatzlContent;
  784 + }
  785 +
  786 + public void setZyatzlContent(String zyatzlContent) {
  787 + this.zyatzlContent = zyatzlContent;
  788 + }
  789 +
723 790 public String getQuickenRemark() {
724 791 return quickenRemark;
725 792 }
... ... @@ -1117,6 +1184,13 @@
1117 1184 @Override
1118 1185 public AntenatalExaminationModel convertToDataModel() {
1119 1186 AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
  1187 + examinationModel.setZyzlState(zyzlState);
  1188 + examinationModel.setZyzlContent(zyzlContent);
  1189 + examinationModel.setZywzzlState(zywzzlState);
  1190 + examinationModel.setZywzzlContent(zywzzlContent);
  1191 + examinationModel.setZyatzlState(zyatzlState);
  1192 + examinationModel.setZyatzlContent(zyatzlContent);
  1193 +
1120 1194 if (null != secondaryDiagnosisId) {
1121 1195 examinationModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));
1122 1196 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ ef264af
... ... @@ -13,6 +13,13 @@
13 13 */
14 14 @Form
15 15 public class AntExManagerQueryRequest extends BasePageQueryRequest {
  16 + //中药治疗 yes no，空或者no都是no
  17 + private String zyzlState;
  18 + //中医外治治疗
  19 + private String zywzzlState;
  20 + //逐月安胎中医日常调理
  21 + private String zyatzlState;
  22 +
16 23 //姓名
17 24 private String name;
18 25 //证件号babyAutoDiagnoseRisk
... ... @@ -118,6 +125,30 @@
118 125  
119 126 public void setStatus(Integer status) {
120 127 this.status = status;
  128 + }
  129 +
  130 + public String getZyzlState() {
  131 + return zyzlState;
  132 + }
  133 +
  134 + public void setZyzlState(String zyzlState) {
  135 + this.zyzlState = zyzlState;
  136 + }
  137 +
  138 + public String getZywzzlState() {
  139 + return zywzzlState;
  140 + }
  141 +
  142 + public void setZywzzlState(String zywzzlState) {
  143 + this.zywzzlState = zywzzlState;
  144 + }
  145 +
  146 + public String getZyatzlState() {
  147 + return zyatzlState;
  148 + }
  149 +
  150 + public void setZyatzlState(String zyatzlState) {
  151 + this.zyatzlState = zyatzlState;
121 152 }
122 153  
123 154 public String getAutoTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ ef264af
... ... @@ -21,6 +21,26 @@
21 21 @Form
22 22 public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
23 23  
  24 +
  25 + /**
  26 + * start
  27 + * 遵化需求新增字段
  28 + * @param null
  29 + * @Author: 武涛涛
  30 + * @Date: 2020/9/14 9:04
  31 + */
  32 + //中药治疗 yes no，空或者no都是no
  33 + private String zyzlState;
  34 + //输入框
  35 + private String zyzlContent;
  36 + //中医外治治疗
  37 + private String zywzzlState;
  38 + private String zywzzlContent;
  39 + //逐月安胎中医日常调理
  40 + private String zyatzlState;
  41 + private String zyatzlContent;
  42 + /*end*/
  43 +
24 44 private String bgValue;
25 45  
26 46 private String genRemark; // 一般检查备注
... ... @@ -795,6 +815,54 @@
795 815 return ftita;
796 816 }
797 817  
  818 + public String getZyzlState() {
  819 + return zyzlState;
  820 + }
  821 +
  822 + public void setZyzlState(String zyzlState) {
  823 + this.zyzlState = zyzlState;
  824 + }
  825 +
  826 + public String getZyzlContent() {
  827 + return zyzlContent;
  828 + }
  829 +
  830 + public void setZyzlContent(String zyzlContent) {
  831 + this.zyzlContent = zyzlContent;
  832 + }
  833 +
  834 + public String getZywzzlState() {
  835 + return zywzzlState;
  836 + }
  837 +
  838 + public void setZywzzlState(String zywzzlState) {
  839 + this.zywzzlState = zywzzlState;
  840 + }
  841 +
  842 + public String getZywzzlContent() {
  843 + return zywzzlContent;
  844 + }
  845 +
  846 + public void setZywzzlContent(String zywzzlContent) {
  847 + this.zywzzlContent = zywzzlContent;
  848 + }
  849 +
  850 + public String getZyatzlState() {
  851 + return zyatzlState;
  852 + }
  853 +
  854 + public void setZyatzlState(String zyatzlState) {
  855 + this.zyatzlState = zyatzlState;
  856 + }
  857 +
  858 + public String getZyatzlContent() {
  859 + return zyatzlContent;
  860 + }
  861 +
  862 + public void setZyatzlContent(String zyatzlContent) {
  863 + this.zyatzlContent = zyatzlContent;
  864 + }
  865 +
798 866 public void setFtita(String ftita) {
799 867 this.ftita = ftita;
800 868 }
... ... @@ -1981,6 +2049,15 @@
1981 2049 @Override
1982 2050 public AntExChuModel convertToDataModel() {
1983 2051 AntExChuModel antExChuModel = new AntExChuModel();
  2052 +
  2053 + antExChuModel.setZyzlState(zyzlState);
  2054 + antExChuModel.setZyzlContent(zyzlContent);
  2055 + antExChuModel.setZywzzlState(zywzzlState);
  2056 + antExChuModel.setZywzzlContent(zywzzlContent);
  2057 + antExChuModel.setZyatzlState(zyatzlState);
  2058 + antExChuModel.setZyatzlContent(zyatzlContent);
  2059 +
  2060 +
1984 2061 //次要诊断
1985 2062 if (null != secondaryDiagnosisId) {
1986 2063 antExChuModel.setSecondaryDiagnosisId(JsonUtil.array2JsonString(secondaryDiagnosisId));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ ef264af
... ... @@ -19,6 +19,25 @@
19 19 */
20 20 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
21 21  
  22 + /**
  23 + * start
  24 + * 遵化需求新增字段
  25 + * @param null
  26 + * @Author: 武涛涛
  27 + * @Date: 2020/9/14 9:04
  28 + */
  29 + //中药治疗 yes no，空或者no都是no
  30 + private String zyzlState;
  31 + //输入框
  32 + private String zyzlContent;
  33 + //中医外治治疗
  34 + private String zywzzlState;
  35 + private String zywzzlContent;
  36 + //逐月安胎中医日常调理
  37 + private String zyatzlState;
  38 + private String zyatzlContent;
  39 + /*end*/
  40 +
22 41 private String genRemark; // 一般检查备注
23 42  
24 43 //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
... ... @@ -128,6 +147,54 @@
128 147 return xhdbSelect;
129 148 }
130 149  
  150 + public String getZyzlState() {
  151 + return zyzlState;
  152 + }
  153 +
  154 + public void setZyzlState(String zyzlState) {
  155 + this.zyzlState = zyzlState;
  156 + }
  157 +
  158 + public String getZyzlContent() {
  159 + return zyzlContent;
  160 + }
  161 +
  162 + public void setZyzlContent(String zyzlContent) {
  163 + this.zyzlContent = zyzlContent;
  164 + }
  165 +
  166 + public String getZywzzlState() {
  167 + return zywzzlState;
  168 + }
  169 +
  170 + public void setZywzzlState(String zywzzlState) {
  171 + this.zywzzlState = zywzzlState;
  172 + }
  173 +
  174 + public String getZywzzlContent() {
  175 + return zywzzlContent;
  176 + }
  177 +
  178 + public void setZywzzlContent(String zywzzlContent) {
  179 + this.zywzzlContent = zywzzlContent;
  180 + }
  181 +
  182 + public String getZyatzlState() {
  183 + return zyatzlState;
  184 + }
  185 +
  186 + public void setZyatzlState(String zyatzlState) {
  187 + this.zyatzlState = zyatzlState;
  188 + }
  189 +
  190 + public String getZyatzlContent() {
  191 + return zyatzlContent;
  192 + }
  193 +
  194 + public void setZyatzlContent(String zyatzlContent) {
  195 + this.zyatzlContent = zyatzlContent;
  196 + }
  197 +
131 198 public void setXhdbSelect(String xhdbSelect) {
132 199 this.xhdbSelect = xhdbSelect;
133 200 }
... ... @@ -1014,6 +1081,14 @@
1014 1081  
1015 1082 @Override
1016 1083 public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
  1084 +
  1085 + setZyzlState(destModel.getZyzlState());
  1086 + setZyzlContent(destModel.getZyzlContent());
  1087 + setZywzzlState(destModel.getZywzzlState());
  1088 + setZywzzlContent(destModel.getZywzzlContent());
  1089 + setZyatzlState(destModel.getZyatzlState());
  1090 + setZyatzlContent(destModel.getZyatzlContent());
  1091 +
1017 1092 setResultSupple(destModel.getResultSupple());
1018 1093 setTtita(destModel.getTtita());
1019 1094 setTotalThy(destModel.getTotalThy());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ ef264af
... ... @@ -202,7 +202,26 @@
202 202 // 月经周期开始天数
203 203 private String mensStopDay;
204 204  
  205 +
205 206 /**
  207 + * start
  208 + * 遵化需求新增字段
  209 + * @param null
  210 + * @Author: 武涛涛
  211 + * @Date: 2020/9/14 9:04
  212 + */
  213 + //中药治疗 yes no，空或者no都是no
  214 + private String zyzlState;
  215 + //输入框
  216 + private String zyzlContent;
  217 + //中医外治治疗
  218 + private String zywzzlState;
  219 + private String zywzzlContent;
  220 + //逐月安胎中医日常调理
  221 + private String zyatzlState;
  222 + private String zyatzlContent;
  223 + /*end*/
  224 + /**
206 225 * 初检信息
207 226 **/
208 227 // 既往史
... ... @@ -302,6 +321,54 @@
302 321 //存活胎儿数
303 322 private Integer survFetus;
304 323  
  324 + public String getZyzlState() {
  325 + return zyzlState;
  326 + }
  327 +
  328 + public void setZyzlState(String zyzlState) {
  329 + this.zyzlState = zyzlState;
  330 + }
  331 +
  332 + public String getZyzlContent() {
  333 + return zyzlContent;
  334 + }
  335 +
  336 + public void setZyzlContent(String zyzlContent) {
  337 + this.zyzlContent = zyzlContent;
  338 + }
  339 +
  340 + public String getZywzzlState() {
  341 + return zywzzlState;
  342 + }
  343 +
  344 + public void setZywzzlState(String zywzzlState) {
  345 + this.zywzzlState = zywzzlState;
  346 + }
  347 +
  348 + public String getZywzzlContent() {
  349 + return zywzzlContent;
  350 + }
  351 +
  352 + public void setZywzzlContent(String zywzzlContent) {
  353 + this.zywzzlContent = zywzzlContent;
  354 + }
  355 +
  356 + public String getZyatzlState() {
  357 + return zyatzlState;
  358 + }
  359 +
  360 + public void setZyatzlState(String zyatzlState) {
  361 + this.zyatzlState = zyatzlState;
  362 + }
  363 +
  364 + public String getZyatzlContent() {
  365 + return zyatzlContent;
  366 + }
  367 +
  368 + public void setZyatzlContent(String zyatzlContent) {
  369 + this.zyatzlContent = zyatzlContent;
  370 + }
  371 +
305 372 //初诊其他信息
306 373 private List<AntExcAddOther> antExcAddOthers;
307 374 /* //心率
... ... @@ -1857,6 +1924,14 @@
1857 1924  
1858 1925 public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
1859 1926 if (null != antExChuModel) {
  1927 +
  1928 + setZyzlState(antExChuModel.getZyzlState());
  1929 + setZyzlContent(antExChuModel.getZyzlContent());
  1930 + setZywzzlState(antExChuModel.getZywzzlState());
  1931 + setZywzzlContent(antExChuModel.getZywzzlContent());
  1932 + setZyatzlState(antExChuModel.getZyatzlState());
  1933 + setZyatzlContent(antExChuModel.getZyatzlContent());
  1934 +
1860 1935 setResultSupple(antExChuModel.getResultSupple());
1861 1936 setTtita(antExChuModel.getTtita());
1862 1937 setTotalThy(antExChuModel.getTotalThy());