jiangjiazhi / regional-platform

Commit e78fbc95fb1a45cb08685b4a26a0ea699b6268c5

Authored by hujiaqi over 8 years ago

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java

...	...	@@ -11,6 +11,8 @@
11	11	import com.lyms.platform.common.dao.operator.MongoCondition;
12	12	import com.lyms.platform.common.dao.operator.MongoOper;
13	13	import com.lyms.platform.common.dao.operator.MongoQuery;
	14	+import com.lyms.platform.common.enums.ServiceStatusEnums;
	15	+import com.lyms.platform.common.enums.ServiceTypeEnums;
14	16	import com.lyms.platform.common.enums.YnEnums;
15	17	import com.lyms.platform.common.pojo.SyncDataModel;
16	18	import com.lyms.platform.common.utils.*;

...	...	@@ -152,7 +152,7 @@
152	152	public AntExRecordModel convert(AntenatalExaminationModel antEx) {
153	153	AntExRecordModel antExRecordModel = new AntExRecordModel();
154	154	antExRecordModel.setParentId(antEx.getParentId());
155		- antExRecordModel.setId(antEx.getId());
	155	+// antExRecordModel.setId(antEx.getId());
156	156	antExRecordModel.setType(1);
157	157	antExRecordModel.setHospitalId(antEx.getHospitalId());
158	158	antExRecordModel.setCheckDoctor(antEx.getCheckDoctor());

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.biz.service.BabyBookbuildingService;
	4	+import com.lyms.platform.biz.service.SmsTemplateService;
3	5	import com.lyms.platform.common.base.BaseController;
4	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
5		-import com.lyms.platform.common.enums.SendTimeEnums;
6		-import com.lyms.platform.common.enums.SmsServiceEnums;
	7	+import com.lyms.platform.common.enums.*;
7	8	import com.lyms.platform.common.result.BaseObjectResponse;
8	9	import com.lyms.platform.common.result.BaseResponse;
	10	+import com.lyms.platform.common.utils.DateUtil;
	11	+import com.lyms.platform.common.utils.ExceptionUtils;
9	12	import com.lyms.platform.common.utils.JsonUtil;
10	13	import com.lyms.platform.common.utils.StringUtils;
11	14	import com.lyms.platform.operate.web.facade.SmsConfigFacade;
	15	+import com.lyms.platform.operate.web.request.MessageListRequest;
	16	+import com.lyms.platform.operate.web.request.MessageRequest;
12	17	import com.lyms.platform.operate.web.request.SmsConfigRequest;
	18	+import com.lyms.platform.operate.web.utils.MessageCenterService;
	19	+import com.lyms.platform.pojo.BabyModel;
	20	+import com.lyms.platform.pojo.Patients;
	21	+import com.lyms.platform.pojo.SmsConfigModel;
	22	+import com.lyms.platform.pojo.SmsTemplateModel;
	23	+import com.lyms.platform.query.BabyModelQuery;
	24	+import com.lyms.platform.query.PatientsQuery;
	25	+import com.lyms.platform.query.SmsTemplateQuery;
	26	+import org.apache.commons.collections.CollectionUtils;
13	27	import org.springframework.beans.factory.annotation.Autowired;
	28	+import org.springframework.data.mongodb.core.query.Query;
14	29	import org.springframework.stereotype.Controller;
15	30	import org.springframework.web.bind.annotation.*;
16	31
17	32	import javax.validation.Valid;
18		-import java.util.ArrayList;
19		-import java.util.HashMap;
20		-import java.util.List;
21		-import java.util.Map;
	33	+import java.util.*;
22	34
23	35
24	36	/**
...	...	@@ -31,6 +43,12 @@
31	43	@Autowired
32	44	private SmsConfigFacade smsConfigFacade;
33	45
	46	+ @Autowired
	47	+ private BabyBookbuildingService babyBookbuildingService;
	48	+
	49	+ @Autowired
	50	+ private SmsTemplateService smsTemplateService;
	51	+
34	52	/**
35	53	* 添加/更新短信服务配置
36	54	* @param request
37	55
...	...	@@ -190,7 +208,95 @@
190	208	@RequestParam(required = false) String actualTime,
191	209	@RequestParam(required = false) Integer page,
192	210	@RequestParam(required = false) Integer limit) {
193		- return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content,planTime,actualTime,objType, page, limit);
	211	+ return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit);
194	212	}
	213	+
	214	+
	215	+ @RequestMapping(value = "/sendBabyBuildSms", method = RequestMethod.GET)
	216	+ @ResponseBody
	217	+ public String sendBabyBuildSms() {
	218	+ BabyModelQuery babyModelQuery = new BabyModelQuery();
	219	+ List<String> hospitalIds = new ArrayList<>();
	220	+ hospitalIds.add("204");//青龙满族自治县医院
	221	+ hospitalIds.add("197");//抚宁县妇幼保健院
	222	+ hospitalIds.add("248");//北戴河医院
	223	+
	224	+ babyModelQuery.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());//增值服务
	225	+ babyModelQuery.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());//开通
	226	+ babyModelQuery.setYn(YnEnums.YES.getId());
	227	+ Date startDate = DateUtil.parseYMD("2016-11-01");
	228	+ Date startEnd = DateUtil.parseYMD("2016-11-30");
	229	+ babyModelQuery.setBuildDateStart(startDate);
	230	+ babyModelQuery.setBuildDateEnd(startEnd);
	231	+ for (String hid:hospitalIds) {
	232	+ if (hid != null) {
	233	+ //判断医院是否启动和对应的服务项是否启用
	234	+ SmsConfigModel configModel = new SmsConfigModel();
	235	+ BaseResponse response = smsConfigFacade.hospitalIsStart(hid, configModel, SmsServiceEnums.FWKT.getId());
	236	+ if (response != null) {
	237	+ continue;
	238	+ }
	239	+
	240	+ SmsTemplateQuery query = new SmsTemplateQuery();
	241	+ query.setYn(YnEnums.YES.getId());
	242	+ query.setStatus(1);
	243	+ query.setHospitalId(hid);
	244	+ query.setServiceObj(ServiceObjEnums.BABYOBJ.getId());
	245	+ query.setSpecialDateType(SpecialDateEnums.JD.getId());
	246	+
	247	+ //查询建档短信服务模板
	248	+ List<SmsTemplateModel> temps = smsTemplateService.querySmsTemplates(query);
	249	+ if (CollectionUtils.isNotEmpty(temps)) {
	250	+ SmsTemplateModel templateModel = temps.get(0);
	251	+ babyModelQuery.setHospitalId(hid);
	252	+ //查询医院符合条件的儿童
	253	+ List<BabyModel> list = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
	254	+ if (CollectionUtils.isNotEmpty(list)) {
	255	+
	256	+ for (BabyModel babyModel : list)
	257	+ {
	258	+ //短信前缀
	259	+ String messagePrefix = configModel.getHospitalPrefix();
	260	+ if (templateModel != null && templateModel.getStatus() == 1) {
	261	+ MessageListRequest smsList = new MessageListRequest();
	262	+ List<MessageRequest> messages = new ArrayList<>();
	263	+ MessageRequest mr = new MessageRequest();
	264	+ String content = "【" + messagePrefix + "】" + templateModel.getContent();
	265	+ mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content));
	266	+ mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
	267	+ mr.setPhone(babyModel.getMphone());
	268	+ //短信商
	269	+ mr.setServiceType(SmsProviderEnums.YM.getId());
	270	+ mr.setTypeId(ProjectTypeEnums.YNXT.getId());
	271	+ mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	272	+ mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
	273	+ mr.setStatus(SmsStatusEnums.WFS.getId());
	274	+ mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
	275	+
	276	+ mr.setExt1(hid);
	277	+ mr.setExt2(templateModel.getId());
	278	+ mr.setExt3(babyModel.getId());
	279	+ messages.add(mr);
	280	+
	281	+ if (CollectionUtils.isNotEmpty(messages)) {
	282	+ smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
	283	+ smsList.setMessages(messages);
	284	+
	285	+ for (MessageRequest msg : messages)
	286	+ {
	287	+ System.out.println("phone="+msg.getPhone()+" \| content="+msg.getContent());
	288	+ }
	289	+ //这行代码是保存到短信中心，config.properties中配置了短信中心地址线上环境地址是(http://sms.healthbaby.com.cn/v1/)
	290	+ // MessageCenterService.saveSmsCenter(smsList);
	291	+ }
	292	+ }
	293	+ }
	294	+ }
	295	+ }
	296	+ }
	297	+ }
	298	+ return "sendBabyBuildSms finish";
	299	+ }
	300	+
195	301	}

...	...	@@ -114,9 +114,9 @@
114	114	Patients patients = patientsService.findOnePatientById(record.getParentId());
115	115	String dueWeek = "";
116	116	if (null != patients) {
117		- if (patients.getDueStatus() == 1&&patients.getType()==3) {
	117	+ if (patients.getDueStatus()!=null&&patients.getDueStatus() == 1&&patients.getType()==3) {
118	118	dueWeek = "终止妊娠";
119		- } else if (patients.getType()==3&&patients.getDueStatus() == 0) {
	119	+ } else if (patients.getType()==3) {
120	120	dueWeek = "已分娩";
121	121	} else {
122	122	int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
123	123
...	...	@@ -153,16 +153,18 @@
153	153	List level = new ArrayList();
154	154	try {
155	155	for (Object str : record.gethLevel()) {
156		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString());
157		- if (null != basicConfig) {
158		- Map map = new HashMap();
159		- String name = basicConfig.getName();
160		- if (name.indexOf("预警") > -1) {
161		- name = name.replace("预警", "");
	156	+ if(null!=str&&StringUtils.isNotEmpty(str.toString())){
	157	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str.toString());
	158	+ if (null != basicConfig) {
	159	+ Map map = new HashMap();
	160	+ String name = basicConfig.getName();
	161	+ if (name.indexOf("预警") > -1) {
	162	+ name = name.replace("预警", "");
	163	+ }
	164	+ map.put("name", name);
	165	+ map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
	166	+ level.add(map);
162	167	}
163		- map.put("name", name);
164		- map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
165		- level.add(map);
166	168	}
167	169	}
168	170	} catch (Exception e) {

...	...	@@ -96,6 +96,8 @@
96	96
97	97	@Autowired
98	98	private DataPermissionService dataPermissionService;
	99	+ @Autowired
	100	+ private AutoMatchFacade autoMatchFacade;
99	101
100	102
101	103	public BaseResponse getBabyBase(String babyId) {
...	...	@@ -1473,6 +1475,10 @@
1473	1475	// for (Organization organization : organizationList) {
1474	1476	// hospitalIdList.add(String.valueOf(organization.getId()));
1475	1477	// }
	1478	+ String hospital = autoMatchFacade.getHospitalId(userId);
	1479	+ if(null!=hospital){
	1480	+ hospitalIdList.add(hospital);
	1481	+ }
1476	1482	DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
1477	1483	dataPermissionsModelQuery.setUserId(userId);
1478	1484	List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);

...	...	@@ -333,6 +333,10 @@
333	333	if (isRegion) {
334	334	//王平说的必须要给区域医院权限，不然他就是蠢逼 201611124 16:41
335	335	hospitalList = new ArrayList<>();
	336	+ String hospital = autoMatchFacade.getHospitalId(userId);
	337	+ if(null!=hospital){
	338	+ hospitalList.add(hospital);
	339	+ }
336	340	DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
337	341	dataPermissionsModelQuery.setUserId(userId);
338	342	List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);

...	...	@@ -9,11 +9,13 @@
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
11	11	import com.lyms.platform.common.utils.DateUtil;
	12	+import com.lyms.platform.common.utils.JsonUtil;
12	13	import com.lyms.platform.common.utils.SystemConfig;
13	14	import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest;
14	15	import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest;
15	16	import com.lyms.platform.operate.web.result.BasicConfigResult;
16	17	import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult;
	18	+import com.lyms.platform.operate.web.result.ResidentsArchiveResult;
17	19	import com.lyms.platform.operate.web.utils.CommonsHelper;
18	20	import com.lyms.platform.permission.model.Organization;
19	21	import com.lyms.platform.permission.model.Users;
20	22
21	23
22	24
...	...	@@ -323,21 +325,75 @@
323	325	return objectResponse;
324	326	}
325	327
326		- ResidentsArchiveModel model = new ResidentsArchiveModel();
	328	+ ResidentsArchiveResult result = new ResidentsArchiveResult();
327	329
328	330	ResidentsArchiveQuery query = new ResidentsArchiveQuery();
329	331	query.setYn(YnEnums.YES.getId());
330	332	query.setId(id);
331	333	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
332	334	if (CollectionUtils.isNotEmpty(modelList)){
333		- model = modelList.get(0);
	335	+ ResidentsArchiveModel model = modelList.get(0);
	336	+
	337	+ result = getResult(model);
334	338	}
335	339
336		- objectResponse.setData(model);
	340	+ objectResponse.setData(result);
337	341	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
338	342	objectResponse.setErrormsg("成功");
339	343	return objectResponse;
340	344	}
	345	+
	346	+ public ResidentsArchiveResult getResult(ResidentsArchiveModel model){
	347	+
	348	+ ResidentsArchiveResult result = new ResidentsArchiveResult();
	349	+ result.setId(model.getId());
	350	+ result.setUsername(model.getUsername());
	351	+ result.setSex(model.getSex());
	352	+ result.setBrithDay(model.getBuildDay());
	353	+ result.setCountryId(model.getCountryId());
	354	+ result.setNationId(model.getNationId());
	355	+ result.setMarriageId(model.getMarriageId());
	356	+ result.setCertificateTypeId(model.getCertificateTypeId());
	357	+ result.setCertificateNum(model.getCertificateNum());
	358	+ result.setCensusTypeId(model.getCensusTypeId());
	359	+ result.setLiveTypeId(model.getLiveTypeId());
	360	+ result.setLevelTypeId(model.getLevelTypeId());
	361	+ result.setProfessionTypeId(model.getProfessionTypeId());
	362	+ result.setHospitalId(model.getHospitalId());
	363	+
	364	+ result.setPhone(model.getPhone());
	365	+ result.setWorkUnit(model.getWorkUnit());
	366	+ result.setProvinceId(model.getProvinceId());
	367	+ result.setCityId(model.getCityId());
	368	+ result.setAreaId(model.getAreaId());
	369	+ result.setStreetId(model.getStreetId());
	370	+ result.setAddress(model.getAddress());
	371	+
	372	+ result.setProvinceRegisterId(model.getProvinceRegisterId());
	373	+ result.setCityRegisterId(model.getCityRegisterId());
	374	+ result.setAreaRegisterId(model.getAreaRegisterId());
	375	+ result.setStreetRegisterId(model.getStreetRegisterId());
	376	+ result.setAddressRegister(model.getAddressRegister());
	377	+
	378	+ result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(),Map.class));
	379	+ result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
	380	+ result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
	381	+ result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
	382	+ result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
	383	+
	384	+ result.setVcCardNo(model.getVcCardNo());
	385	+ result.setBuildDoctor(model.getBuildDoctor());
	386	+ result.setBuildDay(model.getBuildDay());
	387	+
	388	+ result.setCreated(model.getCreated());
	389	+ result.setModified(model.getModified());
	390	+
	391	+ result.setPublishId(model.getPublishId());
	392	+ result.setPublishName(model.getPublishName());
	393	+
	394	+ return result;
	395	+ }
	396	+
341	397
342	398	/**
343	399	* 妇女健康管理

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	import java.util.Date;
	4	+import java.util.Map;
4	5
5	6	/**
6	7	* 居民建档记录详情返回参数
...	...	@@ -16,7 +17,7 @@
16	17	//性别
17	18	private String sex;
18	19	//出生日期
19		- private Date brithDay;
	20	+ private String brithDay;
20	21	//国籍
21	22	private String countryId;
22	23	//民族Id
23	24
24	25
25	26
26	27
...	...	@@ -62,15 +63,15 @@
62	63	/**********病史信息***********/
63	64
64	65	//既往史
65		- private String pastHistory;
	66	+ private Map pastHistory;
66	67	//家族史
67		- private String familyHistory;
	68	+ private Map familyHistory;
68	69	//个人史
69		- private String personalHistory;
	70	+ private Map personalHistory;
70	71	//药物过敏史
71		- private String ywgmHistory;
	72	+ private Map ywgmHistory;
72	73	//现病史
73		- private String presentHistory;
	74	+ private Map presentHistory;
74	75
75	76	/**********院内信息***********/
76	77
...	...	@@ -79,7 +80,7 @@
79	80	//建档人
80	81	private String buildDoctor;
81	82	//建档日期
82		- private Date buildDay;
	83	+ private String buildDay;
83	84
84	85	/* table info */
85	86
86	87
...	...	@@ -114,11 +115,11 @@
114	115	this.sex = sex;
115	116	}
116	117
117		- public Date getBrithDay() {
	118	+ public String getBrithDay() {
118	119	return brithDay;
119	120	}
120	121
121		- public void setBrithDay(Date brithDay) {
	122	+ public void setBrithDay(String brithDay) {
122	123	this.brithDay = brithDay;
123	124	}
124	125
125	126
126	127
127	128
128	129
129	130
130	131
131	132
132	133
133	134
...	...	@@ -298,43 +299,43 @@
298	299	this.addressRegister = addressRegister;
299	300	}
300	301
301		- public String getPastHistory() {
	302	+ public Map getPastHistory() {
302	303	return pastHistory;
303	304	}
304	305
305		- public void setPastHistory(String pastHistory) {
	306	+ public void setPastHistory(Map pastHistory) {
306	307	this.pastHistory = pastHistory;
307	308	}
308	309
309		- public String getFamilyHistory() {
	310	+ public Map getFamilyHistory() {
310	311	return familyHistory;
311	312	}
312	313
313		- public void setFamilyHistory(String familyHistory) {
	314	+ public void setFamilyHistory(Map familyHistory) {
314	315	this.familyHistory = familyHistory;
315	316	}
316	317
317		- public String getPersonalHistory() {
	318	+ public Map getPersonalHistory() {
318	319	return personalHistory;
319	320	}
320	321
321		- public void setPersonalHistory(String personalHistory) {
	322	+ public void setPersonalHistory(Map personalHistory) {
322	323	this.personalHistory = personalHistory;
323	324	}
324	325
325		- public String getYwgmHistory() {
	326	+ public Map getYwgmHistory() {
326	327	return ywgmHistory;
327	328	}
328	329
329		- public void setYwgmHistory(String ywgmHistory) {
	330	+ public void setYwgmHistory(Map ywgmHistory) {
330	331	this.ywgmHistory = ywgmHistory;
331	332	}
332	333
333		- public String getPresentHistory() {
	334	+ public Map getPresentHistory() {
334	335	return presentHistory;
335	336	}
336	337
337		- public void setPresentHistory(String presentHistory) {
	338	+ public void setPresentHistory(Map presentHistory) {
338	339	this.presentHistory = presentHistory;
339	340	}
340	341
341	342
...	...	@@ -354,11 +355,11 @@
354	355	this.buildDoctor = buildDoctor;
355	356	}
356	357
357		- public Date getBuildDay() {
	358	+ public String getBuildDay() {
358	359	return buildDay;
359	360	}
360	361
361		- public void setBuildDay(Date buildDay) {
	362	+ public void setBuildDay(String buildDay) {
362	363	this.buildDay = buildDay;
363	364	}
364	365