jiangjiazhi / regional-platform

Authored by landong2015 over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 54 additions and 2 deletions

...	...	@@ -11,8 +11,26 @@
11	11	private String id;
12	12	private String name;
13	13	private String idCard;
	14	+ private String cardNum;
	15	+ private String phone;
14	16	private String hospitalId;
15	17	private String jsonData;
	18	+
	19	+ public String getCardNum() {
	20	+ return cardNum;
	21	+ }
	22	+
	23	+ public void setCardNum(String cardNum) {
	24	+ this.cardNum = cardNum;
	25	+ }
	26	+
	27	+ public String getPhone() {
	28	+ return phone;
	29	+ }
	30	+
	31	+ public void setPhone(String phone) {
	32	+ this.phone = phone;
	33	+ }
16	34
17	35	public String getId() {
18	36	return id;

...	...	@@ -14,6 +14,8 @@
14	14	private String id;
15	15	private String idCard;
16	16	private String hospitalId;
	17	+ private String cardNum;
	18	+ private String phone;
17	19
18	20	public String getId() {
19	21	return id;
...	...	@@ -39,6 +41,22 @@
39	41	this.hospitalId = hospitalId;
40	42	}
41	43
	44	+ public String getCardNum() {
	45	+ return cardNum;
	46	+ }
	47	+
	48	+ public void setCardNum(String cardNum) {
	49	+ this.cardNum = cardNum;
	50	+ }
	51	+
	52	+ public String getPhone() {
	53	+ return phone;
	54	+ }
	55	+
	56	+ public void setPhone(String phone) {
	57	+ this.phone = phone;
	58	+ }
	59	+
42	60	@Override
43	61	public MongoQuery convertToQuery() {
44	62	MongoCondition condition=MongoCondition.newInstance();
...	...	@@ -50,6 +68,12 @@
50	68	}
51	69	if(null!=id){
52	70	condition= condition.and("id",id, MongoOper.IS);
	71	+ }
	72	+ if(null!=cardNum){
	73	+ condition= condition.and("cardNum",cardNum, MongoOper.IS);
	74	+ }
	75	+ if(null!=phone){
	76	+ condition= condition.and("phone",phone, MongoOper.IS);
53	77	}
54	78	return condition.toMongoQuery();
55	79	}

...	...	@@ -34,9 +34,11 @@
34	34	public static final String center_statistics_url= PropertiesUtils.getPropertyValue("center_statistics_url");
35	35
36	36	@RequestMapping(value = "/bookArchive",method = RequestMethod.GET)
37		- public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId) {
	37	+ public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId,String cardNum,String phone) {
38	38	ArchiveDataQuery query = new ArchiveDataQuery();
39	39	query.setIdCard(idCard);
	40	+ query.setCardNum(cardNum);
	41	+ query.setPhone(phone);
40	42	// query.setHospitalId(hospitalId);
41	43	List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
42	44	if (list!=null && list.size() > 0) {
43	45
...	...	@@ -47,12 +49,20 @@
47	49	}
48	50
49	51	@RequestMapping(value = "/bookArchive",method = RequestMethod.POST)
50		- public void addBookArchive(HttpServletResponse response, String idCard, String hospitalId, String jsonData, String name) {
	52	+ public void addBookArchive(HttpServletResponse response,
	53	+ String idCard,
	54	+ String hospitalId,
	55	+ String jsonData,
	56	+ String name,
	57	+ String cardNum,
	58	+ String phone) {
51	59	ArchiveData data = new ArchiveData();
52	60	data.setId(hospitalId+":"+idCard);
53	61	data.setHospitalId(hospitalId);
54	62	data.setIdCard(idCard);
55	63	data.setName(name);
	64	+ data.setCardNum(cardNum);
	65	+ data.setPhone(phone);
56	66	data.setJsonData(jsonData);
57	67	archiveDataServicer.saveArchiveData(data);
58	68	writeString(response,"success");