jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e8a3489887d3a336f3296cd9dc5f3004a994cebb

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

产检增加字段

Showing 6 changed files with 60 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ e8a3489
... ... @@ -75,6 +75,8 @@
75 75 private String cestationInfo;
76 76 // 宫高
77 77 private String gonggao;
  78 + // 宫高
  79 + private String gonggaoSelect;
78 80 // 宫高类型
79 81 private String gonggaoType;
80 82 //腹围
... ... @@ -112,6 +114,13 @@
112 114 */
113 115 private String diagnosisOther;
114 116  
  117 + public String getGonggaoSelect() {
  118 + return gonggaoSelect;
  119 + }
  120 +
  121 + public void setGonggaoSelect(String gonggaoSelect) {
  122 + this.gonggaoSelect = gonggaoSelect;
  123 + }
115 124  
116 125 public String getDiagnosisOther() {
117 126 return diagnosisOther;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ e8a3489
... ... @@ -50,6 +50,8 @@
50 50 private String bp;
51 51 //宫高
52 52 private String gongGao;
  53 + //宫高选择
  54 + private String gongGaoSelect;
53 55 //宫高类型
54 56 private String gongGaoType;
55 57 //腹围
... ... @@ -110,6 +112,14 @@
110 112 private String cDueWeek;
111 113 //操作人
112 114 private Integer operator;
  115 +
  116 + public String getGongGaoSelect() {
  117 + return gongGaoSelect;
  118 + }
  119 +
  120 + public void setGongGaoSelect(String gongGaoSelect) {
  121 + this.gongGaoSelect = gongGaoSelect;
  122 + }
113 123  
114 124 public String getGongGaoType() {
115 125 return gongGaoType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ e8a3489
... ... @@ -10,7 +10,6 @@
10 10 import com.lyms.platform.common.base.LoginContext;
11 11 import com.lyms.platform.common.constants.ErrorCodeConstants;
12 12 import com.lyms.platform.common.result.BaseListResponse;
13   -import com.lyms.platform.common.result.BaseObjectResponse;
14 13 import com.lyms.platform.common.result.BaseResponse;
15 14 import com.lyms.platform.common.utils.PropertiesUtils;
16 15 import com.lyms.platform.operate.web.facade.AntExRecordFacade;
... ... @@ -150,7 +149,6 @@
150 149 @TokenRequired
151 150 public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) {
152 151 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
153   -
154 152  
155 153 BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId());
156 154 baseResponse.setObject(couponService.getPatientsInfoByCode(antExAddRequest.getCouponCode()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ e8a3489
... ... @@ -437,6 +437,14 @@
437 437 map.put("fujian", data.getFujian());
438 438  
439 439 map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
  440 +
  441 + if(StringUtils.isNotEmpty(data.getGonggaoSelect())){
  442 + map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect()));
  443 + }
  444 +
  445 + if(StringUtils.isNotEmpty(data.getGonggaoType())){
  446 + map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGonggaoType()));
  447 + }
440 448 map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM));
441 449 map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber()));
442 450 //胎儿情况
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ e8a3489
... ... @@ -45,6 +45,8 @@
45 45 private Map bp;
46 46 //宫高
47 47 private String gongGao;
  48 + //宫高选项
  49 + private String gongGaoSelect;
48 50 //宫高类型
49 51 private String gongGaoType;
50 52 //腹围
... ... @@ -95,6 +97,14 @@
95 97  
96 98 private Integer couponType;
97 99  
  100 + public String getGongGaoSelect() {
  101 + return gongGaoSelect;
  102 + }
  103 +
  104 + public void setGongGaoSelect(String gongGaoSelect) {
  105 + this.gongGaoSelect = gongGaoSelect;
  106 + }
  107 +
98 108 public String getDiagnosisOther() {
99 109 return diagnosisOther;
100 110 }
... ... @@ -191,6 +201,7 @@
191 201 examinationModel.setWeight(weight);
192 202 examinationModel.setBp(JsonUtil.obj2JsonString(bp));
193 203 examinationModel.setGongGao(gongGao);
  204 + examinationModel.setGongGaoSelect(gongGaoSelect);
194 205 examinationModel.setGongGaoType(gongGaoType);
195 206 examinationModel.setAbdominalCircumference(abdominalCircumference);
196 207 examinationModel.setEdema(edema);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ e8a3489
... ... @@ -95,8 +95,10 @@
95 95 private String fujian;
96 96 // 宫高
97 97 private String gonggao;
  98 + // 宫高选项
  99 + private String gongGaoSelect;
98 100 // 宫高类型
99   - private String gonggaoType;
  101 + private String gongGaoType;
100 102 //腹围
101 103 private String fuwei;
102 104 //胎数
... ... @@ -207,6 +209,7 @@
207 209 //出生缺陷儿备注
208 210 private String birthDefectTodo;
209 211  
  212 +
210 213 public String getNeoDeathTodo() {
211 214 return neoDeathTodo;
212 215 }
213 216  
... ... @@ -247,14 +250,7 @@
247 250 this.couponType = couponType;
248 251 }
249 252  
250   - public String getGonggaoType() {
251   - return gonggaoType;
252   - }
253 253  
254   - public void setGonggaoType(String gonggaoType) {
255   - this.gonggaoType = gonggaoType;
256   - }
257   -
258 254 public String getBarCode() {
259 255 return barCode;
260 256 }
... ... @@ -768,6 +764,22 @@
768 764 this.fuwei = fuwei;
769 765 }
770 766  
  767 + public String getGongGaoSelect() {
  768 + return gongGaoSelect;
  769 + }
  770 +
  771 + public void setGongGaoSelect(String gongGaoSelect) {
  772 + this.gongGaoSelect = gongGaoSelect;
  773 + }
  774 +
  775 + public String getGongGaoType() {
  776 + return gongGaoType;
  777 + }
  778 +
  779 + public void setGongGaoType(String gongGaoType) {
  780 + this.gongGaoType = gongGaoType;
  781 + }
  782 +
771 783 public String getGonggao() {
772 784 return gonggao;
773 785 }
... ... @@ -1005,7 +1017,8 @@
1005 1017 antExChuModel.setBaricIndex(baricIndex);
1006 1018 antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo));
1007 1019 antExChuModel.setGonggao(gonggao);
1008   - antExChuModel.setGonggaoType(gonggaoType);
  1020 + antExChuModel.setGonggaoSelect(gongGaoSelect);
  1021 + antExChuModel.setGonggaoType(gongGaoType);
1009 1022 antExChuModel.setFuwei(fuwei);
1010 1023 antExChuModel.setTireNumber1(tireNumber1);
1011 1024 antExChuModel.setPlacentas(placentas);