shiyang / regional-platform

Commit d270b088f252dea32c6ee2a6adf9a61fb136e372

Authored by landong2015 over 8 years ago

update

Showing 4 changed files with 139 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.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/request/FolicAcidAddRequest.java

...	...	@@ -104,11 +104,18 @@
104	104	return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true");
105	105	}
106	106
107		- //返回证件类型
	107	+ //返回证件类型Blood type
108	108	@RequestMapping(value = "/getCertificateType", method = RequestMethod.GET)
109	109	@ResponseBody
110	110	public BaseResponse queryCardNoType(){
111	111	return residentsArchiveFacade.queryCardNoType();
	112	+ }
	113	+
	114	+ //返回血型类型
	115	+ @RequestMapping(value = "/getBloodType", method = RequestMethod.GET)
	116	+ @ResponseBody
	117	+ public BaseResponse getBloodType(){
	118	+ return residentsArchiveFacade.getBloodType();
112	119	}
113	120
114	121	/**

...	...	@@ -11,7 +11,9 @@
11	11	import com.lyms.platform.operate.web.request.FolicAcidQueryRequest;
12	12	import com.lyms.platform.permission.model.Organization;
13	13	import com.lyms.platform.permission.model.OrganizationQuery;
	14	+import com.lyms.platform.permission.model.Users;
14	15	import com.lyms.platform.permission.service.OrganizationService;
	16	+import com.lyms.platform.permission.service.UsersService;
15	17	import com.lyms.platform.pojo.FolicAcid;
16	18	import com.lyms.platform.pojo.ResidentsArchiveModel;
17	19	import com.lyms.platform.query.FolicAcidQuery;
18	20
19	21
20	22
...	...	@@ -35,14 +37,58 @@
35	37	private FolicAcidService folicAcidService;
36	38	@Autowired
37	39	private OrganizationService organizationService;
	40	+ @Autowired
	41	+ private AutoMatchFacade autoMatchFacade;
	42	+ @Autowired
	43	+ private UsersService usersService;
38	44
39	45	public BaseResponse addOrUpdateFolicAcid(FolicAcidAddRequest addRequest,Integer userId){
40	46
	47	+ BaseObjectResponse br = new BaseObjectResponse();
	48	+
41	49	String id = null;
42		- if (StringUtils.isNotEmpty(addRequest.getParentId())){
	50	+
	51	+ //判断是否需要给妇女快捷建档
	52	+ if (StringUtils.isEmpty(addRequest.getParentId())){
	53	+
	54	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
	55	+ archiveQuery.setYn(YnEnums.YES.getId());
	56	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	57	+ archiveQuery.setHospitalId(hospitalId);
	58	+ //判断证件号是否在同一家医院已经建档
	59	+ if (StringUtils.isNotEmpty(addRequest.getCardNo())){
	60	+ archiveQuery.setCertificateNum(addRequest.getCardNo());
	61	+// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId());
	62	+ List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
	63	+ if (CollectionUtils.isNotEmpty(modelList)){
	64	+ br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	65	+ br.setErrormsg("该证件号在医院已经建档");
	66	+ return br;
	67	+ }else {
	68	+ //进行建档
	69	+ ResidentsArchiveModel model = new ResidentsArchiveModel();
	70	+ model.setYn(YnEnums.YES.getId());
	71	+ model.setCreated(new Date());
	72	+ model.setModified(new Date());
	73	+ model.setPublishId(String.valueOf(userId));
	74	+ Users users = usersService.getUsers(userId);
	75	+ if (users!=null && users.getYn()!=YnEnums.NO.getId()){
	76	+ model.setPublishName(users.getName());
	77	+ }
	78	+ model.setHospitalId(hospitalId);
	79	+
	80	+ model.setUsername(addRequest.getUsername());
	81	+ model.setCertificateNum(addRequest.getCardNo());
	82	+ model.setCertificateTypeId(addRequest.getCertificateTypeId());
	83	+ model.setBirthday(addRequest.getBirthday());
	84	+ model.setAge(addRequest.getAge());
	85	+ model.setPhone(addRequest.getPhone());
	86	+ residentsArchiveService.addResident(model);
	87	+ }
	88	+ }
	89	+ }else {
43	90	id = addOrUpdate(addRequest,userId,addRequest.getParentId());
44	91	}
45		- BaseObjectResponse br = new BaseObjectResponse();
46	92	br.setErrorcode(ErrorCodeConstants.SUCCESS);
47	93	br.setErrormsg("成功");
48	94	br.setData(id);

...	...	@@ -521,6 +521,16 @@
521	521	return response;
522	522	}
523	523
	524	+ public BaseObjectResponse getBloodType(){
	525	+ BaseObjectResponse response = new BaseObjectResponse();
	526	+
	527	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING);
	528	+ response.setData(pcerteTypeResult);
	529	+ response.setErrorcode(ErrorCodeConstants.SUCCESS);
	530	+ response.setErrormsg("成功");
	531	+ return response;
	532	+ }
	533	+
524	534	//数据导出
525	535	public void residentsArchiveExport(ResidentsArchiveQueryRequest queryRequest,Integer userId,HttpServletResponse response){
526	536

...	...	@@ -7,6 +7,22 @@
7	7	*/
8	8	public class FolicAcidAddRequest {
9	9
	10	+ /* 妇女信息 */
	11	+ //姓名
	12	+ private String username;
	13	+ //证件类型Id
	14	+ private String certificateTypeId;
	15	+ //证件号
	16	+ private String cardNo;
	17	+ //出生日期
	18	+ private String birthday;
	19	+ //年龄
	20	+ private Integer age;
	21	+ //联系方式
	22	+ private String phone;
	23	+ //就诊卡
	24	+ private String vcCardNo;
	25	+
10	26	private String id;
11	27
12	28	private String parentId;
...	...	@@ -27,6 +43,63 @@
27	43	private String operator;
28	44	//领取时间
29	45	private Date drawTime;
	46	+
	47	+
	48	+ public String getVcCardNo() {
	49	+ return vcCardNo;
	50	+ }
	51	+
	52	+ public void setVcCardNo(String vcCardNo) {
	53	+ this.vcCardNo = vcCardNo;
	54	+ }
	55	+
	56	+ public String getUsername() {
	57	+ return username;
	58	+ }
	59	+
	60	+ public void setUsername(String username) {
	61	+ this.username = username;
	62	+ }
	63	+
	64	+ public String getCertificateTypeId() {
	65	+ return certificateTypeId;
	66	+ }
	67	+
	68	+ public void setCertificateTypeId(String certificateTypeId) {
	69	+ this.certificateTypeId = certificateTypeId;
	70	+ }
	71	+
	72	+ public String getCardNo() {
	73	+ return cardNo;
	74	+ }
	75	+
	76	+ public void setCardNo(String cardNo) {
	77	+ this.cardNo = cardNo;
	78	+ }
	79	+
	80	+ public String getBirthday() {
	81	+ return birthday;
	82	+ }
	83	+
	84	+ public void setBirthday(String birthday) {
	85	+ this.birthday = birthday;
	86	+ }
	87	+
	88	+ public Integer getAge() {
	89	+ return age;
	90	+ }
	91	+
	92	+ public void setAge(Integer age) {
	93	+ this.age = age;
	94	+ }
	95	+
	96	+ public String getPhone() {
	97	+ return phone;
	98	+ }
	99	+
	100	+ public void setPhone(String phone) {
	101	+ this.phone = phone;
	102	+ }
30	103
31	104	public String getId() {
32	105	return id;