jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 7 other branches

Showing 6 changed files with 28 additions and 2 deletions

...	...	@@ -222,6 +222,7 @@
222	222	} else {
223	223	antExRecordModel.setStatus(1);
224	224	}
	225	+ antExRecordModel.setCardNo(patients.getCardNo());
225	226	antExRecordModel.setAddressRegister(patients.getAddressRegister());
226	227	antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId());
227	228	antExRecordModel.setCityRegisterId(patients.getCityRegisterId());
...	...	@@ -264,6 +265,7 @@
264	265	} else {
265	266	antExRecordModel.setStatus(1);
266	267	}
	268	+ antExRecordModel.setCardNo(patients.getCardNo());
267	269	antExRecordModel.setAddressRegister(patients.getAddressRegister());
268	270	antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId());
269	271	antExRecordModel.setCityRegisterId(patients.getCityRegisterId());

...	...	@@ -283,6 +283,15 @@
283	283	antExRecordModel.setDueDate(patients.getDueDate());
284	284	antExRecordModel.setName(patients.getUsername());
285	285	antExRecordModel.setBrith(patients.getBirth());
	286	+ antExRecordModel.setPhone(patients.getPhone());
	287	+ antExRecordModel.setAddressRegister(patients.getAddressRegister());
	288	+ antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId());
	289	+ antExRecordModel.setCityRegisterId(patients.getCityRegisterId());
	290	+ antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId());
	291	+ antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId());
	292	+ antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor());
	293	+ antExRecordModel.setCardNo(patients.getCardNo());
	294	+
286	295	Patients dbPatients = findOnePatientById(patients.getId());
287	296	if(dbPatients.getType()==1){
288	297	antExRecordModel.setStatus(2);

...	...	@@ -24,7 +24,9 @@
24	24	private String fId;
25	25	//条码号
26	26	private String barCode;
	27	+ private String cardNo;
27	28
	29	+
28	30	private String parentId;
29	31
30	32	private String hospitalId;
...	...	@@ -70,6 +72,13 @@
70	72	private String areaRegisterId;
71	73	private String streetRegisterId;
72	74
	75	+ public String getCardNo() {
	76	+ return cardNo;
	77	+ }
	78	+
	79	+ public void setCardNo(String cardNo) {
	80	+ this.cardNo = cardNo;
	81	+ }
73	82
74	83	public String getAddressRegister() {
75	84	return addressRegister;

...	...	@@ -220,6 +220,12 @@
220	220	if (null != parentId) {
221	221	condition = condition.and("parentId", parentId, MongoOper.IS);
222	222	}
	223	+ if (null != cardNo) {
	224	+ condition = condition.and("cardNo", cardNo, MongoOper.IS);
	225	+ }
	226	+ if (null != phone) {
	227	+ condition = condition.and("phone", phone, MongoOper.IS);
	228	+ }
223	229	if (null != id) {
224	230	condition = condition.and("id", id, MongoOper.IS);
225	231	}

...	...	@@ -81,7 +81,7 @@
81	81	antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId());
82	82	antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
83	83	antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode());
84		-
	84	+ antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo());
85	85	//产检日期
86	86	if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) {
87	87	String nextDateStr = antExManagerQueryRequest.getcTime();

...	...	@@ -106,7 +106,7 @@
106	106	setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime()));
107	107	setName(e.getName());
108	108	setAge(DateUtil.getAge(e.getBrith()) + "");
109		- setPhone(e.getPhone());
	109	+ setPhone(StringUtils.encryPhone(e.getPhone()));
110	110	setBarCode(e.getBarCode());
111	111	int days = DateUtil.getDays(e.getLastMenses(),e.getCheckTime() );
112	112	setcDueWeek(StringUtils.dueWeek(days));