jiangjiazhi / regional-platform

Commit 5081b29c2a3f034edb70b989cb29f1dc5653e81f

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

出生医学记录接口

Showing 5 changed files with 212 additions and 34 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java

...	...	@@ -1469,6 +1469,10 @@
1469	1469	System.out.println("上一年的最后一天: " + getYear(date, -1, 0).toLocaleString());
1470	1470	System.out.println(getBetweenDay(7));
1471	1471	System.out.println(date.getTime());*/
	1472	+
	1473	+
	1474	+ Date date = parseDate("2018-01-05");
	1475	+ System.out.println(date.getTime());
1472	1476	}
1473	1477
1474	1478	}

...	...	@@ -607,5 +607,20 @@
607	607	return viewFacade.getWhfyPatientPrint(id);
608	608	}
609	609
	610	+
	611	+ /**
	612	+ * 对接北京系统出生医学证明的接口
	613	+ *
	614	+ * @param idCard
	615	+ * @return
	616	+ */
	617	+ @RequestMapping(value = "/getCheckInfo", method = RequestMethod.GET)
	618	+ @ResponseBody
	619	+ @TokenRequired
	620	+ public List<Map<String, Object>> getMatDeliverData(@RequestParam(required = true) String idCard,
	621	+ @RequestParam(required = false) String jigou) {
	622	+ return viewFacade.getMatDeliverData(idCard,jigou);
	623	+ }
	624	+
610	625	}

...	...	@@ -17,6 +17,7 @@
17	17	import com.lyms.platform.operate.web.utils.*;
18	18	import com.lyms.platform.permission.dao.master.CouponMapper;
19	19	import com.lyms.platform.permission.model.Organization;
	20	+import com.lyms.platform.permission.model.OrganizationQuery;
20	21	import com.lyms.platform.permission.model.Users;
21	22	import com.lyms.platform.permission.service.CouponService;
22	23	import com.lyms.platform.permission.service.OrganizationService;
...	...	@@ -1788,7 +1789,7 @@
1788	1789	map.put("quicken", QuickenEnums.getName(data.getQuicken()));
1789	1790
1790	1791	//聊城东昌府区妇幼保健医院特有字段
1791		- map.put("lisCheckItems",data.getLisCheckItems());
	1792	+ map.put("lisCheckItems", data.getLisCheckItems());
1792	1793
1793	1794	br.setErrorcode(ErrorCodeConstants.SUCCESS);
1794	1795	br.setErrormsg("成功");
1795	1796
...	...	@@ -1975,13 +1976,13 @@
1975	1976	for (Object temp : data.getTireData()) {
1976	1977	Map<String, Object> tire = (Map<String, Object>) temp;
1977	1978	if (tire != null) {
1978		- String heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate"));
	1979	+ String heartRate = tire.get("heartRate") == null ? "" : String.valueOf(tire.get("heartRate"));
1979	1980	String fetalPosition = tire.get("fetalPosition") + "";
1980	1981	String fetalPresentation = tire.get("fetalPresentation") + "";
1981	1982	String join = tire.get("join") + "";
1982	1983
1983	1984	Map<String, Object> tireMap = new HashMap<>();
1984		- if(StringUtils.isNotEmpty(heartRate)) {
	1985	+ if (StringUtils.isNotEmpty(heartRate)) {
1985	1986	tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
1986	1987	} else {
1987	1988	tireMap.put("heartRate", "");
1988	1989
...	...	@@ -2066,10 +2067,10 @@
2066	2067	map.put("couponCode", couponService.findByUsedId(id));
2067	2068
2068	2069	//聊城东昌府区妇幼保健医院才用
2069		- map.put("lisCheckItems",data.getLisCheckItems());
	2070	+ map.put("lisCheckItems", data.getLisCheckItems());
2070	2071
2071	2072	//诸城妇幼复诊特有字段随机血糖单位mmol/L
2072		- map.put("randomBloodSugar",StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar()+UnitConstants.MMOLL : "");
	2073	+ map.put("randomBloodSugar", StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar() + UnitConstants.MMOLL : "");
2073	2074
2074	2075	br.setErrorcode(ErrorCodeConstants.SUCCESS);
2075	2076	br.setErrormsg("成功");
...	...	@@ -2441,7 +2442,7 @@
2441	2442	if (CollectionUtils.isNotEmpty(data.getBaby())) {
2442	2443	for (MaternalDeliverModel.Baby temp : data.getBaby()) {
2443	2444	Map<String, Object> babyMap = new HashMap<>();
2444		- babyMap.put("babyId",temp.getId());
	2445	+ babyMap.put("babyId", temp.getId());
2445	2446	babyMap.put("dueTime", temp.getDueTime());
2446	2447	babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut()));
2447	2448	babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否");
...	...	@@ -2492,7 +2493,8 @@
2492	2493
2493	2494	Map<String, String> totalprocessMap = JsonUtil.getMap(totalProcess);
2494	2495	if (MapUtils.isNotEmpty(totalprocessMap)) {
2495		- p = totalprocessMap.get("h") + "时" + totalprocessMap.get("m") + "分";
	2496	+ p = (totalprocessMap.get("h") == null ? "" : totalprocessMap.get("h") + "时")
	2497	+ + (totalprocessMap.get("m") == null ? "" : totalprocessMap.get("m") + "分");
2496	2498	}
2497	2499	map.put("totalProcess", p);
2498	2500	return map;
2499	2501
2500	2502
...	...	@@ -2509,15 +2511,18 @@
2509	2511	if (MapUtils.isNotEmpty(prodprocessMap)) {
2510	2512	Map<String, String> prodprocessOne = prodprocessMap.get("one");
2511	2513	if (MapUtils.isNotEmpty(prodprocessOne)) {
2512		- one = prodprocessOne.get("h") + "时" + prodprocessOne.get("m") + "分";
	2514	+ one = (prodprocessOne.get("h") == null ? "" : prodprocessOne.get("h") + "时") +
	2515	+ (prodprocessOne.get("m") == null ? "" : prodprocessOne.get("m") + "分");
2513	2516	}
2514	2517	Map<String, String> prodprocessTwo = prodprocessMap.get("two");
2515	2518	if (MapUtils.isNotEmpty(prodprocessTwo)) {
2516		- two = prodprocessTwo.get("h") + "时" + prodprocessTwo.get("m") + "分";
	2519	+ two = (prodprocessTwo.get("h") == null ? "" : prodprocessTwo.get("h") + "时")
	2520	+ + (prodprocessTwo.get("m") == null ? "" : prodprocessTwo.get("m") + "分");
2517	2521	}
2518	2522	Map<String, String> prodprocessThree = prodprocessMap.get("three");
2519	2523	if (MapUtils.isNotEmpty(prodprocessThree)) {
2520		- three = prodprocessThree.get("h") + "时" + prodprocessThree.get("m") + "分";
	2524	+ three = (prodprocessThree.get("h") == null ? "" : prodprocessThree.get("h") + "时")
	2525	+ + (prodprocessThree.get("m") == null ? "" : prodprocessThree.get("m") + "分");
2521	2526	}
2522	2527	}
2523	2528	map.put("one", one);
...	...	@@ -3751,7 +3756,7 @@
3751	3756	return RespBuilder.buildSuccess();
3752	3757	}
3753	3758
3754		- public BaseObjectResponse findMatDeliverPrint(String id,String babyId) {
	3759	+ public BaseObjectResponse findMatDeliverPrint(String id, String babyId) {
3755	3760	BaseObjectResponse br = new BaseObjectResponse();
3756	3761	MaternalDeliverModel data = matDeliverService.getOneMatDeliver(id);
3757	3762	if (data == null \|\| data.getYn() == YnEnums.NO.getId()) {
...	...	@@ -3775,8 +3780,7 @@
3775	3780	List<Map<String, Object>> babyList = new ArrayList<>();
3776	3781	if (CollectionUtils.isNotEmpty(data.getBaby())) {
3777	3782	for (MaternalDeliverModel.Baby temp : data.getBaby()) {
3778		- if (StringUtils.isNotEmpty(babyId) && babyId.equals(temp.getId()))
3779		- {
	3783	+ if (StringUtils.isNotEmpty(babyId) && babyId.equals(temp.getId())) {
3780	3784	//性别
3781	3785	map.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById(
3782	3786	Integer.parseInt(temp.getBabyGender())));
3783	3787
3784	3788
...	...	@@ -3785,13 +3789,13 @@
3785	3789	String time = DateUtil.getymdhm(dueTime);
3786	3790
3787	3791	//分娩时间
3788		- map.put("dueTimeYear", time.substring(0,4));
	3792	+ map.put("dueTimeYear", time.substring(0, 4));
3789	3793	map.put("dueTimeMonth", time.substring(4, 6));
3790	3794	map.put("dueTimeDay", time.substring(6, 8));
3791	3795	map.put("dueTimeHour", time.substring(8, 10));
3792		- map.put("dueTimeMinute",time.substring(10, 12));
	3796	+ map.put("dueTimeMinute", time.substring(10, 12));
3793	3797	//体重
3794		- map.put("babyWeight", temp.getBabyWeight() == null? "" : temp.getBabyWeight());
	3798	+ map.put("babyWeight", temp.getBabyWeight() == null ? "" : temp.getBabyWeight());
3795	3799	//身高
3796	3800	map.put("babyHeight", temp.getBabyHeight() == null ? "" : temp.getBabyHeight());
3797	3801	//健康状态
3798	3802
...	...	@@ -3807,11 +3811,10 @@
3807	3811
3808	3812	String tc = "";
3809	3813	String cc = "";
3810		- if (CollectionUtils.isNotEmpty(list))
3811		- {
	3814	+ if (CollectionUtils.isNotEmpty(list)) {
3812	3815	AntExChuModel chuModel = list.get(0);
3813	3816	//孕次
3814		- tc = chuModel.getPregnancyTimes() == null ? "" : String.valueOf(chuModel.getPregnancyTimes());
	3817	+ tc = chuModel.getPregnancyTimes() == null ? "" : String.valueOf(chuModel.getPregnancyTimes());
3815	3818	// 产次
3816	3819	cc = chuModel.getProdTime() == null ? "" : String.valueOf(chuModel.getProdTime());
3817	3820	}
...	...	@@ -3822,7 +3825,7 @@
3822	3825	map.put("cc", cc);
3823	3826
3824	3827	//双胎
3825		- map.put("tireNumber",data.getTireNumber());
	3828	+ map.put("tireNumber", data.getTireNumber());
3826	3829
3827	3830	String deliveryMode = ""; //为2的时候剖宫产，1为顺产其他的不选
3828	3831	if (StringUtils.isNotEmpty(data.getDeliveryMode())) {
3829	3832
...	...	@@ -3862,9 +3865,9 @@
3862	3865	map.put("motherAddr", liveAddress);
3863	3866
3864	3867	//父亲姓名
3865		- map.put("fatherName",patients.getHusbandName() == null ? "" : patients.getHusbandName());
	3868	+ map.put("fatherName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
3866	3869	//父亲年龄
3867		- map.put("fatherAge",patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
	3870	+ map.put("fatherAge", patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
3868	3871	//父亲工作单位
3869	3872	map.put("fatherWorkUnit", patients.getHworkUnit() == null ? "" : patients.getHworkUnit());
3870	3873
...	...	@@ -3883,7 +3886,7 @@
3883	3886	}
3884	3887
3885	3888	//出生地点(市)
3886		- map.put("bornAddress", CommonsHelper.getName1(cityId,basicConfigService));
	3889	+ map.put("bornAddress", CommonsHelper.getName1(cityId, basicConfigService));
3887	3890
3888	3891	//分娩医院
3889	3892	map.put("fmHospital", fmHospital);
3890	3893
...	...	@@ -3920,12 +3923,12 @@
3920	3923
3921	3924	String qfDate = DateUtil.getYmd(new Date());
3922	3925	//签发日期
3923		- map.put("signDateYear", qfDate.substring(0,4));
	3926	+ map.put("signDateYear", qfDate.substring(0, 4));
3924	3927	map.put("signDateMonth", qfDate.substring(4, 6));
3925	3928	map.put("signDateDay", qfDate.substring(6, 8));
3926	3929
3927	3930	//母亲国籍
3928		- map.put("motherCountry", getBasicConfig(patients.getPcountryId()));
	3931	+ map.put("motherCountry", getBasicConfig(patients.getPcountryId()));
3929	3932
3930	3933	//母亲民族
3931	3934	map.put("motherNation", getBasicConfig(patients.getPnationId()));
...	...	@@ -3935,7 +3938,7 @@
3935	3938
3936	3939
3937	3940	//父亲国籍
3938		- map.put("fatherCountry", getBasicConfig(patients.getHcountryId()));
	3941	+ map.put("fatherCountry", getBasicConfig(patients.getHcountryId()));
3939	3942
3940	3943	//父亲民族
3941	3944	map.put("fatherNation", getBasicConfig(patients.getHnationId()));
...	...	@@ -3943,8 +3946,7 @@
3943	3946	String fage = "";
3944	3947	if (StringUtils.isNotEmpty(patients.getHcertificateTypeId()) && StringUtils.isNotEmpty(patients.getHcertificateNum()) &&
3945	3948	patients.getHcertificateNum().length() == 18 &&
3946		- "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId()))
3947		- {
	3949	+ "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())) {
3948	3950	String cardNo = patients.getHcertificateNum().substring(6, 14);
3949	3951	Date date = DateUtil.parseYYYYMMDD(cardNo);
3950	3952	Integer age = DateUtil.getAge(date);
3951	3953
...	...	@@ -3952,11 +3954,11 @@
3952	3954	}
3953	3955
3954	3956	//父亲年龄
3955		- map.put("fatherAge",fage);
	3957	+ map.put("fatherAge", fage);
3956	3958
3957	3959
3958	3960	//产妇情况 1良好其他不选
3959		- map.put("maternalInfo",data.getMaternalInfo());
	3961	+ map.put("maternalInfo", data.getMaternalInfo());
3960	3962
3961	3963	br.setErrorcode(ErrorCodeConstants.SUCCESS);
3962	3964	br.setErrormsg("成功");
...	...	@@ -4006,8 +4008,7 @@
4006	4008	String fage = "";
4007	4009	if (StringUtils.isNotEmpty(data.getHcertificateTypeId()) && StringUtils.isNotEmpty(data.getHcertificateNum()) &&
4008	4010	data.getHcertificateNum().length() == 18 &&
4009		- "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(data.getHcertificateTypeId()))
4010		- {
	4011	+ "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(data.getHcertificateTypeId())) {
4011	4012	String cardNo = data.getHcertificateNum().substring(6, 14);
4012	4013	Date date = DateUtil.parseYYYYMMDD(cardNo);
4013	4014	Integer age = DateUtil.getAge(date);
...	...	@@ -4015,7 +4016,7 @@
4015	4016	}
4016	4017
4017	4018	//丈夫年龄
4018		- map.put("husbandAge",fage);
	4019	+ map.put("husbandAge", fage);
4019	4020	map.put("husbandNation", getBasicConfig(data.getHnationId()));
4020	4021	map.put("husbandProfessionType", getBasicConfig(data.getHprofessionTypeId()));
4021	4022	map.put("husbandRegister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(),
...	...	@@ -4028,6 +4029,163 @@
4028	4029	br.setErrorcode(ErrorCodeConstants.SUCCESS);
4029	4030	br.setErrormsg("成功");
4030	4031	return br;
	4032	+ }
	4033	+
	4034	+ public List<Map<String, Object>> getMatDeliverData(String idCard, String jigou) {
	4035	+
	4036	+ PatientsQuery patientsQuery = new PatientsQuery();
	4037	+ patientsQuery.setYn(YnEnums.YES.getId());
	4038	+ patientsQuery.setCardNo(idCard);
	4039	+
	4040	+ if (StringUtils.isNotEmpty(jigou)) {
	4041	+ OrganizationQuery query = new OrganizationQuery();
	4042	+ query.setName(jigou);
	4043	+ query.setYn(YnEnums.YES.getId());
	4044	+ List<Organization> organizations = organizationService.queryOrganization(query);
	4045	+ if (CollectionUtils.isNotEmpty(organizations)) {
	4046	+ patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId()));
	4047	+ }
	4048	+ }
	4049	+ List<Map<String, Object>> deliverList = new ArrayList<>();
	4050	+ List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
	4051	+ if (CollectionUtils.isNotEmpty(list)) {
	4052	+ Patients pat = list.get(0);
	4053	+ MatDeliverQuery deliverQuery = new MatDeliverQuery();
	4054	+ deliverQuery.setYn(YnEnums.YES.getId());
	4055	+ deliverQuery.setParentId(pat.getId());
	4056	+ List<MaternalDeliverModel> datas = matDeliverService.query(deliverQuery);
	4057	+ if (CollectionUtils.isNotEmpty(datas)) {
	4058	+ MaternalDeliverModel data = datas.get(0);
	4059	+
	4060	+ List<MaternalDeliverModel.Baby> babies = data.getBaby();
	4061	+ if (CollectionUtils.isNotEmpty(babies)) {
	4062	+ for (MaternalDeliverModel.Baby baby : babies) {
	4063	+ Map<String, Object> map = new HashMap<>();
	4064	+
	4065	+ //新生儿性别
	4066	+ map.put("id", baby.getId());
	4067	+ //新生儿主键
	4068	+ map.put("sex", baby.getBabyGender() == null ? "" : SexEnum.getTextById(
	4069	+ Integer.parseInt(baby.getBabyGender())));
	4070	+
	4071	+
	4072	+ Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1());
	4073	+ Integer week = betweenDay / 7;
	4074	+ Integer day = betweenDay % 7;
	4075	+
	4076	+ //出生孕周(周)
	4077	+ map.put("yz_week", week);
	4078	+ //出生孕天(天)
	4079	+ map.put("yz_day", day);
	4080	+ //新生儿出生日期
	4081	+ map.put("birthday", baby.getDueTime());
	4082	+ //新生儿出生地(省)
	4083	+ map.put("address_sheng", "");
	4084	+ //新生儿出生地(市)
	4085	+ map.put("address_shi", "");
	4086	+ //新生儿出生地(区县)
	4087	+ map.put("address_xian", "");
	4088	+ //新生儿健康状态
	4089	+ map.put("health", "");
	4090	+ //新生儿体重（克）
	4091	+ map.put("weight", baby.getBabyWeight());
	4092	+ //新生儿身长（厘米）
	4093	+ map.put("height", baby.getBabyHeight());
	4094	+
	4095	+
	4096	+// map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
	4097	+// data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
	4098	+// map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
	4099	+// data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
	4100	+
	4101	+ //母亲户籍地
	4102	+ map.put("womanaddress", CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(),
	4103	+ pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));
	4104	+ //母亲姓名
	4105	+ map.put("womanname", pat.getUsername());
	4106	+
	4107	+ //母亲分娩年龄
	4108	+ map.put("womanage", DateUtil.getAge(pat.getBirth(), pat.getFmDate()));
	4109	+
	4110	+ //母亲国籍
	4111	+ map.put("womannation", getBasicConfig(pat.getPcountryId()));
	4112	+ //母亲证件类型
	4113	+ map.put("womancardtype", getBasicConfig(pat.getPcerteTypeId()));
	4114	+ //母亲证件号码
	4115	+ map.put("womancardnum", pat.getCardNo());
	4116	+ //母亲民族
	4117	+ map.put("womanminzu", getBasicConfig(pat.getPnationId()));
	4118	+
	4119	+
	4120	+ //父亲户籍地
	4121	+ map.put("manaddress", CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(),
	4122	+ pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(),
	4123	+ basicConfigService));
	4124	+
	4125	+ //父亲姓名
	4126	+ map.put("manname", pat.getHusbandName());
	4127	+
	4128	+ String fage = "";
	4129	+ if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) &&
	4130	+ pat.getHcertificateNum().length() == 18 &&
	4131	+ "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) {
	4132	+ String cardNo = pat.getHcertificateNum().substring(6, 14);
	4133	+ Date date = DateUtil.parseYYYYMMDD(cardNo);
	4134	+ Integer age = DateUtil.getAge(date);
	4135	+ fage = String.valueOf(age);
	4136	+ }
	4137	+
	4138	+ //父亲年龄
	4139	+ map.put("manage", fage);
	4140	+ //父亲国籍
	4141	+ map.put("mannation", getBasicConfig(pat.getHcountryId()));
	4142	+ //父亲证件类型
	4143	+ map.put("mancardtype", getBasicConfig(pat.getHcertificateTypeId()));
	4144	+ //父亲证件号码
	4145	+ map.put("mancardnum", pat.getHcertificateNum());
	4146	+ //父亲民族
	4147	+ map.put("manminzu", getBasicConfig(pat.getHnationId()));
	4148	+
	4149	+ //出生地点分类
	4150	+ map.put("addresstype", (data.getFmType() != null && data.getFmType().equals("1")) ? "住院" : "其他");
	4151	+
	4152	+ String fmHospital = "";
	4153	+ if (StringUtils.isNotEmpty(data.getFmHospital())) {
	4154	+ if (com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) {
	4155	+ Organization organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital()));
	4156	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	4157	+ fmHospital = organization.getName();
	4158	+ }
	4159	+ } else {
	4160	+ fmHospital = data.getFmHospital();
	4161	+ }
	4162	+
	4163	+ }
	4164	+ //接生机构
	4165	+ map.put("jieshengjigou", fmHospital);
	4166	+
	4167	+
	4168	+ String deliverDoctor = "";
	4169	+ if (StringUtils.isNotEmpty(data.getDeliverDoctor())) {
	4170	+ if (com.lyms.platform.common.utils.StringUtils.isNum(data.getDeliverDoctor())) {
	4171	+ Users users = usersService.getUsers(Integer.parseInt(data.getDeliverDoctor()));
	4172	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	4173	+ deliverDoctor = users.getName();
	4174	+ }
	4175	+ } else {
	4176	+ deliverDoctor = data.getDeliverDoctor();
	4177	+ }
	4178	+ }
	4179	+
	4180	+ //接生人
	4181	+ map.put("jieshengren", deliverDoctor);
	4182	+
	4183	+ deliverList.add(map);
	4184	+ }
	4185	+ }
	4186	+ }
	4187	+ }
	4188	+ return deliverList;
4031	4189	}
4032	4190	}

...	...	@@ -135,6 +135,7 @@
135	135	@Override
136	136	public void run() {
137	137	try{
	138	+ System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date()) +" ; request url = " + url);
138	139	String json = HttpClientUtil.doPost("https://"+url+"/findSyncData", new HashMap<String, String>(), "utf-8");
139	140	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json))
140	141	{

...	...	@@ -89,7 +89,7 @@
89	89	finally {
90	90	if (httpPost != null)
91	91	{
92		- httpPost.releaseConnection();
	92	+ httpPost.reset();
93	93	}
94	94
95	95	}