jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 24 additions and 4 deletions

...	...	@@ -4261,6 +4261,16 @@
4261	4261	} catch (Exception e) {
4262	4262	e.printStackTrace();
4263	4263	}
	4264	+
	4265	+ try {
	4266	+ if (StringUtils.isNotEmpty(antExChuModel.getSecondaryDiagnosisId())) {
	4267	+ List list = JsonUtil.toList(antExChuModel.getSecondaryDiagnosisId(), List.class);
	4268	+ antexChuResult.setSecondaryDiagnosisId(queryRisk(list, false).getHighRisk());
	4269	+ }
	4270	+ } catch (Exception e) {
	4271	+ }
	4272	+
	4273	+
4264	4274	String doctorId = antExChuModel.getProdDoctor();
4265	4275	Map <String, String> map1 = new HashMap <>();
4266	4276	if (StringUtils.isNotEmpty(doctorId)) {

...	...	@@ -26,14 +26,24 @@
26	26	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
27	27	private String lisCheckItems;
28	28	private String vcCardNo;
	29	+ //次要诊断手入
	30	+ private String secondaryDiagnosis;
29	31
30		- private String secondaryDiagnosisId;
31	32
32		- public String getSecondaryDiagnosisId() {
	33	+ public String getSecondaryDiagnosis() {
	34	+ return secondaryDiagnosis;
	35	+ }
	36	+
	37	+ public void setSecondaryDiagnosis(String secondaryDiagnosis) {
	38	+ this.secondaryDiagnosis = secondaryDiagnosis;
	39	+ }
	40	+ private List secondaryDiagnosisId;
	41	+
	42	+ public List getSecondaryDiagnosisId() {
33	43	return secondaryDiagnosisId;
34	44	}
35	45
36		- public void setSecondaryDiagnosisId(String secondaryDiagnosisId) {
	46	+ public void setSecondaryDiagnosisId(List secondaryDiagnosisId) {
37	47	this.secondaryDiagnosisId = secondaryDiagnosisId;
38	48	}
39	49
...	...	@@ -1972,7 +1982,7 @@
1972	1982	}
1973	1983	public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
1974	1984	if (null != antExChuModel) {
1975		- setSecondaryDiagnosisId(antExChuModel.getSecondaryDiagnosisId());
	1985	+ setSecondaryDiagnosis(antExChuModel.getSecondaryDiagnosis());
1976	1986	setZyzlState(antExChuModel.getZyzlState());
1977	1987	if("no".equals(antExChuModel.getZyzlState())){
1978	1988	setZyzlContent(null);