jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 29 additions and 0 deletions

...	...	@@ -25,6 +25,15 @@
25	25	private String lisTypeName;
26	26	private String title;
27	27	private Date modified;
	28	+ private String typeName;
	29	+
	30	+ public String getTypeName() {
	31	+ return typeName;
	32	+ }
	33	+
	34	+ public void setTypeName(String typeName) {
	35	+ this.typeName = typeName;
	36	+ }
28	37
29	38	public String getLisTypeName() {
30	39	return lisTypeName;

...	...	@@ -329,6 +329,7 @@
329	329	if (lis.getAge() != null) {
330	330	check.setAge(lis.getAge().toString());
331	331	}
	332	+ check.setTypeName(lis.getType());
332	333
333	334	//聊城显示修改
334	335	check.setApplyDate(lis.getPublishTime() != null ? lis.getPublishTime() :

...	...	@@ -872,6 +872,25 @@
872	872	}
873	873
874	874	Patients pat = patientses.get(0);
	875	+
	876	+ //如果当前查询到的档案和已经测量过的体重记录对应的档案不一致就取体重测量的档案
	877	+ List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("pid").is(pat.getPid())));
	878	+ if (CollectionUtils.isNotEmpty(patientWeights))
	879	+ {
	880	+ PatientWeight patientWeight = patientWeights.get(0);
	881	+ if (!patientWeight.getPatientId().equals(pat.getId()))
	882	+ {
	883	+ PatientsQuery patientsQuery1 = new PatientsQuery();
	884	+ patientsQuery1.setId(patientWeight.getPatientId());
	885	+ List<Patients> pes = patientsService.queryPatient(patientsQuery1);
	886	+ if (CollectionUtils.isNotEmpty(pes))
	887	+ {
	888	+ pat = pes.get(0);
	889	+ }
	890	+ }
	891	+ }
	892	+
	893	+
875	894	Map<String, String> patInfo = getPatInfo(pat, hospitalId, certType);
876	895	objectResponse.setData(patInfo);
877	896	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);