jiangjiazhi / regional-platform

Commit 89a1eebd189bfe4bce34cd4c8fea9157e69bcaa4

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform

Showing 16 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportItemModel.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.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/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java
platform-operate-api/src/main/resources/config.properties
platform-operate-api/src/main/resources/rebel.xml
regional-etl/src/main/java/com/lyms/etl/util/UUIDUtil.java

...	...	@@ -25,8 +25,10 @@
25	25	// 打印顺序
26	26	private String printOrder;
27	27
	28	+ //字符类型
28	29	private String charResult;
29	30
	31	+ //数字类型
30	32	private String numberResult;
31	33
32	34	private String hospitalId;

...	...	@@ -251,7 +251,7 @@
251	251	isChildbirth = true;
252	252	}
253	253
254		- List<DischargeAbstractMotherModel> motherModels = mongoTemplate.find(Query.query(Criteria.where("patientId").is(patients.get(0).getPid())), DischargeAbstractMotherModel.class);
	254	+ List<DischargeAbstractMotherModel> motherModels = mongoTemplate.find(Query.query(Criteria.where("patientId").is(patients.get(0).getId())), DischargeAbstractMotherModel.class);
255	255	if(CollectionUtils.isNotEmpty(motherModels)) {
256	256	isHospital = true;
257	257	}

...	...	@@ -237,6 +237,73 @@
237	237	//检查月龄
238	238	private Integer checkMonth;
239	239
	240	+
	241	+ //运动测评
	242	+ private String sportsEvaluation;
	243	+
	244	+ //心理行为
	245	+ private String heartAction;
	246	+
	247	+ //问诊其他
	248	+ private String askOther;
	249	+
	250	+ //儿科检查其他
	251	+ private String babyCheckOther;
	252	+
	253	+ //辅助检查其他
	254	+ private String assistCheckOther;
	255	+
	256	+ //脐部
	257	+ private String navel;
	258	+
	259	+ public String getNavel() {
	260	+ return navel;
	261	+ }
	262	+
	263	+ public void setNavel(String navel) {
	264	+ this.navel = navel;
	265	+ }
	266	+
	267	+ public String getAskOther() {
	268	+ return askOther;
	269	+ }
	270	+
	271	+ public void setAskOther(String askOther) {
	272	+ this.askOther = askOther;
	273	+ }
	274	+
	275	+ public String getBabyCheckOther() {
	276	+ return babyCheckOther;
	277	+ }
	278	+
	279	+ public void setBabyCheckOther(String babyCheckOther) {
	280	+ this.babyCheckOther = babyCheckOther;
	281	+ }
	282	+
	283	+ public String getAssistCheckOther() {
	284	+ return assistCheckOther;
	285	+ }
	286	+
	287	+ public void setAssistCheckOther(String assistCheckOther) {
	288	+ this.assistCheckOther = assistCheckOther;
	289	+ }
	290	+
	291	+ public String getSportsEvaluation() {
	292	+ return sportsEvaluation;
	293	+ }
	294	+
	295	+ public void setSportsEvaluation(String sportsEvaluation) {
	296	+ this.sportsEvaluation = sportsEvaluation;
	297	+ }
	298	+
	299	+ public String getHeartAction() {
	300	+ return heartAction;
	301	+ }
	302	+
	303	+ public void setHeartAction(String heartAction) {
	304	+ this.heartAction = heartAction;
	305	+ }
	306	+
240	307	public Integer getCheckMonth() {
241	308	return checkMonth;
242	309	}

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import java.util.Date;
	4	+
	5	+import javax.servlet.http.HttpServletRequest;
	6	+
	7	+import org.springframework.beans.factory.annotation.Autowired;
	8	+import org.springframework.stereotype.Controller;
	9	+import org.springframework.web.bind.annotation.RequestMapping;
	10	+import org.springframework.web.bind.annotation.RequestMethod;
	11	+import org.springframework.web.bind.annotation.ResponseBody;
	12	+
	13	+import com.lyms.platform.biz.service.PatientsService;
	14	+import com.lyms.platform.common.annotation.TokenRequired;
	15	+import com.lyms.platform.common.result.BaseObjectResponse;
	16	+import com.lyms.platform.common.result.RespBuilder;
	17	+import com.lyms.platform.common.result.ResponseCode;
	18	+import com.lyms.platform.common.utils.DateUtil;
	19	+import com.lyms.platform.common.utils.PropertiesUtils;
	20	+import com.lyms.platform.operate.web.utils.HospitalCouponPrintUtils;
	21	+import com.lyms.platform.pojo.Patients;
	22	+
	23	+@Controller
	24	+@RequestMapping("/couponPrint")
	25	+public class CouponPrintController {
	26	+
	27	+
	28	+ @Autowired
	29	+ private PatientsService patientsService;
	30	+
	31	+ private static final String shanDong_DeZhou_fuYou_hopitalId = "1000000114";
	32	+
	33	+ public static final String shanDong_Dezhou_youHuiQuan_money_Number = PropertiesUtils.getPropertyValue("shanDong_Dezhou_youHuiQuan_money_Number");
	34	+
	35	+
	36	+ /**
	37	+ * 产检券打印触发后台操作
	38	+ * @param userId
	39	+ * @param hospitalId
	40	+ * @return
	41	+ */
	42	+ @RequestMapping(method = RequestMethod.POST,value = "/printTrigger")
	43	+ @ResponseBody
	44	+ @TokenRequired
	45	+ public BaseObjectResponse printTrigger(HttpServletRequest request) {
	46	+ if(shanDong_DeZhou_fuYou_hopitalId.equals(request.getParameter("hospitalId"))){//山东德州妇幼
	47	+ Patients patient = patientsService.findOnePatientById(request.getParameter("patientUserId"));
	48	+ String area = request.getParameter("area");
	49	+ String sendPersonName = request.getParameter("sendPersonName");
	50	+ String patientUserName = patient.getUsername();//领卡人
	51	+ String cardNum = patient.getVcCardNo();//就诊卡号
	52	+ String sendReason = "孕产婴软件："+patientUserName+"，孕检代金券";//发卡原因
	53	+ String cardType = area + "代金券";
	54	+ String remark = area + "代金券,产检代金券禁止其他使用";//备注
	55	+ String JSFS = "孕检代金券";//结算方式
	56	+ Integer KMJE = Integer.parseInt(shanDong_Dezhou_youHuiQuan_money_Number);//卡面金额
	57	+ Integer XSJE =0;// 销售金额
	58	+ Integer CZZKL =100;//充值折扣率
	59	+ Integer YE = KMJE;//余额
	60	+ String result = HospitalCouponPrintUtils.getDZdjq(cardType, cardNum, sendReason, sendPersonName, patientUserName, DateUtil.getyyyy_MM_dd(new Date()),remark, JSFS, KMJE, XSJE, CZZKL, YE);
	61	+ if("调用程序出错".equals(result)){
	62	+ return RespBuilder.buildErro(ResponseCode.ERROR);
	63	+ }else{
	64	+ return RespBuilder.buildErro(ResponseCode.SUCCESS);
	65	+ }
	66	+ }else{
	67	+ return RespBuilder.buildErro(ResponseCode.SUCCESS);
	68	+ }
	69	+ }
	70	+
	71	+}

...	...	@@ -72,7 +72,9 @@
72	72	public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){
73	73	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
74	74	BaseResponse baseResponse = matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, loginState.getId());
75		- baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode()));
	75	+ if(StringUtils.isNotEmpty(deliverAddRequest.getCouponCode())){
	76	+ baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode()));
	77	+ }
76	78	return baseResponse;
77	79	}
78	80	/**

...	...	@@ -27,6 +27,7 @@
27	27	import com.lyms.platform.pojo.*;
28	28	import com.lyms.platform.query.*;
29	29	import org.apache.commons.collections.CollectionUtils;
	30	+import org.omg.CosNaming.NameHelper;
30	31	import org.springframework.beans.factory.annotation.Autowired;
31	32	import org.springframework.beans.factory.annotation.Qualifier;
32	33	import org.springframework.data.domain.Sort;
...	...	@@ -1430,7 +1431,100 @@
1430	1431	} else if ("5".equals(HIS_VERSION)) {
1431	1432	map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo()));
1432	1433	}else if ("4".equals(HIS_VERSION)) {
1433		- map.put("hisPatient", qhdfyHisService.getPatientInfoList(param.getVcCardNo()));
	1434	+
	1435	+ List<Map<String,Object>> hisPatient = qhdfyHisService.getPatientInfoList(param.getVcCardNo());
	1436	+ if (CollectionUtils.isNotEmpty(hisPatient))
	1437	+ {
	1438	+ Map<String,Object> babyHis = hisPatient.get(0);
	1439	+ if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString()))
	1440	+ {
	1441	+ BabyModelQuery babyModelQuery = new BabyModelQuery();
	1442	+ babyModelQuery.setYn(YnEnums.YES.getId());
	1443	+ babyModelQuery.setMphone(babyHis.get("phone").toString());
	1444	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){
	1445	+ List list = new ArrayList();
	1446	+ list.add("1");
	1447	+ list.add("2");
	1448	+ babyQuery.setEnableListNot(list);
	1449	+ }
	1450	+
	1451	+ babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false));
	1452	+//
	1453	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	1454	+
	1455	+ if (CollectionUtils.isNotEmpty(models)) {
	1456	+ BabyModel model = models.get(0);
	1457	+ if (model != null) {
	1458	+
	1459	+ puerperaQuery.setCardNo(model.getMcertNo());
	1460	+
	1461	+ BabyInfoResult result = new BabyInfoResult();
	1462	+
	1463	+ result.setPid(model.getPid());
	1464	+ result.setCardNo(model.getMcertNo());//母亲的身份证号码
	1465	+ result.setName(model.getName());
	1466	+ if (model.getBirth() != null) {
	1467	+ result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	1468	+ } else {
	1469	+ result.setMonthAge("");
	1470	+ }
	1471	+
	1472	+ BabyModelQuery babyBuildQuery = new BabyModelQuery();
	1473	+ babyBuildQuery.setYn(YnEnums.YES.getId());
	1474	+ babyBuildQuery.setPid(model.getPid());
	1475	+ List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC);
	1476	+
	1477	+ List<Map<String, String>> list = new ArrayList<>();
	1478	+ if (CollectionUtils.isNotEmpty(builds)) {
	1479	+ for (BabyModel build : builds) {
	1480	+
	1481	+ if (build != null && StringUtils.isNotEmpty(build.getHospitalId()) && build.getHospitalId().equals(param.getHospitalId())) {
	1482	+ isCurrentHosp = true;
	1483	+ buildInfo = build;
	1484	+ }
	1485	+
	1486	+ Map<String, String> buildRecords = new HashMap<>();
	1487	+ buildRecords.put("id", build.getId());
	1488	+ buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
	1489	+
	1490	+ buildRecords.put("hospitalId", build.getHospitalId());
	1491	+ //查询建档医院
	1492	+ Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
	1493	+ if (org != null) {
	1494	+ buildRecords.put("buildHospital", org.getName());
	1495	+ } else {
	1496	+ buildRecords.put("buildHospital", "");
	1497	+ }
	1498	+
	1499	+ list.add(buildRecords);
	1500	+ }
	1501	+
	1502	+ if (!isCurrentHosp) {
	1503	+ buildInfo = builds.get(0);
	1504	+ }
	1505	+
	1506	+ result.setBuildRecords(list);
	1507	+ }
	1508	+ results.add(result);
	1509	+ }
	1510	+
	1511	+ }
	1512	+ else
	1513	+ {
	1514	+ map.put("hisPatient", hisPatient);
	1515	+ }
	1516	+ }
	1517	+ else
	1518	+ {
	1519	+ map.put("hisPatient", hisPatient);
	1520	+ }
	1521	+ }
	1522	+ else
	1523	+ {
	1524	+ map.put("hisPatient", hisPatient);
	1525	+ }
	1526	+
	1527	+
1434	1528	}else if ("6".equals(HIS_VERSION)) {
1435	1529	map.put("hisPatient", dzfyHisService.getPatientInfoList(param.getVcCardNo()));
1436	1530	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
3	4	import com.lyms.platform.biz.service.*;
4	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	6	import com.lyms.platform.common.enums.*;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
7	8	import com.lyms.platform.common.result.BaseResponse;
8		-import com.lyms.platform.common.utils.DateUtil;
9		-import com.lyms.platform.common.utils.JsonUtil;
10		-import com.lyms.platform.common.utils.StringUtils;
11		-import com.lyms.platform.common.utils.SystemConfig;
	9	+import com.lyms.platform.common.utils.*;
12	10	import com.lyms.platform.operate.web.request.BabyCheckRequest;
13	11	import com.lyms.platform.operate.web.result.*;
14	12	import com.lyms.platform.permission.model.Organization;
...	...	@@ -67,6 +65,11 @@
67	65	@Autowired
68	66	private CouponService couponService;
69	67
	68	+ @Autowired
	69	+ private QhdfyHisService qhdfyHisService;
	70	+
	71	+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
	72	+
70	73	/**
71	74	* 更新检查
72	75	*
73	76
...	...	@@ -219,7 +222,14 @@
219	222	model.setBirth(babyModelList.get(0).getBirth());
220	223	}
221	224	}
	225	+ model.setSportsEvaluation(request.getSportsEvaluation());
	226	+ model.setHeartAction(request.getHeartAction());
	227	+ model.setAskOther(request.getAskOther());
	228	+ model.setBabyCheckOther(request.getBabyCheckOther());
	229	+ model.setAssistCheckOther(request.getAssistCheckOther());
	230	+ model.setNavel(request.getNavel());
222	231
	232	+
223	233	return model;
224	234	}
225	235
226	236
227	237
...	...	@@ -769,19 +779,41 @@
769	779	babyQuery.setHospitalIdList(hList);
770	780
771	781	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
772		- for (BabyModel model : models) {
773		- if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) {
774		- isBuild = true;
	782	+
	783	+ if (CollectionUtils.isEmpty(models) && StringUtils.isNotEmpty(vcCardNo))
	784	+ {
	785	+ if ("4".equals(HIS_VERSION)) {
	786	+ List<Map<String,Object>> hisPatient = qhdfyHisService.getPatientInfoList(vcCardNo);
	787	+
	788	+ if (CollectionUtils.isNotEmpty(hisPatient)) {
	789	+ Map<String, Object> babyHis = hisPatient.get(0);
	790	+ if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) {
	791	+ babyQuery.setPhoneOrcardNo(null); //手机号码或者身份证号码
	792	+ babyQuery.setVcCardNo(null);
	793	+ babyQuery.setMphone(babyHis.get("phone").toString());
	794	+ models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	795	+ }
	796	+ }
	797	+ }
	798	+ }
	799	+
	800	+ if (CollectionUtils.isNotEmpty(models))
	801	+ {
	802	+ for (BabyModel model : models) {
	803	+ if (model != null && model.getHospitalId() != null && hList.contains(hospitalId)) {
	804	+ isBuild = true;
	805	+ }
	806	+ BabyChooseResult result = new BabyChooseResult();
	807	+ result.setId(model.getId());
	808	+ result.setPid(model.getPid());
	809	+ result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	810	+ result.setGender(SexEnum.getTextById(model.getSex()));
	811	+ result.setName(model.getName());
	812	+ result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth()));
	813	+ results.add(result);
775	814	}
776		- BabyChooseResult result = new BabyChooseResult();
777		- result.setId(model.getId());
778		- result.setPid(model.getPid());
779		- result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
780		- result.setGender(SexEnum.getTextById(model.getSex()));
781		- result.setName(model.getName());
782		- result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth()));
783		- results.add(result);
784	815	}
	816	+
785	817	}
786	818	map.put("isBuild", isBuild);
787	819	map.put("boies", results);

...	...	@@ -273,6 +273,9 @@
273	273	couponService.use(hospitalId, deliverAddRequest.getCouponCode(), userId, maternalDeliverModel.getId());
274	274	}
275	275
	276	+ /** 儿童建档对应孕妇分娩【未使用的产检券】要自动作废 */
	277	+ couponService.invalid(maternalDeliverModel.getId(), "2");
	278	+
276	279	//作废产检劵
277	280	patientCheckTicketService.cancelCheckTicket(hospitalId,deliverAddRequest.getParentId());
278	281	//修改
...	...	@@ -349,7 +352,7 @@
349	352	updatePatientFmDate(patients.getPid(), fmDate, 3);
350	353
351	354	/** 填写分娩表分娩 >> 作废未使用的产检券 */
352		- remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL);
	355	+// remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL);
353	356	}
354	357	} else {
355	358	return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("parentId 为空,找不到产妇");

...	...	@@ -1448,6 +1448,10 @@
1448	1448	}
1449	1449	}
1450	1450	map.put("babys",babys);
	1451	+
	1452	+ /** 优惠券编号 */
	1453	+ map.put("couponCode", couponService.findByUsedId(id));
	1454	+
1451	1455	br.setErrorcode(ErrorCodeConstants.SUCCESS);
1452	1456	br.setErrormsg("成功");
1453	1457	br.setData(map);
1454	1458
...	...	@@ -1955,11 +1959,19 @@
1955	1959
1956	1960
1957	1961	model.setDrugGllergic(drugGllergic);
1958		- model.setChestw(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getChestw(),UnitConstants.CM));
	1962	+ model.setChestw(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getChestw(), UnitConstants.CM));
1959	1963
1960	1964	model.setWeightEvaluate(checkModel.getWeightEvaluate());
1961	1965	model.setHeadEvaluate(checkModel.getHeadEvaluate());
1962	1966	model.setHeightEvaluate(checkModel.getHeightEvaluate());
	1967	+
	1968	+ model.setSportsEvaluation(checkModel.getSportsEvaluation());
	1969	+ model.setHeartAction(checkModel.getHeartAction());
	1970	+
	1971	+ model.setAskOther(checkModel.getAskOther());
	1972	+ model.setBabyCheckOther(checkModel.getBabyCheckOther());
	1973	+ model.setAssistCheckOther(checkModel.getAssistCheckOther());
	1974	+ model.setNavel(checkModel.getNavel());
1963	1975
1964	1976	return model;
1965	1977

...	...	@@ -243,6 +243,73 @@
243	243
244	244	private Integer couponType;
245	245
	246	+ //运动测评
	247	+ private String sportsEvaluation;
	248	+
	249	+ //心理行为
	250	+ private String heartAction;
	251	+
	252	+
	253	+ //问诊其他
	254	+ private String askOther;
	255	+
	256	+ //儿科检查其他
	257	+ private String babyCheckOther;
	258	+
	259	+ //辅助检查其他
	260	+ private String assistCheckOther;
	261	+
	262	+ //脐部
	263	+ private String navel;
	264	+
	265	+ public String getNavel() {
	266	+ return navel;
	267	+ }
	268	+
	269	+ public void setNavel(String navel) {
	270	+ this.navel = navel;
	271	+ }
	272	+
	273	+ public String getAskOther() {
	274	+ return askOther;
	275	+ }
	276	+
	277	+ public void setAskOther(String askOther) {
	278	+ this.askOther = askOther;
	279	+ }
	280	+
	281	+ public String getBabyCheckOther() {
	282	+ return babyCheckOther;
	283	+ }
	284	+
	285	+ public void setBabyCheckOther(String babyCheckOther) {
	286	+ this.babyCheckOther = babyCheckOther;
	287	+ }
	288	+
	289	+ public String getAssistCheckOther() {
	290	+ return assistCheckOther;
	291	+ }
	292	+
	293	+ public void setAssistCheckOther(String assistCheckOther) {
	294	+ this.assistCheckOther = assistCheckOther;
	295	+ }
	296	+
	297	+ public String getHeartAction() {
	298	+ return heartAction;
	299	+ }
	300	+
	301	+ public void setHeartAction(String heartAction) {
	302	+ this.heartAction = heartAction;
	303	+ }
	304	+
	305	+ public String getSportsEvaluation() {
	306	+ return sportsEvaluation;
	307	+ }
	308	+
	309	+ public void setSportsEvaluation(String sportsEvaluation) {
	310	+ this.sportsEvaluation = sportsEvaluation;
	311	+ }
	312	+
246	313	public String getCouponCode() {
247	314	return couponCode;
248	315	}

...	...	@@ -240,6 +240,73 @@
240	240	//是否高危儿童 0 非高危 1高危
241	241	private String highRisk;
242	242
	243	+ //运动测评
	244	+ private String sportsEvaluation;
	245	+
	246	+ //心理行为
	247	+ private String heartAction;
	248	+
	249	+
	250	+ //问诊其他
	251	+ private String askOther;
	252	+
	253	+ //儿科检查其他
	254	+ private String babyCheckOther;
	255	+
	256	+ //辅助检查其他
	257	+ private String assistCheckOther;
	258	+
	259	+ //脐部
	260	+ private String navel;
	261	+
	262	+ public String getNavel() {
	263	+ return navel;
	264	+ }
	265	+
	266	+ public void setNavel(String navel) {
	267	+ this.navel = navel;
	268	+ }
	269	+
	270	+ public String getAskOther() {
	271	+ return askOther;
	272	+ }
	273	+
	274	+ public void setAskOther(String askOther) {
	275	+ this.askOther = askOther;
	276	+ }
	277	+
	278	+ public String getBabyCheckOther() {
	279	+ return babyCheckOther;
	280	+ }
	281	+
	282	+ public void setBabyCheckOther(String babyCheckOther) {
	283	+ this.babyCheckOther = babyCheckOther;
	284	+ }
	285	+
	286	+ public String getAssistCheckOther() {
	287	+ return assistCheckOther;
	288	+ }
	289	+
	290	+ public void setAssistCheckOther(String assistCheckOther) {
	291	+ this.assistCheckOther = assistCheckOther;
	292	+ }
	293	+
	294	+ public String getSportsEvaluation() {
	295	+ return sportsEvaluation;
	296	+ }
	297	+
	298	+ public void setSportsEvaluation(String sportsEvaluation) {
	299	+ this.sportsEvaluation = sportsEvaluation;
	300	+ }
	301	+
	302	+ public String getHeartAction() {
	303	+ return heartAction;
	304	+ }
	305	+
	306	+ public void setHeartAction(String heartAction) {
	307	+ this.heartAction = heartAction;
	308	+ }
	309	+
243	310	public String getId() {
244	311	return id;
245	312	}

	1	+package com.lyms.platform.operate.web.utils;
	2	+
	3	+import org.apache.http.HttpEntity;
	4	+import org.apache.http.client.methods.CloseableHttpResponse;
	5	+import org.apache.http.client.methods.HttpPost;
	6	+import org.apache.http.entity.StringEntity;
	7	+import org.apache.http.impl.client.DefaultHttpClient;
	8	+import org.apache.http.impl.conn.PoolingClientConnectionManager;
	9	+import org.apache.http.util.EntityUtils;
	10	+
	11	+import com.lyms.platform.common.utils.PropertiesUtils;
	12	+
	13	+/**
	14	+ * Created by Administrator on 2017/5/16.
	15	+ */
	16	+public class HospitalCouponPrintUtils {
	17	+
	18	+ public static final String DJQ_URL = PropertiesUtils.getPropertyValue("djq_url");
	19	+
	20	+ /**
	21	+ *
	22	+ * 调用德州His插入数据接口
	23	+ * @param KLX 卡类型
	24	+ * @param KH 卡号
	25	+ * @param FKYY 发卡原因
	26	+ * @param FKR 发卡人
	27	+ * @param LKR 领卡人
	28	+ * @param FKSJ 领卡时间
	29	+ * @param BZ 备注
	30	+ * @param JSFS 结算方式
	31	+ * @param KMJE 卡面金额
	32	+ * @param XSJE 销售金额
	33	+ * @param CZZKL 充值折扣率
	34	+ * @param YE 余额
	35	+ * @return
	36	+ */
	37	+ public static String getDZdjq(String KLX,String KH,String FKYY,String FKR,String LKR,String FKSJ,String BZ,String JSFS,Integer KMJE,Integer XSJE,Integer CZZKL,Integer YE){
	38	+ String s2=null;
	39	+ try {
	40	+ final String CONTENT_TYPE_TEXT_JSON = "text/json";
	41	+ DefaultHttpClient client = new DefaultHttpClient(
	42	+ new PoolingClientConnectionManager());
	43	+ String url = DJQ_URL;
	44	+ String js = "KLX=" + KLX + "&KH=" + KH + "&FKYY=" + FKYY + "&FKR=" + FKR + "&LKR=" + LKR + "&FKSJ=" + FKSJ+"&BZ="+BZ+"&JSFS="+JSFS+"&KMJE="+KMJE+"&XSJE="+XSJE+"&XSJE="+XSJE+"&CZZKL="+CZZKL+"&YE="+YE;
	45	+ HttpPost httpPost = new HttpPost(url);
	46	+ httpPost.setHeader("Content-Type", "application/text;charset=UTF-8");
	47	+ StringEntity se = new StringEntity(js);
	48	+ se.setContentType(CONTENT_TYPE_TEXT_JSON);
	49	+ httpPost.setEntity(se);
	50	+ CloseableHttpResponse response2 = null;
	51	+ response2 = client.execute(httpPost);
	52	+ HttpEntity entity2 = null;
	53	+ entity2 = response2.getEntity();
	54	+ s2= EntityUtils.toString(entity2, "UTF-8");
	55	+
	56	+
	57	+
	58	+ }catch (Exception e){
	59	+ e.printStackTrace();
	60	+ }
	61	+ if(s2!=null){
	62	+ return s2;
	63	+ }else
	64	+ return "调用程序出错";
	65	+
	66	+ }
	67	+
	68	+}

...	...	@@ -23,7 +23,7 @@
23	23	@Component
24	24	public class SendMysqlSyncDatUtil implements InitializingBean {
25	25
26		- private static BlockingQueue<SqlRequest> syncSqlQueue = new LinkedBlockingQueue();
	26	+ private static BlockingQueue<SqlRequest> syncSqlQueue = new LinkedBlockingQueue(500);
27	27
28	28	//配置文件中配置的要同步的区域的url地址
29	29	private static Set<String> urls = new HashSet<>();
...	...	@@ -51,6 +51,7 @@
51	51	request.setSql(Base64.encodeBase64String(sql.getBytes()));
52	52	request.setSqlId(sqlId);
53	53	syncSqlQueue.add(request);
	54	+ System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
54	55	}
55	56
56	57	/**
...	...	@@ -76,7 +77,7 @@
76	77	SqlRequest request = null;
77	78	while (true) {
78	79	try {
79		- request = syncSqlQueue.poll(1, TimeUnit.MINUTES);
	80	+ request = syncSqlQueue.poll();
80	81	String json = JsonUtil.obj2Str(request);
81	82	if (CollectionUtils.isNotEmpty(urls))
82	83	{

...	...	@@ -2,8 +2,14 @@
2	2	#center_base_url=http://sms.healthbaby.com.cn/v1/
3	3	center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
4	4
	5	+#德州代金券地址
	6	+djq_url=
	7	+
5	8	#区域平台访问短信中心的token
6	9	center_token=e0c56363-00d6-42ee-bbe0-23c553583062
	10	+
	11	+#\u5C71\u4E1C\u5FB7\u5DDE\u4F18\u60E0\u5238\u91D1\u989D_shanDong dezhou youHuiQuan jinE
	12	+shanDong_Dezhou_youHuiQuan_money_Number=500
7	13
8	14
9	15

1	1	<?xml version="1.0" encoding="UTF-8"?>
2		-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
	2	+<application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
3	3
4	4	<classpath>
5		- <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes">
	5	+ <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/target/classes">
6	6	</dir>
7	7	</classpath>
8	8
9	9	<web>
10	10	<link target="/">
11		- <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp">
	11	+ <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/src/main/webapp">
12	12	</dir>
13	13	</link>
14	14	</web>

...	...	@@ -9,7 +9,7 @@
9	9	*/
10	10	public class UUIDUtil {
11	11	public static String createId() {
12		- return UUID.randomUUID().toString().replace("-", "");
	12	+ return UUID.randomUUID().toString().replace("-", "").toUpperCase();
13	13	}
14	14	}