diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 3d6644d..4b22d27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -779,6 +779,21 @@ public class BookbuildingFacade { jsonObject.put("P_HUSBANDRRCITY", patients.getHcityRegisterId());//丈夫户口所在地 市 jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地 县 jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地 街道 + jsonObject.put("P_HOSPITALID", patients.getBookbuildingDoctor());//建档人 + //让写死桃城区,董勤说最后定 + jsonObject.put("P_HOSPITALID", patients.getHospitalId());//建党机构 + jsonObject.put("P_ISVIP", patients.getBookbuildingDate());//建档时间 + + if(patients.getReqHusband()!=null){//丈夫信息是否必须 + if(patients.getReqHusband()){ + jsonObject.put("P_HUSBANDUNPROVIDE", 1); + }else if(!patients.getReqHusband()){ + jsonObject.put("P_HUSBANDUNPROVIDE", 2); + } + }else { + jsonObject.put("P_HUSBANDUNPROVIDE", ""); + } + return jsonObject; } @@ -2312,8 +2327,8 @@ public class BookbuildingFacade { * @return BaseResponse */ public BaseResponse addPregnantBookbuildingV2(SyncV2YunBookbuildingRequest param, Integer userId, boolean b) { - YunBookbuildingAddRequest request = param; - YunBookbuildingAddRequest addRequest = getYunBookbuildingAddRequest(request); +// YunBookbuildingAddRequest request = param; + YunBookbuildingAddRequest addRequest = getYunBookbuildingAddRequest(param); SyncV2YunBookbuildingRequest paramRequest = (SyncV2YunBookbuildingRequest) addRequest; return addPregnantBookbuilding(paramRequest, userId, b); } @@ -2324,9 +2339,18 @@ public class BookbuildingFacade { * @param param * @return */ - private YunBookbuildingAddRequest getYunBookbuildingAddRequest( YunBookbuildingAddRequest param) { + private YunBookbuildingAddRequest getYunBookbuildingAddRequest( SyncV2YunBookbuildingRequest param) { // TODO 2019/6/7 14:07 dongqing 修改 + //丈夫信息是否必须,映射 + if (param.getReqHusbandInt()==1){ + param.setReqHusband(true); + }else if(param.getReqHusbandInt()==2){ + param.setReqHusband(false); + }else { + param.setReqHusband(null); + } + return param; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SyncV2YunBookbuildingRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SyncV2YunBookbuildingRequest.java index cae013a..c627884 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SyncV2YunBookbuildingRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SyncV2YunBookbuildingRequest.java @@ -11,6 +11,15 @@ public class SyncV2YunBookbuildingRequest extends YunBookbuildingAddRequest { // TODO 2019/6/5 14:45 dongqing 这里添加额外需要的参数,其他参数父类即可拿到 private Integer userId; + private Integer reqHusbandInt; + + public Integer getReqHusbandInt() { + return reqHusbandInt; + } + + public void setReqHusbandInt(Integer reqHusbandInt) { + this.reqHusbandInt = reqHusbandInt; + } public Integer getUserId() { return userId;