jiangjiazhi / regional-platform

Commit 64080dc2f269e5153d7ba9a2812e9e03da14c54c

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

2017-12-22李涛修改

Showing 3 changed files with 5 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/RemoteService.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java

...	...	@@ -16,7 +16,7 @@
16	16
17	17	// private String BASE_URL = PropertiesUtils.getPropertyValue("platform.operate.api.validate.url");
18	18	// private String BASE_URL = "http://dev-rp-api.healthbaby.com.cn:8082/";
19		- private String BASE_URL = "http://localhost:8080/";
	19	+ private String BASE_URL = "http://localhost:28080/";
20	20
21	21	/**
22	22	* 作废优惠券相关

...	...	@@ -276,7 +276,7 @@
276	276	updatePatient(patients);
277	277
278	278	/** 自动分娩 >> 作废未使用的产检券 */
279		- remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL);
	279	+// remoteService.invalidCoupon(patients.getPid(), "2", RemoteUrlEnum.INVALID_COUPON_URL);
280	280
281	281	//作废产检劵
282	282	/* patientCheckTicketService.cancelCheckTicket(patients.getHospitalId(), patients.getId());*/

...	...	@@ -51,6 +51,7 @@
51	51	String bpStatus = getBpStatus(entry.getValue().get("ssy").toString(), entry.getValue().get("szy").toString());
52	52	if(StringUtils.isNotEmpty(bpStatus)) {
53	53	patients = (patients == null ? mongoTemplate.findById(bloodPressure.getParentId(), Patients.class) : patients);
	54	+ if(patients == null) continue;
54	55	setTempInfo(bloodPressure.getId() + ID_SEPARATOR + entry.getKey() + ID_SEPARATOR + bloodPressure.getModified().getTime(), temp, patients,
55	56	entry.getValue().get("ssy") + "/" + entry.getValue().get("szy"), bpStatus, "（收缩压：90-140 舒张压：60-90）", ErrorPatientEnums.BLOOD_PRESSURE, bloodPressure.getModified());
56	57	}
...	...	@@ -104,6 +105,7 @@
104	105	System.out.println(patientWeight.getId() + ">>> " + entry);
105	106	if(DateUtil.parseYMD(entry.getKey()).getTime() >= yesterday.getTime()) {
106	107	patients = (patients == null ? mongoTemplate.findById(patientWeight.getPatientId(), Patients.class) : patients);
	108	+ if(patients == null) continue;
107	109	Integer week = DateUtil.getWeek2(patients.getLastMenses(), DateUtil.parseYMD(entry.getKey()));
108	110	Double addWeight = getAddWeight(patientWeight.getBeforeWeight(), entry.getValue());
109	111	Double low = lowMap.get(week);
...	...	@@ -133,6 +135,7 @@
133	135	if(DateUtil.parseYMD(entry.getKey()).getTime() >= yesterday.getTime()) {
134	136	if(entry.getValue() < 36D \|\| entry.getValue() > 38.5D ) {
135	137	patients = (patients == null ? mongoTemplate.findById(tempModel.getParentId(), Patients.class) : patients);
	138	+ if(patients == null) continue;
136	139	setTempInfo(tempModel.getId() + ID_SEPARATOR + entry.getKey() + ID_SEPARATOR + tempModel.getModified().getTime(), temp, patients, entry.getValue() + "", entry.getValue() < 36D ? "低热" : "高热",
137	140	"（36-37.4）", ErrorPatientEnums.TEMP, tempModel.getModified());
138	141	}