jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 95 additions and 2 deletions

...	...	@@ -187,6 +187,8 @@
187	187
188	188	public AntExRecordModel convert(AntenatalExaminationModel antEx) {
189	189	AntExRecordModel antExRecordModel = new AntExRecordModel();
	190	+
	191	+ antExRecordModel.setTreatOpinion(antEx.getTreatmentOpinion());
190	192	antExRecordModel.setScreenResult(antEx.getScreenResult());
191	193	antExRecordModel.setParentId(antEx.getParentId());
192	194	antExRecordModel.setfId(antEx.getId());
...	...	@@ -253,6 +255,7 @@
253	255
254	256	public AntExRecordModel convert(AntExChuModel antExChuModel) {
255	257	AntExRecordModel antExRecordModel = new AntExRecordModel();
	258	+ antExRecordModel.setTreatOpinion(antExChuModel.getTreatOpinion());
256	259	antExRecordModel.setScreenResult(antExChuModel.getScreenResult());
257	260	antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor());
258	261	antExRecordModel.setHospitalId(antExChuModel.getHospitalId());

...	...	@@ -91,6 +91,17 @@
91	91
92	92	private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
93	93
	94	+ //处理意见
	95	+ private String treatOpinion;
	96	+
	97	+ public String getTreatOpinion() {
	98	+ return treatOpinion;
	99	+ }
	100	+
	101	+ public void setTreatOpinion(String treatOpinion) {
	102	+ this.treatOpinion = treatOpinion;
	103	+ }
	104	+
94	105	public List getIncrhRisk() {
95	106	return incrhRisk;
96	107	}

...	...	@@ -65,6 +65,27 @@
65	65	private Integer type;
66	66	private String neqId;
67	67
	68	+ //处理意见
	69	+ private String treatOpinion;
	70	+
	71	+ private boolean isOpinion;
	72	+
	73	+ public boolean isOpinion() {
	74	+ return isOpinion;
	75	+ }
	76	+
	77	+ public void setIsOpinion(boolean isOpinion) {
	78	+ this.isOpinion = isOpinion;
	79	+ }
	80	+
	81	+ public String getTreatOpinion() {
	82	+ return treatOpinion;
	83	+ }
	84	+
	85	+ public void setTreatOpinion(String treatOpinion) {
	86	+ this.treatOpinion = treatOpinion;
	87	+ }
	88	+
68	89	public List<String> getIds() {
69	90	return ids;
70	91	}
...	...	@@ -497,6 +518,8 @@
497	518	condition = condition.and("checkDoctor", null, MongoOper.NE);
498	519	}
499	520
	521	+
	522	+
500	523	if (StringUtils.isNotEmpty(levelId)) {
501	524	condition = condition.and("hLevel", levelId, MongoOper.IN);
502	525	}
...	...	@@ -553,6 +576,23 @@
553	576
554	577
555	578	Criteria c = null;
	579	+
	580	+ if (isOpinion)
	581	+ {
	582	+ if (null != treatOpinion) {
	583	+ condition = condition.and("treatOpinion", treatOpinion, MongoOper.NE);
	584	+ }
	585	+ else
	586	+ {
	587	+ condition = condition.and("treatOpinion", null, MongoOper.NE);
	588	+ }
	589	+ }
	590	+ else
	591	+ {
	592	+ condition = condition.and("treatOpinion", false, MongoOper.EXISTS);
	593	+ }
	594	+
	595	+
556	596	if (null != buildTimeStart) {
557	597	c = Criteria.where("buildTime").gte(buildTimeStart);
558	598	}

...	...	@@ -107,10 +107,27 @@
107	107	antExRecordQuery.setFirst(antExManagerQueryRequest.getFirst());
108	108	}
109	109
	110	+ if (antExManagerQueryRequest.getIsOpinion() != null)
	111	+ {
	112	+ //是否有处理意见 0否 1是
	113	+ if (antExManagerQueryRequest.getIsOpinion() == 0)
	114	+ {
	115	+ antExRecordQuery.setIsOpinion(false);
	116	+ }
	117	+ else if (antExManagerQueryRequest.getIsOpinion() == 1)
	118	+ {
	119	+ if (StringUtils.isNotEmpty(antExManagerQueryRequest.getTreatOpinion()))
	120	+ {
	121	+ antExRecordQuery.setTreatOpinion(antExManagerQueryRequest.getTreatOpinion());
	122	+ }
	123	+ else
	124	+ {
	125	+ antExRecordQuery.setIsOpinion(true);
	126	+ }
	127	+ }
	128	+ }
110	129
111		-
112	130	//产检日期
113		-
114	131	Date currentDate = DateUtil.formatDate(new Date());
115	132	if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) {
116	133	String nextDateStr = antExManagerQueryRequest.getcTime();

...	...	@@ -80,6 +80,28 @@
80	80
81	81	private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
82	82
	83	+ //处理意见
	84	+ private String treatOpinion;
	85	+
	86	+ //是否有处理意见 0否 1是
	87	+ private Integer isOpinion;
	88	+
	89	+ public String getTreatOpinion() {
	90	+ return treatOpinion;
	91	+ }
	92	+
	93	+ public void setTreatOpinion(String treatOpinion) {
	94	+ this.treatOpinion = treatOpinion;
	95	+ }
	96	+
	97	+ public Integer getIsOpinion() {
	98	+ return isOpinion;
	99	+ }
	100	+
	101	+ public void setIsOpinion(Integer isOpinion) {
	102	+ this.isOpinion = isOpinion;
	103	+ }
	104	+
83	105	public int getShowDetail() {
84	106	return showDetail;
85	107	}