jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 35 additions and 2 deletions

...	...	@@ -32,7 +32,7 @@
32	32	private Integer dueWeek;
33	33	//末次月经
34	34	private Date lastMenses;
35		-
	35	+ private String otherHighRisk;
36	36	//身份证号
37	37	private String cardNo;
38	38	//母亲身份证号
...	...	@@ -79,6 +79,14 @@
79	79	private Integer type;
80	80
81	81	private Integer serviceType;
	82	+
	83	+ public String getOtherHighRisk() {
	84	+ return otherHighRisk;
	85	+ }
	86	+
	87	+ public void setOtherHighRisk(String otherHighRisk) {
	88	+ this.otherHighRisk = otherHighRisk;
	89	+ }
82	90
83	91	public Date getLastMenses() {
84	92	return lastMenses;

...	...	@@ -124,6 +124,7 @@
124	124	referralApplyOrderModel.setrRisk(highScoreResult.getHighId());
125	125	referralApplyOrderModel.setScore(highScoreResult.getScore());
126	126	referralApplyOrderModel.setrLevel(highScoreResult.getLevelId());
	127	+ referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh());
127	128	referralApplyOrderModel.setPid(patients.getPid());
128	129	referralApplyOrderModel.setDueWeek(days);
129	130	referralApplyOrderModel.setServiceType(patients.getServiceType());
...	...	@@ -569,7 +570,13 @@
569	570	}
570	571	}
571	572	HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
572		- applyOrderResult.setrRisk(highScoreResult.gethighRiskStr());
	573	+ String str = "";
	574	+ if(StringUtils.isNotEmpty(highScoreResult.gethighRiskStr())){
	575	+ str=highScoreResult.gethighRiskStr()+","+orderModel.getOtherHighRisk();
	576	+ }else{
	577	+ str=orderModel.getOtherHighRisk();
	578	+ }
	579	+ applyOrderResult.setrRisk(str);
573	580	applyOrderResult.setScore(orderModel.getScore());
574	581	applyOrderResult.setrLevel(highScoreResult.getLevelStr());
575	582	data.add(applyOrderResult);

...	...	@@ -79,6 +79,24 @@
79	79	return idList;
80	80	}
81	81
	82	+ public String getOtherHigh(){
	83	+ if (null == highRisk) {
	84	+ return "";
	85	+ }
	86	+ StringBuilder stringBuilder=new StringBuilder();
	87	+ for (int i1 = 0; i1 < highRisk.size(); i1++) {
	88	+ java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
	89	+ String id = map.get("id");
	90	+ if (StringUtils.isEmpty(id)) {
	91	+ stringBuilder.append(map.get("name")).append(",");
	92	+ }
	93	+ }
	94	+ if(stringBuilder.length()>0){
	95	+ stringBuilder.setLength(stringBuilder.length()-1);
	96	+ }
	97	+ return stringBuilder.toString();
	98	+ }
	99	+
82	100	public void setScore(Integer score) {
83	101	this.score = score;
84	102	}