jiangjiazhi / regional-platform

Commit 86106a7c39fc6acd57a53aa275a903d9d175d19b

Authored by wtt almost 6 years ago

Exists in master and in 6 other branches

3.0、2.0建档代码

Showing 2 changed files with 36 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SyncV2YunBookbuildingRequest.java

...	...	@@ -779,6 +779,21 @@
779	779	jsonObject.put("P_HUSBANDRRCITY", patients.getHcityRegisterId());//丈夫户口所在地市
780	780	jsonObject.put("P_HUSBANDRRCOUNTY", patients.getHareaRegisterId());//丈夫户口所在地县
781	781	jsonObject.put("P_HUSBANDRRSTREET", patients.getHstreetRegisterId());//丈夫户口所在地街道
	782	+ jsonObject.put("P_HOSPITALID", patients.getBookbuildingDoctor());//建档人
	783	+ //让写死桃城区，董勤说最后定
	784	+ jsonObject.put("P_HOSPITALID", patients.getHospitalId());//建党机构
	785	+ jsonObject.put("P_ISVIP", patients.getBookbuildingDate());//建档时间
	786	+
	787	+ if(patients.getReqHusband()!=null){//丈夫信息是否必须
	788	+ if(patients.getReqHusband()){
	789	+ jsonObject.put("P_HUSBANDUNPROVIDE", 1);
	790	+ }else if(!patients.getReqHusband()){
	791	+ jsonObject.put("P_HUSBANDUNPROVIDE", 2);
	792	+ }
	793	+ }else {
	794	+ jsonObject.put("P_HUSBANDUNPROVIDE", "");
	795	+ }
	796	+
782	797	return jsonObject;
783	798	}
784	799
...	...	@@ -2312,8 +2327,8 @@
2312	2327	* @return BaseResponse
2313	2328	*/
2314	2329	public BaseResponse addPregnantBookbuildingV2(SyncV2YunBookbuildingRequest param, Integer userId, boolean b) {
2315		- YunBookbuildingAddRequest request = param;
2316		- YunBookbuildingAddRequest addRequest = getYunBookbuildingAddRequest(request);
	2330	+// YunBookbuildingAddRequest request = param;
	2331	+ YunBookbuildingAddRequest addRequest = getYunBookbuildingAddRequest(param);
2317	2332	SyncV2YunBookbuildingRequest paramRequest = (SyncV2YunBookbuildingRequest) addRequest;
2318	2333	return addPregnantBookbuilding(paramRequest, userId, b);
2319	2334	}
2320	2335
...	...	@@ -2324,8 +2339,17 @@
2324	2339	* @param param
2325	2340	* @return
2326	2341	*/
2327		- private YunBookbuildingAddRequest getYunBookbuildingAddRequest( YunBookbuildingAddRequest param) {
	2342	+ private YunBookbuildingAddRequest getYunBookbuildingAddRequest( SyncV2YunBookbuildingRequest param) {
2328	2343	// TODO 2019/6/7 14:07 dongqing 修改
	2344	+
	2345	+ //丈夫信息是否必须，映射
	2346	+ if (param.getReqHusbandInt()==1){
	2347	+ param.setReqHusband(true);
	2348	+ }else if(param.getReqHusbandInt()==2){
	2349	+ param.setReqHusband(false);
	2350	+ }else {
	2351	+ param.setReqHusband(null);
	2352	+ }
2329	2353
2330	2354	return param;
2331	2355	}

...	...	@@ -11,6 +11,15 @@
11	11
12	12	// TODO 2019/6/5 14:45 dongqing 这里添加额外需要的参数，其他参数父类即可拿到
13	13	private Integer userId;
	14	+ private Integer reqHusbandInt;
	15	+
	16	+ public Integer getReqHusbandInt() {
	17	+ return reqHusbandInt;
	18	+ }
	19	+
	20	+ public void setReqHusbandInt(Integer reqHusbandInt) {
	21	+ this.reqHusbandInt = reqHusbandInt;
	22	+ }
14	23
15	24	public Integer getUserId() {
16	25	return userId;