shiyang / regional-platform

Download as
Browse Code »

Commit 53248a2b92367752591a4e331f2339e33d7851c1

Authored by hujiaqi
2 parents fb87c941cb 104445aea6
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 13 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 53248a2
... ... @@ -291,6 +291,9 @@
291 291 private String zongDanHongSu;
292 292 //结合胆红素
293 293 private String jieHeDanHongSu;
  294 + //丙肝
  295 + private String bingGan;
  296 +
294 297 /* 乙肝五项 */
295 298 //乙肝表面抗原
296 299 private String yiGanKangYuan;
... ... @@ -334,6 +337,14 @@
334 337 private String zhiDaoYiJian;
335 338 //婚检医生
336 339 private String hunJianDoctor;
  340 +
  341 + public String getBingGan() {
  342 + return bingGan;
  343 + }
  344 +
  345 + public void setBingGan(String bingGan) {
  346 + this.bingGan = bingGan;
  347 + }
337 348  
338 349 public Integer getDeliverStatus() {
339 350 return deliverStatus;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ 53248a2
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.annotation.TokenRequired;
7 7 import com.lyms.platform.common.base.BaseController;
8 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
  9 +import com.lyms.platform.common.enums.YnEnums;
9 10 import com.lyms.platform.common.result.CommonResult;
10 11 import com.lyms.platform.common.utils.DateUtil;
11 12 import com.lyms.platform.common.utils.JsonUtil;
... ... @@ -106,6 +107,7 @@
106 107 map.put("patientId", data.getPatientId());
107 108 EmergenceTreatmentQuery emergenceTreatmentQuery=new EmergenceTreatmentQuery();
108 109 emergenceTreatmentQuery.setEmergenceId(data.getId());
  110 + emergenceTreatmentQuery.setYn(YnEnums.YES.getId());
109 111 List<EmergenceTreatmentModel> models= emergenceTreatmentService.queryEmergenceTreatmentModel(emergenceTreatmentQuery,"created");
110 112 Long lastTime=null;
111 113 if(CollectionUtils.isNotEmpty(models)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ 53248a2
... ... @@ -7,8 +7,10 @@
7 7 import com.lyms.platform.common.result.BaseObjectResponse;
8 8 import com.lyms.platform.common.result.BaseResponse;
9 9 import com.lyms.platform.operate.web.facade.ResidentsArchiveFacade;
  10 +import com.lyms.platform.operate.web.request.PatientGuideSmsRequest;
10 11 import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest;
11 12 import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest;
  13 +import com.lyms.platform.operate.web.request.WomenGuideSmsRequest;
12 14 import org.apache.commons.lang.StringUtils;
13 15 import org.springframework.beans.factory.annotation.Autowired;
14 16 import org.springframework.stereotype.Controller;
... ... @@ -82,7 +84,7 @@
82 84 */
83 85 @RequestMapping(value = "/queryResidentsArchiveById/{id}", method = RequestMethod.GET)
84 86 @ResponseBody
85   -// @TokenRequired
  87 + @TokenRequired
86 88 public BaseObjectResponse queryResidentsArchiveById(@PathVariable("id")String id){
87 89 BaseObjectResponse objectResponse = residentsArchiveFacade.queryResidentsArchiveById(id);
88 90 return objectResponse;
89 91  
... ... @@ -102,13 +104,48 @@
102 104 return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true");
103 105 }
104 106  
105   - //返回证件类型
  107 + //返回证件类型Blood type
106 108 @RequestMapping(value = "/getCertificateType", method = RequestMethod.GET)
107 109 @ResponseBody
108 110 public BaseResponse queryCardNoType(){
109 111 return residentsArchiveFacade.queryCardNoType();
110 112 }
111 113  
  114 + //返回血型类型
  115 + @RequestMapping(value = "/getBloodType", method = RequestMethod.GET)
  116 + @ResponseBody
  117 + public BaseResponse getBloodType(){
  118 + return residentsArchiveFacade.getBloodType();
  119 + }
  120 +
  121 + /**
  122 + * 数据导出接口
  123 + * @param residentsArchiveQueryRequest
  124 + * @param response
  125 + * @param request
  126 + */
  127 + @RequestMapping(value = "/residentsArchiveExport", method = RequestMethod.GET)
  128 + @ResponseBody
  129 + @TokenRequired
  130 + public void residentsArchiveExport(@Valid ResidentsArchiveQueryRequest residentsArchiveQueryRequest,HttpServletResponse response,
  131 + HttpServletRequest request){
  132 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  133 + residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,loginState.getId(),response);
  134 + }
  135 +
  136 + /**
  137 + * 妇女指导接口
  138 + * @param womenGuideSmsRequest
  139 + * @param request
  140 + * @return
  141 + */
  142 + @RequestMapping(value = "/sendWomenGuildSms", method = RequestMethod.POST)
  143 + @ResponseBody
  144 + @TokenRequired
  145 + public BaseResponse womenGuildSms(@RequestBody @Valid WomenGuideSmsRequest womenGuideSmsRequest,HttpServletRequest request){
  146 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  147 + return residentsArchiveFacade.womenGuildSms(womenGuideSmsRequest, loginState.getId());
  148 + }
112 149  
113 150  
114 151 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 53248a2
... ... @@ -951,7 +951,7 @@
951 951  
952 952  
953 953 // LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), phone, account, MD5Utils.md5(password).toUpperCase(), token, typeId);
954   - LoginContext loginContext = iSessionProvider.register(users.getLogincenterId().toString(), phone, account, StringUtils.isNotBlank(password) ? MD5Utils.md5(password).toUpperCase() : null);
  954 + LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), phone, account, StringUtils.isNotBlank(password) ? MD5Utils.md5(password).toUpperCase() : null);
955 955 //0 成功 4009 已注册
956 956 if(loginContext.getErrorcode().equals(0) || loginContext.getErrorcode().equals(4009)) {
957 957 users.setPhone(phone);
... ... @@ -1151,7 +1151,7 @@
1151 1151 users.setModified(new Date());
1152 1152 users.setLastLoginTime(users.getModified());
1153 1153 usersService.updateUsers(users);
1154   - LoginContext loginContext = iSessionProvider.register(users.getLogincenterId().toString(), users.getPhone(),users.getAccount(), users.getPwd().toUpperCase());
  1154 + LoginContext loginContext = iSessionProvider.register(users.getLogincenterId(), users.getPhone(),users.getAccount(), users.getPwd().toUpperCase());
1155 1155 if(loginContext.getErrorcode().equals(0)) {
1156 1156 ResultUtils.buildSuccessResultAndWrite(response);
1157 1157 } else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ 53248a2
... ... @@ -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,60 @@
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 + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model);
  87 +
  88 + id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId());
  89 + }
  90 + }
  91 + }else {
43 92 id = addOrUpdate(addRequest,userId,addRequest.getParentId());
44 93 }
45   - BaseObjectResponse br = new BaseObjectResponse();
46 94 br.setErrorcode(ErrorCodeConstants.SUCCESS);
47 95 br.setErrormsg("成功");
48 96 br.setData(id);
... ... @@ -117,6 +165,7 @@
117 165 archiveMap.put("birthday",archiveModel.getBirthday());
118 166 archiveMap.put("age", archiveModel.getAge());
119 167 archiveMap.put("phone", archiveModel.getPhone());
  168 + archiveMap.put("id", archiveModel.getId());
120 169  
121 170 }
122 171 resultMap.put("folicAcidResult",folicAcid);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 53248a2
... ... @@ -245,13 +245,13 @@
245 245 //就诊卡不为空
246 246 archiveQuery.setVcCardNo(addRequest.getVcCardNo());
247 247 }
  248 + BaseObjectResponse br = new BaseObjectResponse();
248 249 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
249 250 if (CollectionUtils.isNotEmpty(modelList)){
250 251 ResidentsArchiveModel archiveModel = modelList.get(0);
251 252 id = addOrUpdate(addRequest,userId,archiveModel);
252 253 }
253 254  
254   - BaseObjectResponse br = new BaseObjectResponse();
255 255 br.setErrorcode(ErrorCodeConstants.SUCCESS);
256 256 br.setErrormsg("成功");
257 257 br.setData(id);
... ... @@ -416,6 +416,7 @@
416 416 checkup.setXueHongDanBai(addRequest.getXueHongDanBai());
417 417 checkup.setBaiXiBao(addRequest.getBaiXiBao());
418 418 checkup.setXueXiaoBan(addRequest.getXueXiaoBan());
  419 + checkup.setXueChangGuiQiTa(addRequest.getXueChangGuiQiTa());
419 420 checkup.setNiaoDanBai(addRequest.getNiaoDanBai());
420 421 checkup.setNiaoTang(addRequest.getNiaoTang());
421 422 checkup.setNiaoTongTi(addRequest.getNiaoTongTi());
... ... @@ -433,6 +434,7 @@
433 434 checkup.setXueDanBai(addRequest.getXueDanBai());
434 435 checkup.setZongDanHongSu(addRequest.getZongDanHongSu());
435 436 checkup.setJieHeDanHongSu(addRequest.getJieHeDanHongSu());
  437 + checkup.setBingGan(addRequest.getBingGan());
436 438 /* 乙肝五项 */
437 439 checkup.setYiGanKangYuan(addRequest.getYiGanKangYuan());
438 440 checkup.setYiGanKangTi(addRequest.getYiGanKangTi());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 53248a2
... ... @@ -3,8 +3,9 @@
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.biz.service.PremaritalCheckupService;
5 5 import com.lyms.platform.biz.service.ResidentsArchiveService;
  6 +import com.lyms.platform.biz.service.SyncDataService;
6 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
7   -import com.lyms.platform.common.enums.YnEnums;
  8 +import com.lyms.platform.common.enums.*;
8 9 import com.lyms.platform.common.result.BaseListResponse;
9 10 import com.lyms.platform.common.result.BaseObjectResponse;
10 11 import com.lyms.platform.common.result.BaseResponse;
11 12  
... ... @@ -12,12 +13,12 @@
12 13 import com.lyms.platform.common.utils.ExcelUtil;
13 14 import com.lyms.platform.common.utils.JsonUtil;
14 15 import com.lyms.platform.common.utils.SystemConfig;
15   -import com.lyms.platform.operate.web.request.ResidentsArchiveAddRequest;
16   -import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest;
  16 +import com.lyms.platform.operate.web.request.*;
17 17 import com.lyms.platform.operate.web.result.BasicConfigResult;
18 18 import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult;
19 19 import com.lyms.platform.operate.web.result.ResidentsArchiveResult;
20 20 import com.lyms.platform.operate.web.utils.CommonsHelper;
  21 +import com.lyms.platform.operate.web.utils.MessageCenterService;
21 22 import com.lyms.platform.permission.model.Organization;
22 23 import com.lyms.platform.permission.model.Users;
23 24 import com.lyms.platform.permission.service.OrganizationService;
... ... @@ -25,6 +26,7 @@
25 26 import com.lyms.platform.pojo.BasicConfig;
26 27 import com.lyms.platform.pojo.PremaritalCheckup;
27 28 import com.lyms.platform.pojo.ResidentsArchiveModel;
  29 +import com.lyms.platform.pojo.SmsConfigModel;
28 30 import com.lyms.platform.query.BasicConfigQuery;
29 31 import com.lyms.platform.query.PremaritalCheckupQuery;
30 32 import com.lyms.platform.query.ResidentsArchiveQuery;
31 33  
... ... @@ -59,8 +61,11 @@
59 61 private BasicConfigService basicConfigService;
60 62 @Autowired
61 63 private PremaritalCheckupService premaritalCheckupService;
  64 + @Autowired
  65 + private SmsConfigFacade smsConfigFacade;
  66 + @Autowired
  67 + private SyncDataService syncDataService;
62 68  
63   -
64 69 /**
65 70 * 查询居民健康记录,获取基础数据
66 71 * @param residentsArchiveQueryRequest
... ... @@ -232,6 +237,7 @@
232 237 if (users!=null && users.getYn()!=YnEnums.NO.getId()){
233 238 model.setPublishName(users.getName());
234 239 }
  240 +
235 241 model.setId(id);
236 242 residentsArchiveService.updateResident(model,id);
237 243 }catch (Exception e){
... ... @@ -305,6 +311,11 @@
305 311 archiveModel.setPublishName(users.getName());
306 312 }
307 313  
  314 +/* if (StringUtils.isNotEmpty(archiveModel.getBuildDoctor())){
  315 + Users u = usersService.getUsers(Integer.valueOf(archiveModel.getBuildDoctor()));
  316 + archiveModel.setBuildDoctor(u.getName());
  317 + }*/
  318 +
308 319 ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(archiveModel);
309 320  
310 321 if (residentsArchiveModel == null || StringUtils.isEmpty(residentsArchiveModel.getId())){
... ... @@ -510,6 +521,16 @@
510 521 return response;
511 522 }
512 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 +
513 534 //数据导出
514 535 public void residentsArchiveExport(ResidentsArchiveQueryRequest queryRequest,Integer userId,HttpServletResponse response){
515 536  
516 537  
517 538  
518 539  
... ... @@ -568,15 +589,41 @@
568 589 map.put("presentHistory", data.getPresentHistory());
569 590  
570 591 map.put("vcCardNo", data.getVcCardNo());
  592 +
571 593 map.put("buildDoctor", data.getBuildDoctor());
572 594 map.put("buildDay", data.getBuildDay());
  595 + list.add(map);
573 596 }
574 597 }
575 598 out = response.getOutputStream();
576 599 Map<String, String> cnames = new LinkedHashMap<>();
577 600 cnames.put("username","姓名");
  601 + cnames.put("sex","性别");
  602 + cnames.put("birthday","出生日期");
  603 + cnames.put("countryId","国籍");
  604 + cnames.put("nationId","民族");
  605 + cnames.put("marriageId","婚姻状况");
  606 + cnames.put("certificateTypeId","证件类型");
  607 + cnames.put("certificateNum","证件号");
  608 + cnames.put("censusTypeId","户籍类型");
  609 + cnames.put("liveTypeId","居住类别");
  610 + cnames.put("levelTypeId","文化程度");
  611 + cnames.put("professionTypeId","职业类别");
  612 + cnames.put("hospital","建档医院");
  613 + cnames.put("age","年龄");
  614 + cnames.put("phone","联系方式");
  615 + cnames.put("workUnit","工作单位");
  616 + cnames.put("residence","居住地");
  617 + cnames.put("residenceRegister","户籍地址");
  618 + cnames.put("pastHistory","既往史");
  619 + cnames.put("familyHistory","家族史");
  620 + cnames.put("personalHistory","个人史");
  621 + cnames.put("ywgmHistory","药物过敏史");
  622 + cnames.put("presentHistory","现病史");
  623 + cnames.put("vcCardNo","就诊卡号");
  624 + cnames.put("buildDoctor","建档人");
  625 + cnames.put("buildDay","建档日期");
578 626  
579   -
580 627 response.setContentType("application/octet-stream");
581 628 response.setHeader("Content-Disposition", "attachment;fileName=" + "juming.xls");
582 629 ExcelUtil.toExcel(out, list, cnames);
... ... @@ -607,5 +654,83 @@
607 654 }
608 655 return "";
609 656 }
  657 +
  658 + /**
  659 + * 发送妇女指导短信
  660 + * @param request
  661 + * @param userId
  662 + * @return
  663 + */
  664 + public BaseResponse womenGuildSms(WomenGuideSmsRequest request,Integer userId){
  665 + String hospitalId = "";
  666 + //得到当前登录的医院id
  667 + if (userId != null) {
  668 + Users dbuser = usersService.getUsers(userId);
  669 + if (dbuser != null) {
  670 + hospitalId = String.valueOf(dbuser.getOrgId());
  671 + }
  672 + }
  673 +
  674 + //判断医院是否启动和对应的服务项是否启用
  675 + SmsConfigModel configModel = new SmsConfigModel();
  676 + BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId());
  677 + if (response != null) {
  678 + return response;
  679 + }
  680 +
  681 + MessageListRequest smsList = new MessageListRequest();
  682 + List<MessageRequest> messages = new ArrayList<>();
  683 +
  684 + List<ResidentsArchiveModel> sendModels = new ArrayList<>();
  685 + if (CollectionUtils.isNotEmpty(request.getIds())) {
  686 + List<String> ids = request.getIds();
  687 + ResidentsArchiveQuery query = new ResidentsArchiveQuery();
  688 + query.setYn(YnEnums.YES.getId());
  689 + for (String id : ids){
  690 + if (StringUtils.isNotEmpty(id)){
  691 + query.setId(id);
  692 + List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
  693 + if (CollectionUtils.isNotEmpty(modelList)){
  694 + sendModels.addAll(modelList);
  695 + }
  696 + }
  697 + }
  698 +
  699 + if (CollectionUtils.isNotEmpty(sendModels)) {
  700 + for (ResidentsArchiveModel model : sendModels){
  701 + if (model!=null && StringUtils.isNotEmpty(model.getPhone())){
  702 + MessageRequest mr = new MessageRequest();
  703 + String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor());
  704 + mr.setContent("【" + messagePrefix + "】" + request.getSmsContent());
  705 + mr.setObjType(Integer.valueOf(request.getType()));
  706 + mr.setPhone(model.getPhone());
  707 + //短信商
  708 + mr.setServiceType(SmsProviderEnums.YM.getId());
  709 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
  710 + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
  711 + mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
  712 + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
  713 +
  714 + mr.setStatus(SmsStatusEnums.WFS.getId());
  715 +
  716 + mr.setExt1(String.valueOf(model.getHospitalId()));
  717 + messages.add(mr);
  718 + }
  719 + }
  720 + }
  721 +
  722 + if (CollectionUtils.isNotEmpty(messages)) {
  723 + smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
  724 + smsList.setMessages(messages);
  725 + //调用发送接口
  726 + if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) {
  727 + MessageCenterService.saveSmsCenter(smsList);
  728 + }
  729 + }
  730 + }
  731 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  732 + }
  733 +
  734 +
610 735 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java View file @ 53248a2
... ... @@ -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;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 53248a2
... ... @@ -280,6 +280,8 @@
280 280 private String zongDanHongSu;
281 281 //结合胆红素
282 282 private String jieHeDanHongSu;
  283 + //丙肝
  284 + private String bingGan;
283 285 /* 乙肝五项 */
284 286 //乙肝表面抗原
285 287 private String yiGanKangYuan;
... ... @@ -323,6 +325,14 @@
323 325 private String zhiDaoYiJian;
324 326 //婚检医生
325 327 private String hunJianDoctor;
  328 +
  329 + public String getBingGan() {
  330 + return bingGan;
  331 + }
  332 +
  333 + public void setBingGan(String bingGan) {
  334 + this.bingGan = bingGan;
  335 + }
326 336  
327 337 public Integer getDeliverStatus() {
328 338 return deliverStatus;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/SessionProvider.java View file @ 53248a2
... ... @@ -87,7 +87,7 @@
87 87 }
88 88  
89 89 @Override
90   - public LoginContext register(String userId, String phone, String account, String pwd) {
  90 + public LoginContext register(Integer userId, String phone, String account, String pwd) {
91 91 ISessionProvider iSessionProvider = iSessionProviderMap.get(currentStrateger);
92 92 if (null != iSessionProvider) {
93 93 return iSessionProvider.register(userId, phone, account,pwd);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/ISessionProvider.java View file @ 53248a2
... ... @@ -44,6 +44,6 @@
44 44 * @param pwd
45 45 * @return
46 46 */
47   - LoginContext register(String userId, String phone,String account, String pwd);
  47 + LoginContext register(Integer userId, String phone,String account, String pwd);
48 48 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java View file @ 53248a2
... ... @@ -101,7 +101,7 @@
101 101 }
102 102  
103 103 @Override
104   - public LoginContext register(String userId, String phone, String account, String pwd) {
  104 + public LoginContext register(Integer userId, String phone, String account, String pwd) {
105 105 LoginContext loginContext = new LoginContext();
106 106 loginContext.setErrorcode(0);
107 107 return loginContext;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/UserCenterStrategy.java View file @ 53248a2
... ... @@ -63,8 +63,8 @@
63 63 }
64 64  
65 65 @Override
66   - public LoginContext register(String userId, String phone, String account, String pwd) {
67   - return LoginUtil.register(userId, phone,account, pwd, token, typeId);
  66 + public LoginContext register(Integer userId, String phone, String account, String pwd) {
  67 + return LoginUtil.register(userId+"", phone,account, pwd, token, typeId);
68 68 }
69 69 }