jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 59 additions and 0 deletions

...	...	@@ -1294,6 +1294,7 @@
1294	1294	private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
1295	1295	// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1296	1296	BabyModel bm = new BabyModel();
	1297	+ bm.setDiseases(b.getDiseases());
1297	1298	bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
1298	1299	bm.setYlSelect(b.getYlSelect());
1299	1300	bm.setIsUNHS(b.getIsUNHS());
...	...	@@ -1721,6 +1722,19 @@
1721	1722	{
1722	1723	result.setBuildDate(DateUtil.getyyyy_MM_dd(new Date()));
1723	1724	}
	1725	+
	1726	+
	1727	+ List <Map> diseses = new ArrayList <>();
	1728	+ if (CollectionUtils.isNotEmpty(model.getDiseases())) {
	1729	+ for (String key : model.getDiseases()) {
	1730	+ Map map = new HashMap();
	1731	+ map.put("id", key);
	1732	+ map.put("name", BabyDiseaseEnums.getNameById(Integer.parseInt(key)));
	1733	+ diseses.add(map);
	1734	+ }
	1735	+ }
	1736	+ result.setDiseses(diseses);
	1737	+
1724	1738
1725	1739	BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
1726	1740	List <PatientSerResult> patientSerResults = (List <PatientSerResult>) baseResponse.getObject();

...	...	@@ -5339,6 +5339,20 @@
5339	5339	}
5340	5340	}
5341	5341
	5342	+
	5343	+ StringBuffer diseases = new StringBuffer();
	5344	+ if (CollectionUtils.isNotEmpty(model.getDiseases())) {
	5345	+ for (int i = 0, len = model.getDiseases().size(); i < len; i++) {
	5346	+ if (i != len - 1) {
	5347	+ diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(model.getDiseases().get(i))));
	5348	+ diseases.append(",");
	5349	+ } else {
	5350	+ diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(model.getDiseases().get(i))));
	5351	+ }
	5352	+ }
	5353	+ }
	5354	+ result.setDiseases(diseases.toString());
	5355	+
5342	5356	result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode()));
5343	5357	}
5344	5358

...	...	@@ -401,6 +401,17 @@
401	401	private String openDisease;
402	402	private String openDiseaseType; //1一个月 12一年
403	403
	404	+ //儿童疾病
	405	+ private List<String> diseases;
	406	+
	407	+ public List<String> getDiseases() {
	408	+ return diseases;
	409	+ }
	410	+
	411	+ public void setDiseases(List<String> diseases) {
	412	+ this.diseases = diseases;
	413	+ }
	414	+
404	415	public void setTxngNew(Map <String, Object> txngNew) {
405	416	this.txngNew = txngNew;
406	417	}

...	...	@@ -344,6 +344,16 @@
344	344
345	345	private String openDiseaseType; //1一个月 12一年
346	346
	347	+ private List<Map> diseses;
	348	+
	349	+ public List<Map> getDiseses() {
	350	+ return diseses;
	351	+ }
	352	+
	353	+ public void setDiseses(List<Map> diseses) {
	354	+ this.diseses = diseses;
	355	+ }
	356	+
347	357	public String getOpenDiseaseType() {
348	358	return openDiseaseType;
349	359	}

...	...	@@ -337,6 +337,16 @@
337	337	private String openDiseaseEndTime;
338	338	private String riskCode;
339	339
	340	+ private String diseases;
	341	+
	342	+ public String getDiseases() {
	343	+ return diseases;
	344	+ }
	345	+
	346	+ public void setDiseases(String diseases) {
	347	+ this.diseases = diseases;
	348	+ }
	349	+
340	350	public String getRiskCode() {
341	351	return riskCode;
342	352	}