diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 196a352..86943ac 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -75,6 +75,8 @@ public class AntExChuModel extends BaseModel { private String cestationInfo; // 宫高 private String gonggao; + // 宫高 + private String gonggaoSelect; // 宫高类型 private String gonggaoType; //腹围 @@ -112,6 +114,13 @@ public class AntExChuModel extends BaseModel { */ private String diagnosisOther; + public String getGonggaoSelect() { + return gonggaoSelect; + } + + public void setGonggaoSelect(String gonggaoSelect) { + this.gonggaoSelect = gonggaoSelect; + } public String getDiagnosisOther() { return diagnosisOther; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index b1208cf..8bdf03c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -50,6 +50,8 @@ public class AntenatalExaminationModel extends BaseModel { private String bp; //宫高 private String gongGao; + //宫高选择 + private String gongGaoSelect; //宫高类型 private String gongGaoType; //腹围 @@ -111,6 +113,14 @@ public class AntenatalExaminationModel extends BaseModel { //操作人 private Integer operator; + public String getGongGaoSelect() { + return gongGaoSelect; + } + + public void setGongGaoSelect(String gongGaoSelect) { + this.gongGaoSelect = gongGaoSelect; + } + public String getGongGaoType() { return gongGaoType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 84c8197..e2f0845 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -10,7 +10,6 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.facade.AntExRecordFacade; @@ -151,7 +150,6 @@ public class AntenatalExaminationController extends BaseController { public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); baseResponse.setObject(couponService.getPatientsInfoByCode(antExAddRequest.getCouponCode())); return baseResponse; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4e2212d..9d46acb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -437,6 +437,14 @@ public class ViewFacade { map.put("fujian", data.getFujian()); map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM)); + + if(StringUtils.isNotEmpty(data.getGonggaoSelect())){ + map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect())); + } + + if(StringUtils.isNotEmpty(data.getGonggaoType())){ + map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGonggaoType())); + } map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM)); map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber())); //胎儿情况 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index baf8a91..ea4adc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -45,6 +45,8 @@ public class AntExAddRequest implements IBasicRequestConvert { private String fujian; // 宫高 private String gonggao; + // 宫高选项 + private String gongGaoSelect; // 宫高类型 - private String gonggaoType; + private String gongGaoType; //腹围 private String fuwei; //胎数 @@ -207,6 +209,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { //出生缺陷儿备注 private String birthDefectTodo; + public String getNeoDeathTodo() { return neoDeathTodo; } @@ -247,13 +250,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.couponType = couponType; } - public String getGonggaoType() { - return gonggaoType; - } - - public void setGonggaoType(String gonggaoType) { - this.gonggaoType = gonggaoType; - } public String getBarCode() { return barCode; @@ -768,6 +764,22 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.fuwei = fuwei; } + public String getGongGaoSelect() { + return gongGaoSelect; + } + + public void setGongGaoSelect(String gongGaoSelect) { + this.gongGaoSelect = gongGaoSelect; + } + + public String getGongGaoType() { + return gongGaoType; + } + + public void setGongGaoType(String gongGaoType) { + this.gongGaoType = gongGaoType; + } + public String getGonggao() { return gonggao; } @@ -1005,7 +1017,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setBaricIndex(baricIndex); antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo)); antExChuModel.setGonggao(gonggao); - antExChuModel.setGonggaoType(gonggaoType); + antExChuModel.setGonggaoSelect(gongGaoSelect); + antExChuModel.setGonggaoType(gongGaoType); antExChuModel.setFuwei(fuwei); antExChuModel.setTireNumber1(tireNumber1); antExChuModel.setPlacentas(placentas);